diff options
Diffstat (limited to 'community-testing')
656 files changed, 0 insertions, 46576 deletions
diff --git a/community-testing/0ad/PKGBUILD b/community-testing/0ad/PKGBUILD deleted file mode 100644 index 6b2a83894..000000000 --- a/community-testing/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-testing/0ad/boost-1.50.patch b/community-testing/0ad/boost-1.50.patch deleted file mode 100644 index 26ebd3e96..000000000 --- a/community-testing/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-testing/activity-log-manager/PKGBUILD b/community-testing/activity-log-manager/PKGBUILD deleted file mode 100644 index 0b27128a4..000000000 --- a/community-testing/activity-log-manager/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 78598 2012-10-21 19:12:44Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Ner0 - -pkgname=activity-log-manager -pkgver=0.9.4 -pkgrel=2 -pkgdesc="A graphical user interface which lets you easily control what gets logged by Zeitgeist" -arch=('i686' 'x86_64') -url="https://launchpad.net/activity-log-manager" -license=('GPL2') -depends=('gtk3' 'libgee' 'libzeitgeist' 'zeitgeist' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('vala' 'intltool') -install=$pkgname.install -source=(https://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz - http://pkgbuild.com/~bgyorgy/sources/$pkgname-translations-20121021.tar.gz) -md5sums=('cf85aecdaa6c0188a53d659709e1f8cd' - '6167df74ce44659aa94a89f31ff4d351') - -build() { - cd $pkgname-$pkgver - - # Fix docdir location - sed -i 's/almdocdir =.*/almdocdir = ${docdir}/' Makefile.{am,in} - - # Update language files - echo 'af ar ast be bg bn bs ca ca@valencia cs da de el eo es et eu fi fr gd gl he hi hr hu id it ja km ko ku lt lv mi ms my nb nl oc pl pt ro ru se si sk sl sr sv ta te ug uk uz vi zh_CN zh_HK zh_TW' >po/LINGUAS - rename $pkgname- '' ../po/$pkgname-*.po - mv -f -t po ../po/* - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # We don't have Whoopsie on Arch Linux - rm -r "$pkgdir/etc" "$pkgdir"/usr/share/{applications/activity-log-manager-ccpanel.desktop,dbus-1,gnome-control-center,polkit-1} -} diff --git a/community-testing/activity-log-manager/activity-log-manager.install b/community-testing/activity-log-manager/activity-log-manager.install deleted file mode 100644 index 2c455e952..000000000 --- a/community-testing/activity-log-manager/activity-log-manager.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/alex/PKGBUILD b/community-testing/alex/PKGBUILD deleted file mode 100644 index 06e7af6ed..000000000 --- a/community-testing/alex/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 77005 2012-10-03 15:23:22Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Philip Nilsson <pnilsson@nullref.se> - -pkgname=alex -pkgver=3.0.2 -pkgrel=2 -pkgdesc='a lexical analyser generator for Haskell' -arch=('i686' 'x86_64') -url='http://hackage.haskell.org/package/alex' -license=('custom:BSD3') -depends=('gmp') -makedepends=('ghc=7.6.1-1' 'haskell-quickcheck=2.5-2') -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz") -md5sums=('b8f0d831b65d05e5f54ff08bd3d9d10d') - -build() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs configure --prefix=/usr --datasubdir=$pkgname - runghc Setup.lhs build -} - -package() { - cd $srcdir/$pkgname-$pkgver - runghc Setup.lhs copy --destdir=$pkgdir - install -D -m644 LICENSE $pkgdir/usr/share/licenses/alex/BSD3 - - # doc/ contains only license which already installed into proper place - rm -rf $pkgdir/usr/share/doc -} diff --git a/community-testing/almanah/PKGBUILD b/community-testing/almanah/PKGBUILD deleted file mode 100644 index b2eca6369..000000000 --- a/community-testing/almanah/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 78508 2012-10-20 02:19:17Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=almanah -pkgver=0.10.0 -pkgrel=1 -pkgdesc="Small GTK+ application to allow you to keep a diary of your life" -arch=('i686' 'x86_64') -url="http://live.gnome.org/Almanah_Diary" -license=('GPL') -depends=('evolution-data-server>=3.6.0' 'gtkspell3' 'libcryptui' 'xdg-utils') -makedepends=('intltool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('fd213b53ca2a9832df868ee44ed7c446cd6b320651e2f2d10e0a0c98aa3bfced') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/almanah/almanah.install b/community-testing/almanah/almanah.install deleted file mode 100644 index 6ce7836d2..000000000 --- a/community-testing/almanah/almanah.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/arm-elf-gcc-base/PKGBUILD b/community-testing/arm-elf-gcc-base/PKGBUILD deleted file mode 100644 index 4946b78ae..000000000 --- a/community-testing/arm-elf-gcc-base/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 75111 2012-08-14 08:27:41Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=arm-elf-gcc-base -pkgver=4.7.0 -pkgrel=2 -pkgdesc="The GNU Compiler Collection" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -url="http://gcc.gnu.org" -depends=('arm-elf-binutils' 'libmpc' 'libelf') -options=(!libtool !emptydirs zipman docs !strip) -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2) -md5sums=('2a0f1d99fda235c29d40b561f81d9a77') - -build() { - cd $srcdir/gcc-$pkgver - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - rm -rf build - mkdir build - cd build - - ../configure --prefix=/usr \ - --target=arm-elf \ - --enable-obsolete \ - --host=$CHOST \ - --build=$CHOST \ - --enable-shared --disable-nls --enable-languages=c --enable-multilib \ - --with-local-prefix=/usr/lib/arm-elf \ - --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \ - --enable-softfloat \ - --with-float=soft \ - --with-newlib \ - --with-sysroot=/usr/$CHOST/arm-elf - - make all-gcc all-target-libgcc -} - -package() { - cd $srcdir/gcc-$pkgver/build - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - make DESTDIR=$pkgdir install-gcc install-target-libgcc - - rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* - rm -f $pkgdir/usr/share/man/man7/gfdl.7* - rm -f $pkgdir/usr/share/man/man7/gpl.7* - rm -rf $pkgdir/usr/share/info - - cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ - rm -rf $pkgdir/usr/libexec - - # strip it manually - strip $pkgdir/usr/bin/* 2>/dev/null || true - find $pkgdir/usr/lib -type f -exec arm-elf-strip --strip-debug --strip-unneeded {} \; 2>/dev/null || true -} diff --git a/community-testing/assimp/PKGBUILD b/community-testing/assimp/PKGBUILD deleted file mode 100644 index 6a5087a83..000000000 --- a/community-testing/assimp/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: jepaan <jepaan at hotmail dot com> - -pkgname=assimp -pkgver=3.0.1270 -pkgrel=1 -pkgdesc="Portable Open Source library to import various well-known 3D model formats in an uniform manner" -arch=('i686' 'x86_64') -license=('BSD') -depends=('libxmu' 'zlib' 'freeglut') -makedepends=('cmake' 'boost') -url=('http://assimp.sourceforge.net/index.html') -source=("http://downloads.sourceforge.net/assimp/assimp--$pkgver-source-only.zip") -md5sums=('52aa4cf4e34e6b2a9c5f6c0b3c319af1') - -build() { - cd ${srcdir} - mkdir build - cd build - cmake ../${pkgname}--${pkgver}-source-only \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - - make DESTDIR=$pkgdir install - install -Dm644 ${srcdir}/${pkgname}--${pkgver}-source-only/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/astromenace/PKGBUILD b/community-testing/astromenace/PKGBUILD deleted file mode 100644 index a4f3d8663..000000000 --- a/community-testing/astromenace/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 77264 2012-10-08 13:00:46Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Ivan Bobrov <ibobrik at gmail dot com> -# Contributor: Black_Mage <vleon1 at gmail dot com> - -pkgname=astromenace -pkgver=1.2.0 -pkgrel=6 -pkgdesc="Hardcore 3D space shooter with spaceship upgrade possibilities. English version" -arch=('i686' 'x86_64') -url="http://www.viewizard.com/astromenace/index_linux.php" -license=('GPL3') -depends=('sdl' 'freealut' 'libjpeg' 'libvorbis' 'glu') -makedepends=('cmake' 'mesa') -source=(http://downloads.sourceforge.net/openastromenace/openamenace-src-$pkgver.tar.bz2 - http://downloads.sourceforge.net/openastromenace/oamenace-data-$pkgver.tar.bz2 - http://downloads.sourceforge.net/openastromenace/oamenace-lang-en-$pkgver.tar.bz2 - astromenace.desktop - astromenace.png - astromenace.patch - astromenace.sh) -md5sums=('3c8e7013aa64fcde7ba8a7750df51ab8' - 'a8ad3495f8eac419ebcf93473008484d' - 'f137da529da1345a0243f22fb8bf4913' - '1edc9367564a6c639a2b8199adf26a08' - '1643d876d4e21cc0c6ceddc8e7c8ceed' - '8d23310a2bb9c96dd150d30ab39799a1' - '2d4504929a620709cd058657bba335b3') - -build() { - cd $srcdir/OpenAstroMenaceSVN - - # Patch build and install the engine - patch -Np1 -i $srcdir/$pkgname.patch - cmake . -DCMAKE_INSTALL_PREFIX:PATH=/usr - sed -i 's/`sdl-config --libs`/-lSDL -lpthread/' CMakeFiles/AstroMenace.dir/link.txt - make -} - -package() { - cd $srcdir/OpenAstroMenaceSVN - - # Manually install the engine and data - install -Dm 755 AstroMenace $pkgdir/usr/bin/astromenace_bin - install -Dm 644 $srcdir/gamedata.vfs $pkgdir/usr/share/astromenace/gamedata.vfs - install -Dm 644 $srcdir/gamelang_en.vfs $pkgdir/usr/share/astromenace/gamelang_en.vfs - install -d $pkgdir/usr/share/astromenace/DATA/SCRIPT - install -m 644 $srcdir/DATA/SCRIPT/* $pkgdir/usr/share/astromenace/DATA/SCRIPT - - # Install .desktop, icon and bin - install -Dm 644 $srcdir/astromenace.desktop $pkgdir/usr/share/applications/astromenace.desktop - install -Dm 644 $srcdir/astromenace.png $pkgdir/usr/share/pixmaps/astromenace.png - install -Dm 755 $srcdir/astromenace.sh $pkgdir/usr/bin/astromenace -} diff --git a/community-testing/astromenace/astromenace.desktop b/community-testing/astromenace/astromenace.desktop deleted file mode 100644 index 2b8d57293..000000000 --- a/community-testing/astromenace/astromenace.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Astromenace -Comment=Space shooter -Exec=astromenace -Icon=/usr/share/pixmaps/astromenace.png -StartupNotify=true -Terminal=false -Type=Application -Categories=Application;Game;ArcadeGame; diff --git a/community-testing/astromenace/astromenace.patch b/community-testing/astromenace/astromenace.patch deleted file mode 100644 index b69efd9a4..000000000 --- a/community-testing/astromenace/astromenace.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur OpenAstroMenaceSVN.pristine/AstroMenaceSource/Core/RendererInterface/RendererInterface.h OpenAstroMenaceSVN.new/AstroMenaceSource/Core/RendererInterface/RendererInterface.h ---- OpenAstroMenaceSVN.pristine/AstroMenaceSource/Core/RendererInterface/RendererInterface.h 2010-02-14 11:39:06.721353373 +0100 -+++ OpenAstroMenaceSVN.new/AstroMenaceSource/Core/RendererInterface/RendererInterface.h 2010-02-14 11:46:47.171304764 +0100 -@@ -37,6 +37,8 @@ - #include "../Base.h" - #include "../Math/Math.h" - #include "../Texture/Texture.h" -+#define PFNGLCLIENTACTIVETEXTUREPROC PFNGLACTIVETEXTUREPROC -+ - - - diff --git a/community-testing/astromenace/astromenace.png b/community-testing/astromenace/astromenace.png Binary files differdeleted file mode 100644 index 6093e9272..000000000 --- a/community-testing/astromenace/astromenace.png +++ /dev/null diff --git a/community-testing/astromenace/astromenace.sh b/community-testing/astromenace/astromenace.sh deleted file mode 100644 index 02e8594df..000000000 --- a/community-testing/astromenace/astromenace.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -astromenace_bin --dir=/usr/share/astromenace "$@" diff --git a/community-testing/audex/PKGBUILD b/community-testing/audex/PKGBUILD deleted file mode 100644 index 0fbf880a4..000000000 --- a/community-testing/audex/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 74660 2012-08-01 16:22:37Z andrea $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: mightyjaym <jmambrosino@gmail.com> -# Contributor: moostik <mooostik_at_gmail.com> - -pkgname=audex -pkgver=0.74b1 -pkgrel=4 -pkgdesc="A CDDA extraction tool with a ftp upload function for KDE" -arch=('i686' 'x86_64') -url="http://kde-apps.org/content/show.php?content=77125" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'cdparanoia') -makedepends=('cmake' 'automoc4') -optdepends=('vorbis-tools: OGG encoder' - 'faac: MP4/M4A/AAC encoder' - 'flac: FLAC encoder' - 'lame: MP3 encoder') -install=${pkgname}.install -source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz" - "google_regex.patch" 'gcc47.patch') -md5sums=('20fdf9a0f89c08f44a151b6bdaab8782' - '77b33d8daead89d5f4f15b78a1cd1d55' - '64107bcf90e22910e57804be774822dd') - -build() { - # fix bug FS#25193 - patch -Np0 -i "${srcdir}"/google_regex.patch - - cd ${pkgname}-${pkgver} - patch -p1 -i "${srcdir}"/gcc47.patch - cd .. - - 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/community-testing/audex/audex.install b/community-testing/audex/audex.install deleted file mode 100644 index 81ce5c4b0..000000000 --- a/community-testing/audex/audex.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/community-testing/audex/gcc47.patch b/community-testing/audex/gcc47.patch deleted file mode 100644 index 3d0ccf024..000000000 --- a/community-testing/audex/gcc47.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- audex-0.74b1.orig/utils/hashlist.cpp -+++ audex-0.74b1/utils/hashlist.cpp -@@ -15,7 +15,8 @@ - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ -- -+ -+#include <unistd.h> - #include "hashlist.h" - - Hashlist::Hashlist() { - diff --git a/community-testing/audex/google_regex.patch b/community-testing/audex/google_regex.patch deleted file mode 100644 index 86917e66f..000000000 --- a/community-testing/audex/google_regex.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- audex-0.74b1/utils/coverfetcher.cpp 2011-01-15 12:06:25.000000000 +0100 -+++ audex-0.74b1/utils/coverfetcher_new.cpp 2011-07-20 18:43:37.554588883 +0200 -@@ -162,7 +162,10 @@ - cover_tbnids.clear(); - cover_thumbnails.clear(); - -- QRegExp rx("<a\\shref=(\\/imgres\\?imgurl=[a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+)>[\\s\\n]*<img\\ssrc=([a-zA-Z0-9\\&\\_\\%\\/\\=\\.\\:\\-\\?]+).*>[\\s\\n]*</a>"); -+ QRegExp rx("<a\\shref=\"(\\/imgres\\?imgurl=[^\"]+)\">[\\s\\n]*<img[^>]+src=\"([^>]+)\"></a>"); -+ QString html = xml; -+ html.replace( QLatin1String("&"), QLatin1String("&") ); -+ - rx.setMinimal(TRUE); - - int pos = 0; int i = 0; diff --git a/community-testing/avr-gcc/PKGBUILD b/community-testing/avr-gcc/PKGBUILD deleted file mode 100644 index 8e0e7cf79..000000000 --- a/community-testing/avr-gcc/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 75112 2012-08-14 08:28:11Z allan $ -# Maintainer: schuay <jakob.gruber@gmail.com> -# Contributor: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: danst0 <danst0@west.de> - -# Build order: avr-binutils -> avr-gcc -> avr-libc - -pkgname=avr-gcc -_pkgname=gcc -pkgver=4.7.1 -pkgrel=2 -pkgdesc="The GNU AVR Compiler Collection" -arch=('i686' 'x86_64') -license=('GPL' 'LGPL' 'custom') -url="http://gcc.gnu.org/" -depends=('avr-binutils>=2.22-3' 'cloog' 'ppl' 'gcc-libs>=4.7.0' 'libmpc') -provides=("gcc-avr=$pkgver") -replaces=('gcc-avr') -options=('!libtool' '!emptydirs' '!libtool' '!strip') -source=(http://ftp.gnu.org/gnu/gcc/${_pkgname}-${pkgver}/gcc-${pkgver}.tar.bz2) - -_basedir=${srcdir}/${_pkgname}-${pkgver} - -build() { - # default CFLAGS lead to issues later on when configure - # calls avr-gcc with -march set. - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - cd ${_basedir} - - # Do not install libiberty - sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in - - 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 \ - --enable-languages=c,c++ \ - --disable-libssp \ - --disable-nls \ - --target=avr \ - --with-as=/usr/bin/avr-as \ - --with-ld=/usr/bin/avr-ld \ - --with-gnu-as \ - --with-gnu-ld - - make -} - -package() { - cd ${srcdir}/gcc-build - - make -j1 DESTDIR=${pkgdir} install - - # Install Runtime Library Exception - install -Dm644 ${_basedir}/COPYING.RUNTIME \ - ${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION - - rm -rf ${pkgdir}/usr/share/man/man7 - rm -rf ${pkgdir}/usr/share/info -} - -md5sums=('933e6f15f51c031060af64a9e14149ff') diff --git a/community-testing/avr-gdb/PKGBUILD b/community-testing/avr-gdb/PKGBUILD deleted file mode 100644 index 2dbb56ee0..000000000 --- a/community-testing/avr-gdb/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: schuay <jakob.gruber@gmail.com> -# Contributor: Ivan Sichmann Freitas <ivansichfreitas at gmail dot com> -# Contributor: Laszlo Papp <djszapi2 at gmail dot com> -# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> -# Contributor: Vladimir Cerny <blackvladimir@gmail.com> -# Contributor: 4javier <4javieregATgmailDOTcom> - -pkgname=avr-gdb -_pkgname=gdb -pkgver=7.4 -pkgrel=2 -pkgdesc="The GNU Debugger for AVR" -arch=('i686' 'x86_64') -url="http://www.gnu.org/software/gdb/" -license=('GPL3') -depends=('python') -options=('!libtool') -source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2) -md5sums=('95a9a8305fed4d30a30a6dc28ff9d060') - -build() { - cd ${srcdir}/${_pkgname}-${pkgver} - - unset LDFLAGS - export CFLAGS="-O2 -pipe" - export CXXFLAGS="$CFLAGS" - - ./configure --prefix=/usr \ - --target=avr \ - --disable-nls \ - --enable-languages=c,c++ \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --program-prefix=avr- \ - --libexecdir=/usr/lib \ - --mandir=/usr/share/man \ - --with-system-readline - make -} - -package() { - cd ${srcdir}/${_pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - - rm -f ${pkgdir}/usr/lib/libiberty.a - rm -rf ${pkgdir}/usr/share/info - rm -rf ${pkgdir}/usr/share/gdb - rm -rf ${pkgdir}/usr/include/gdb -} diff --git a/community-testing/bitcoin/PKGBUILD b/community-testing/bitcoin/PKGBUILD deleted file mode 100644 index beb8b14fb..000000000 --- a/community-testing/bitcoin/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 73746 2012-07-15 13:17:46Z ibiru $ -# 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-testing/bitcoin/bitcoin-qt.install b/community-testing/bitcoin/bitcoin-qt.install deleted file mode 100644 index f98ba7338..000000000 --- a/community-testing/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-testing/blueman/PKGBUILD b/community-testing/blueman/PKGBUILD deleted file mode 100644 index cb4ae826b..000000000 --- a/community-testing/blueman/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 78034 2012-10-16 11:49:44Z allan $ -# Maintainer : Ionut Biru <ibiru@archlinux.org -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> - -pkgname=blueman -pkgver=1.23 -pkgrel=5 -pkgdesc="GTK+ bluetooth manager" -arch=('i686' 'x86_64') -license=('GPL') -url="http://blueman-project.org" -depends=('python2-notify' 'bluez' 'python2-dbus' 'gtk2' 'python2-gobject2' 'startup-notification' - 'obex-data-server' 'polkit-gnome' 'xdg-utils' 'hicolor-icon-theme' 'libpulse' - 'notification-daemon') -makedepends=('pyrex' 'intltool') -optdepends=('dnsmasq: For creating PAN network' - 'gconf: For gconf configuration support' - 'pulseaudio: To use the pulseaudio plugin' - 'notification-daemon: for desktop notifications' - 'libnotify: for desktop notifications' - 'modemmanager: for modem management service' - 'gnome-icon-theme: icon theme') -options=('!libtool') -install=$pkgname.install -source=(http://download.tuxfamily.org/blueman/${pkgname}-${pkgver}.tar.gz) -md5sums=('f0bee59589f4c23e35bf08c2ef8acaef') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - export PYTHON=python2 - for file in apps/blueman*; do - sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file - done - sed -i 's|"blueman-tray"|"blueman"|' blueman/plugins/applet/StatusIcon.py - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/blueman \ - --with-no-runtime-deps-check - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - echo "OnlyShowIn=GNOME;XFCE;" >> ${pkgdir}/etc/xdg/autostart/blueman.desktop -} diff --git a/community-testing/blueman/blueman.install b/community-testing/blueman/blueman.install deleted file mode 100644 index 8bf021487..000000000 --- a/community-testing/blueman/blueman.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/catalyst-dkms/3.5-do_mmap.patch b/community-testing/catalyst-dkms/3.5-do_mmap.patch deleted file mode 100644 index 04248eb7b..000000000 --- a/community-testing/catalyst-dkms/3.5-do_mmap.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/community-testing/catalyst-dkms/PKGBUILD b/community-testing/catalyst-dkms/PKGBUILD deleted file mode 100644 index 05e501cda..000000000 --- a/community-testing/catalyst-dkms/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 78743 2012-10-23 22:15:52Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero -# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert - -pkgname=catalyst-dkms -pkgver=12.10 -pkgrel=1 -pkgdesc="AMD proprietary gpu kernel driver" -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -depends=('dkms') -optdepends=('linux-headers: build the module against Arch kernel' - 'linux-lts-headers: build the module against LTS Arch kernel') -replaces=('catalyst-lts-dkms') # useless -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-catalyst-${pkgver}-x86.x86_64.zip - dkms.conf) -md5sums=('ef6ecd984e47e80849215b33fbfa5b7f' - '972049dc247a74a7162f2227078abcb0') -install=catalyst.install - -package() { - depends=(${depends[@]} "catalyst-utils=${pkgver}") - - cd ${srcdir} - - if [ "${CARCH}" = "x86_64" ]; then - _archdir=x86_64 - else - _archdir=x86 - fi - - sh ./amd-driver-installer*.run --extract fglrx-install - - cd fglrx-install - #patch -Np1 -i ../3.5-do_mmap.patch - - install -dm755 "${pkgdir}/usr/lib/modprobe.d" - install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" - cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" - sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" - - echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" - - # license - install -Dm644 "common/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community-testing/catalyst-dkms/catalyst.install b/community-testing/catalyst-dkms/catalyst.install deleted file mode 100644 index 655468646..000000000 --- a/community-testing/catalyst-dkms/catalyst.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - dkms install -m fglrx -v $1 -} - -pre_upgrade() { - local curver=$2 - # $2 is unset due to a bug. Query current version using pacman as fallback - [ -n "$curver" ] || curver=$(pacman -Qi catalyst-dkms | awk '/^Version/{print $3}') - pre_remove $curver -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - dkms remove -m fglrx -v $1 --all -} diff --git a/community-testing/catalyst-dkms/dkms.conf b/community-testing/catalyst-dkms/dkms.conf deleted file mode 100644 index 8d312da4f..000000000 --- a/community-testing/catalyst-dkms/dkms.conf +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGE_NAME="fglrx" -PACKAGE_VERSION="@VERSION@" -CLEAN="rm -f *.*o" -BUILT_MODULE_NAME[0]="fglrx" -MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" -DEST_MODULE_LOCATION[0]="/extramodules" -AUTOINSTALL="yes" diff --git a/community-testing/catalyst-utils/PKGBUILD b/community-testing/catalyst-utils/PKGBUILD deleted file mode 100644 index 2a05774b3..000000000 --- a/community-testing/catalyst-utils/PKGBUILD +++ /dev/null @@ -1,128 +0,0 @@ -# $Id: PKGBUILD 76582 2012-09-23 23:07:57Z lcarlier $ -# Maintainer: idontknow -# Contributor: to fill with a lot of people - -pkgbase=catalyst-utils -pkgname=('catalyst-utils' 'opencl-catalyst') -pkgver=12.8 -pkgrel=0.2 -pkgdesc="AMD Catalyst drivers utilities and libraries with OpenCL implementation." -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -source=("http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip" - atieventsd - atieventsd.service) -md5sums=('41c5478322b13be6909eeb46412a3aa0' - 'f729bf913613f49b0b9759c246058a87' - '14beb8cc8f59c06d5ef998e222779dae') - -if [ "${CARCH}" = "i686" ]; then - _ARCHDIR="x86" - _ARCHLIB="" - _ARCHXPIC="" -else - _ARCHDIR="x86_64" - _ARCHLIB="64" - _ARCHXPIC="_64a" -fi - -build() { - cd ${srcdir} - - sh ./amd-driver-installer*.run --extract fglrx-install -} - -package_catalyst-utils() { - pkgdesc="AMD Catalyst drivers utilities and libraries." - provides=('libgl') - conflicts=('libgl' 'nvidia-utils') - depends=('xorg-server>=1.7.0' 'xorg-server<1.13.0' 'gcc-libs' 'libxinerama' \ - 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger') - optdepends=('qt: amdcccle') - - install -dm755 "${pkgdir}"/usr/{bin,sbin} - install -dm755 "${pkgdir}"/usr/lib/{dri,xorg/modules/{dri,drivers,extensions/fglrx,linux},systemd/system} - install -dm755 "${pkgdir}"/usr/include/GL - install -dm755 "${pkgdir}"/etc/{ati,acpi/events,security/console.apps,rc.d} - install -dm755 "${pkgdir}"/usr/share/{applications,ati/amdcccle,man/man8,pixmaps} - - # binaries - cd ${srcdir}/fglrx-install - install -m755 common/usr/sbin/* "${pkgdir}/usr/sbin/" - install -m755 common/usr/X11R6/bin/* "${pkgdir}/usr/bin/" - install -m755 arch/${_ARCHDIR}/usr/sbin/* "${pkgdir}/usr/sbin/" - install -m755 arch/${_ARCHDIR}/usr/X11R6/bin/* "${pkgdir}/usr/bin/" - - # headers - install -m644 common/usr/include/GL/* "${pkgdir}/usr/include/GL/" - - # xorg/dri/gl/... drivers - cd ${srcdir}/fglrx-install/xpic${_ARCHXPIC}/usr/X11R6/lib${_ARCHLIB}/modules - install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" - install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" - install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" - install -m755 extensions/fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/fglrx/" - ln -s fglrx/fglrx-libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" - cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/X11R6/lib${_ARCHLIB} - install -m755 modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/xorg/modules/dri/" - ln -s /usr/lib/xorg/modules/dri/fglrx_dri.so "${pkgdir}/usr/lib/dri/" - install -m755 fglrx/fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/" - install -m755 *.so* "${pkgdir}/usr/lib/" - install -m644 libAMDXvBA.cap "${pkgdir}/usr/lib/" - cd ${srcdir}/fglrx-install/arch/${_ARCHDIR}/usr/lib${_ARCHLIB} - install -m755 *.so* "${pkgdir}/usr/lib/" - # needed symlinks - ln -s libatiuki.so.1.0 "${pkgdir}/usr/lib/libatiuki.so.1" - ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1" - ln -s fglrx-libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so" - ln -s libAMDXvBA.so.1.0 "${pkgdir}/usr/lib/libAMDXvBA.so.1" - ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" - - # various files - cd ${srcdir}/fglrx-install/common - install -m644 usr/share/man/man8/* "${pkgdir}/usr/share/man/man8/" - install -m644 usr/share/applications/* "${pkgdir}/usr/share/applications/" - install -m644 usr/share/icons/* "${pkgdir}/usr/share/pixmaps/" - install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" - install -m644 etc/ati/* "${pkgdir}/etc/ati/" - chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" - install -m644 etc/security/console.apps/amdcccle-su "${pkgdir}/etc/security/console.apps/" - install -m644 usr/share/applications/*.desktop "${pkgdir}/usr/share/applications/" - # use ACPI example files - install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" - install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" - # systemd and rc.d scripts - install -m755 "${srcdir}/atieventsd" "${pkgdir}/etc/rc.d/" - install -m644 "${srcdir}/atieventsd.service" "${pkgdir}/usr/lib/systemd/system/" - - # provided in opencl-catalyst package - rm "${pkgdir}"/usr/lib/lib{amdocl*,OpenCL}.so* - - # licenses - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" - install -Dm644 "${srcdir}/fglrx-install/common/usr/share/doc/amdcccle/ccc_copyrights.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/amdcccle_copyrights.txt" -} - -package_opencl-catalyst() { - pkgdesc="OpenCL implemention from AMD" - provides=('libcl') - conflicts=('libcl') - depends=('gcc-libs') - optdepends=('opencl-headers: headers necessary for OpenCL development') - - install -dm755 "${pkgdir}"/usr/{bin,lib} - install -dm755 "${pkgdir}/etc/OpenCL/vendors" - - cd ${srcdir}/fglrx-install/arch/${_ARCHDIR} - - install -m755 usr/bin/clinfo "${pkgdir}/usr/bin/" - install -m644 etc/OpenCL/vendors/amdocl*.icd "${pkgdir}/etc/OpenCL/vendors/" - install -m755 usr/lib${_ARCHLIB}/libamdocl*.so "${pkgdir}/usr/lib/" - install -m755 usr/lib${_ARCHLIB}/libOpenCL.so.1 "${pkgdir}/usr/lib/" - ln -s libOpenCL.so.1 "${pkgdir}/usr/lib/libOpenCL.so" - - # license - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community-testing/catalyst-utils/atieventsd b/community-testing/catalyst-utils/atieventsd deleted file mode 100644 index 16bd9a4fa..000000000 --- a/community-testing/catalyst-utils/atieventsd +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -ATID_PID=`pidof -o %PPID /usr/sbin/atieventsd` - -case "$1" in - start) - rc=0 - stat_busy "Starting ATI Events Daemon" - [ -z "$ATID_PID" ] && /usr/sbin/atieventsd - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - else - add_daemon atieventsd - stat_done - fi - ;; - stop) - rc=0 - stat_busy "Stopping ATI Events Daemon" - kill $ATID_PID &>/dev/null - rc=$(($rc+$?)) - if [ $rc -gt 0 ]; then - stat_fail - else - rm_daemon atieventsd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/catalyst-utils/atieventsd.service b/community-testing/catalyst-utils/atieventsd.service deleted file mode 100644 index 14dd7e210..000000000 --- a/community-testing/catalyst-utils/atieventsd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Catalyst event Daemon - -[Service] -ExecStart=/usr/sbin/atieventsd --nodaemon - -[Install] -WantedBy=multi-user.target - diff --git a/community-testing/catalyst/3.5-do_mmap.patch b/community-testing/catalyst/3.5-do_mmap.patch deleted file mode 100644 index 04248eb7b..000000000 --- a/community-testing/catalyst/3.5-do_mmap.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 -@@ -2106,6 +2106,12 @@ - } - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) -+# define NO_DO_MMAP -+# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) -+# define do_munmap(a,b,c) vm_munmap(b, c) -+#endif -+ - unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( - KCL_IO_FILE_Handle file, - unsigned long addr, -@@ -2117,10 +2123,13 @@ - - flags = MAP_SHARED; - prot = PROT_READ|PROT_WRITE; -- -+#ifdef NO_DO_MMAP -+ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); -+#else - down_write(¤t->mm->mmap_sem); - vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); - up_write(¤t->mm->mmap_sem); -+#endif - if (IS_ERR(vaddr)) - return 0; - else -@@ -2131,7 +2140,9 @@ - { - int retcode = 0; - -+#ifndef NO_DO_MMAP - down_write(¤t->mm->mmap_sem); -+#endif - #ifdef FGL_LINUX_RHEL_MUNMAP_API - retcode = do_munmap(current->mm, - addr, -@@ -2142,7 +2153,9 @@ - addr, - len); - #endif -+#ifndef NO_DO_MMAP - up_write(¤t->mm->mmap_sem); -+#endif - return retcode; - } - diff --git a/community-testing/catalyst/PKGBUILD b/community-testing/catalyst/PKGBUILD deleted file mode 100644 index 80652f726..000000000 --- a/community-testing/catalyst/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 76561 2012-09-23 08:26:49Z lcarlier $ -# Maintainer: idontknow -# Contributor: to fill with a lot of people - -pkgname=catalyst -pkgver=12.8 -pkgrel=0.1 -_extramodules=extramodules-3.5-ARCH -pkgdesc="AMD proprietary gpu drivers" -arch=('i686' 'x86_64') -url="http://www.amd.com" -license=('custom') -depends=('linux>=3.5' 'linux<3.6') -makedepends=('linux-headers>=3.5' 'linux-headers<3.6') -#conflicts=('nvidia' 'xf86-video-ati' 'ati-dri') -source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip - 3.5-do_mmap.patch) -md5sums=('41c5478322b13be6909eeb46412a3aa0' - 'a450e2e3db61994b09e9d99d95bee837') -install=catalyst.install - -build() { - cd ${srcdir} - - if [ "${CARCH}" = "x86_64" ]; then - BUILDARCH=x86_64 - _archdir=x86_64 - else - BUILDARCH=i386 - _archdir=x86 - fi - - _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" - sh ./amd-driver-installer*.run --extract fglrx-install - - cd fglrx-install - patch -Np1 -i ../3.5-do_mmap.patch - - cd common/lib/modules/fglrx/build_mod - ln -s "${srcdir}/fglrx-install/arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a - ln -s 2.6.x/Makefile - - CFLAGS_MODULE="-DMODULE -DATI -DFGL -DPAGE_ATTR_FIX=0 -DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space -D__SMP__ -DMODVERSIONS" - - make -C /usr/lib/modules/${_kernver}/build SUBDIRS="`pwd`" ARCH=${BUILDARCH} \ - MODFLAGS="$CFLAGS_MODULE" CFLAGS_MODULE="$CFLAGS_MODULE" \ - KVER=${_kernver} PAGE_ATTR_FIX=0 modules -} - -package() { - depends=(${depends[@]} "catalyst-utils=${pkgver}") - - cd ${srcdir}/fglrx-install/common/lib/modules/fglrx/build_mod - - install -Dm644 fglrx.ko "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" - install -dm755 "${pkgdir}/usr/lib/modprobe.d" - echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/catalyst.install" - gzip "${pkgdir}/usr/lib/modules/${_extramodules}/fglrx.ko" - - # license - install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community-testing/catalyst/catalyst.install b/community-testing/catalyst/catalyst.install deleted file mode 100644 index 22b72ea84..000000000 --- a/community-testing/catalyst/catalyst.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the catalyst module, reboot the system.' -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - diff --git a/community-testing/cclive/PKGBUILD b/community-testing/cclive/PKGBUILD deleted file mode 100644 index c77ec5328..000000000 --- a/community-testing/cclive/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73748 2012-07-15 13:17:58Z ibiru $ -# 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-testing/cdemu-daemon/PKGBUILD b/community-testing/cdemu-daemon/PKGBUILD deleted file mode 100644 index 78af6152f..000000000 --- a/community-testing/cdemu-daemon/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 72681 2012-06-19 12:54:14Z heftig $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Charles Lindsay <charles@chaoslizard.org> - -pkgname=cdemu-daemon -pkgver=1.5.0 -pkgrel=6 -pkgdesc="CD/DVD-ROM device emulator daemon" -arch=('i686' 'x86_64') -url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver") -optdepends=('alsa-lib: to enable the ALSA audio driver' - 'pulseaudio: to enable the PA audio driver') -backup=('etc/conf.d/cdemud' - 'etc/dbus-1/system.d/cdemud-dbus.conf') -install=$pkgname.install -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - 'cdemud.conf' 'cdemud.rc' 'system.patch' 'cdemu-daemon.service' - 'cdemud-dbus.conf') -md5sums=('5ba780caa26d855942512b5b3c22405a' - '6f31ad7a64d320cf4d6820432184070b' - 'cbc0937ef4ac50db3ce5cdbbe2e17a3b' - '90a2516639c05737fa10a110a1cba467' - 'be9a8f50da3f42129c0a0e3dea8cd56c' - 'afbf24bcdec382f58d95ba5de29bff71') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # make things Arch-friendly - patch -Np1 -i "$srcdir/system.patch" - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/$pkgname - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - # Custom dbus policy, tightening security to console and 'cdemu' group - install -m644 "$srcdir/cdemud-dbus.conf" \ - "$pkgdir/etc/dbus-1/system.d/cdemud-dbus.conf" - - # the init stuff - install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud" - install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud" - install -d "$pkgdir/usr/lib/modules-load.d" - echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" - - # for systemd - install -Dm644 "$srcdir/cdemu-daemon.service" \ - "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service" - echo "SystemdService=cdemu-daemon.service" >> \ - "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEMUD_Daemon.service" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/cdemu-daemon/cdemu-daemon.install b/community-testing/cdemu-daemon/cdemu-daemon.install deleted file mode 100644 index ba34d1ea0..000000000 --- a/community-testing/cdemu-daemon/cdemu-daemon.install +++ /dev/null @@ -1,27 +0,0 @@ -post_install () { - cat <<MSG - > The daemon is automatically started, but can be manually - started via /etc/rc.d/cdemud or cdemu-daemon.service. - > See /etc/conf.d/cdemud for further configuration. - - > Only users at the console or in the 'cdemu' group can - communicate with the system daemon or use a session - daemon. - - > If you want to output CD-Audio, write AUDIO_DRIVER=pulse or - AUDIO_DRIVER=alsa to ~/.cdemud and use "cdemu -b session" - to control a session daemon. -MSG - - return 0 -} - -post_upgrade () { - # Repeat install message due to policy changes - # Added on 2012-06-19, remove after a grace period - post_install - - return 0 -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/cdemu-daemon/cdemu-daemon.service b/community-testing/cdemu-daemon/cdemu-daemon.service deleted file mode 100644 index 9879a3e6f..000000000 --- a/community-testing/cdemu-daemon/cdemu-daemon.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=CDEmu Daemon - -[Service] -Type=dbus -BusName=net.sf.cdemu.CDEMUD_Daemon -ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/cdemu-daemon/cdemud-dbus.conf b/community-testing/cdemu-daemon/cdemud-dbus.conf deleted file mode 100644 index 3043fe251..000000000 --- a/community-testing/cdemu-daemon/cdemud-dbus.conf +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> - -<busconfig> - <!-- Only root can own the CDEMUD_Daemon service on bus --> - <policy user="root"> - <allow own="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> - <policy group="root"> - <allow own="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> - - <!-- Allow users at the console to invoke methods on the interface --> - <policy at_console="true"> - <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> - - <!-- Allow users in the 'cdemu' group to invoke methods on the interface --> - <policy group="cdemu"> - <allow send_destination="net.sf.cdemu.CDEMUD_Daemon"/> - </policy> -</busconfig> - diff --git a/community-testing/cdemu-daemon/cdemud.conf b/community-testing/cdemu-daemon/cdemud.conf deleted file mode 100644 index 1d8c55fe6..000000000 --- a/community-testing/cdemu-daemon/cdemud.conf +++ /dev/null @@ -1,8 +0,0 @@ -# how many optical drives to emulate -NUM_DEVICES=2 - -# audio backend (null, alsa or pulse) -AUDIO_DRIVER=null - -# log file -LOG_FILE=/var/log/cdemud.log diff --git a/community-testing/cdemu-daemon/cdemud.rc b/community-testing/cdemu-daemon/cdemud.rc deleted file mode 100644 index 09b9ec345..000000000 --- a/community-testing/cdemu-daemon/cdemud.rc +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting cdemud" - /usr/lib/cdemu-daemon/cdemu-daemon-system.sh & - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon cdemud - stat_done - fi - ;; - stop) - stat_busy "Stopping cdemud" - kill `pidof cdemud` &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - rm_daemon cdemud - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/cdemu-daemon/system.patch b/community-testing/cdemu-daemon/system.patch deleted file mode 100644 index 3c3d4b221..000000000 --- a/community-testing/cdemu-daemon/system.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh ---- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh 2012-03-25 16:35:40.577837996 +0800 -+++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh 2012-03-25 16:39:12.180024983 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from ~/.cdemu-daemon -+# from ~/.cdemud - - # Default settings - NUM_DEVICES=2 --AUDIO_DRIVER=pulse --LOG_FILE=~/.cdemu-daemon.log -+AUDIO_DRIVER=null -+LOG_FILE=~/.cdemud.log - - # Read the settings --CONFIG_FILE=~/.cdemu-daemon -+CONFIG_FILE=~/.cdemud - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; -diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh ---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 -+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 -@@ -1,15 +1,15 @@ - #!/bin/sh - # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional - # configuration (number of devices, audio driver, log file) are read --# from /etc/sysconfig/cdemu-daemon -+# from /etc/conf.d/cdemud - - # Default settings - NUM_DEVICES=2 - AUDIO_DRIVER=null --LOG_FILE=/tmp/cdemu-daemon.log -+LOG_FILE=/var/log/cdemud.log - - # Read the settings --CONFIG_FILE=/etc/sysconfig/cdemu-daemon -+CONFIG_FILE=/etc/conf.d/cdemud - - if [ -f ${CONFIG_FILE} ]; then - . ${CONFIG_FILE}; diff --git a/community-testing/cdfs/PKGBUILD b/community-testing/cdfs/PKGBUILD deleted file mode 100644 index 519ab7394..000000000 --- a/community-testing/cdfs/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 74544 2012-07-30 13:38:15Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> - -pkgname=cdfs -pkgver=2.6.27 -pkgrel=26 -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/cegui/PKGBUILD b/community-testing/cegui/PKGBUILD deleted file mode 100644 index 3d0514fb2..000000000 --- a/community-testing/cegui/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 74509 2012-07-29 21:15:11Z ebelanger $ -# 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=5 -pkgdesc="A free library providing windowing and widgets for graphics APIs/engines" -arch=('i686' 'x86_64') -url="http://crayzedsgui.sourceforge.net" -#options=('!libtool') -license=("MIT") -depends=('pcre' 'glew' 'expat' 'freetype2' 'libxml2' 'devil' 'freeglut' 'lua' 'silly') -makedepends=('python2' 'doxygen' '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-testing/cegui/cegui-0.7.6-python-detection.patch b/community-testing/cegui/cegui-0.7.6-python-detection.patch deleted file mode 100644 index e14cd812e..000000000 --- a/community-testing/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-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/chromium-bsu/PKGBUILD b/community-testing/chromium-bsu/PKGBUILD deleted file mode 100644 index 338f16747..000000000 --- a/community-testing/chromium-bsu/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 77219 2012-10-07 13:58:24Z jelle $ -# Maintainer: Allan McRae <allan@archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=chromium-bsu -pkgver=0.9.15 -pkgrel=3 -pkgdesc="A fast paced top scrolling shooter" -arch=('i686' 'x86_64') -url="http://chromium-bsu.sourceforge.net/" -license=('custom:artistic') -depends=('freeglut' 'glu' 'sdl' 'openal' 'freealut' 'glpng' 'ftgl' 'fontconfig' 'sdl_image') -install=chromium-bsu.install -source=(http://downloads.sourceforge.net/project/$pkgname/Chromium%20B.S.U.%20source%20code/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('d57137a1ac2292363b35192724c7e3be') - -build(){ - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - install -Dm644 COPYING $pkgdir/usr/share/licenses/chromium-bsu/LICENSE -} - diff --git a/community-testing/chromium-bsu/chromium-bsu.install b/community-testing/chromium-bsu/chromium-bsu.install deleted file mode 100644 index 6b1b64bdd..000000000 --- a/community-testing/chromium-bsu/chromium-bsu.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-testing/chrony/PKGBUILD b/community-testing/chrony/PKGBUILD deleted file mode 100644 index d066a606e..000000000 --- a/community-testing/chrony/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 72549 2012-06-16 17:08:48Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Patrick Leslie Polzer <leslie.polzer@gmx.net> -# Contributor: cdhotfire <cdhotfire@gmail.com> -# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw> -# Contributor: Elisamuel Resto <ryuji@simplysam.us> - -pkgname=chrony -pkgver=1.26 -pkgrel=3 -pkgdesc='Lightweight NTP client and server' -arch=('i686' 'x86_64') -url="http://chrony.tuxfamily.org/" -options=('strip') -license=('GPL') -depends=('readline' 'libcap') -backup=('etc/chrony.conf') -source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz - rc.d - service) -md5sums=('ad6dd619ff1986e4ff780363c64e2246' - 'd8b653c8bcc76cef00aa10fbd3eeb4f7' - 'd78e6189c6f51a2af30a65bdedcdb2eb') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf - install -Dm0755 $srcdir/rc.d $pkgdir/etc/rc.d/chrony - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service -} diff --git a/community-testing/chrony/rc.d b/community-testing/chrony/rc.d deleted file mode 100644 index ec042d798..000000000 --- a/community-testing/chrony/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/chronyd` -case "$1" in - start) - stat_busy "Starting chrony Daemon" - if [ -z "$PID" ]; then - /usr/sbin/chronyd $NTPD_ARGS & - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon chrony - stat_done - fi - ;; - stop) - stat_busy "Stopping chrony Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon chrony - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/chrony/service b/community-testing/chrony/service deleted file mode 100644 index 8bc8da9d2..000000000 --- a/community-testing/chrony/service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Chrony Network Time Daemon - -[Service] -Type=forking -ExecStart=/usr/sbin/chronyd -PIDFile=/var/run/chronyd.pid - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/conntrack-tools/01-config-file-path.patch b/community-testing/conntrack-tools/01-config-file-path.patch deleted file mode 100644 index 9041ddbc4..000000000 --- a/community-testing/conntrack-tools/01-config-file-path.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/include/conntrackd.h 2012-05-26 15:29:15.630027223 +0200 -+++ b/include/conntrackd.h 2012-05-27 02:26:59.426811589 +0200 -@@ -50,7 +50,7 @@ - #define EXP_DUMP_INT_XML 47 /* dump internal cache in XML */ - #define EXP_DUMP_EXT_XML 48 /* dump external cache in XML */ - --#define DEFAULT_CONFIGFILE "/etc/conntrackd/conntrackd.conf" -+#define DEFAULT_CONFIGFILE "/etc/conntrackd.conf" --#define DEFAULT_LOCKFILE "/var/lock/conntrackd.lock" -+#define DEFAULT_LOCKFILE "/run/lock/conntrackd.lock" - #define DEFAULT_LOGFILE "/var/log/conntrackd.log" - #define DEFAULT_STATS_LOGFILE "/var/log/conntrackd-stats.log" diff --git a/community-testing/conntrack-tools/02-fix-compilation-of-timeout-extension.patch b/community-testing/conntrack-tools/02-fix-compilation-of-timeout-extension.patch deleted file mode 100644 index 746934994..000000000 --- a/community-testing/conntrack-tools/02-fix-compilation-of-timeout-extension.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 18efbc802479ce042378dc0cccc7577e1c6afa41 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Sat, 26 May 2012 20:58:16 +0200 -Subject: [PATCH] nfct: fix compilation of timeout extension -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -nfct-extensions/timeout.c: In function ânfct_timeout_cbâ: -nfct-extensions/timeout.c:99:2: warning: passing argument 4 of ânfct_timeout_snprintfâ makes integer from pointer without a cast [enabled by default] -/usr/include/libnetfilter_cttimeout/libnetfilter_cttimeout.h:114:5: note: expected âunsigned intâ but argument is of type âstruct nfct_timeout *â - -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - src/nfct-extensions/timeout.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/nfct-extensions/timeout.c b/src/nfct-extensions/timeout.c -index a1a5c52..5b32023 100644 ---- a/src/nfct-extensions/timeout.c -+++ b/src/nfct-extensions/timeout.c -@@ -96,7 +96,7 @@ static int nfct_timeout_cb(const struct nlmsghdr *nlh, void *data) - goto err_free; - } - -- nfct_timeout_snprintf(buf, sizeof(buf), t, 0); -+ nfct_timeout_snprintf(buf, sizeof(buf), t, NFCT_TIMEOUT_O_DEFAULT, 0); - printf("%s\n", buf); - - err_free: --- -1.7.2.5 - diff --git a/community-testing/conntrack-tools/PKGBUILD b/community-testing/conntrack-tools/PKGBUILD deleted file mode 100644 index d8d986e66..000000000 --- a/community-testing/conntrack-tools/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 77397 2012-10-09 15:40:57Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Valere Monseur <valere_monseur@hotmail.com> -# Contributor: Alessandro Sagratini <ale_sagra@hotmail.com> -# Contributor: Kevin Edmonds <edmondskevin@hotmail.com> - -pkgname=conntrack-tools -pkgver=1.4.0 -pkgrel=1 -pkgdesc='Userspace tools to interact with the Netfilter connection tracking system' -arch=('i686' 'x86_64') -url='http://www.netfilter.org/projects/conntrack-tools' -license=('GPL2') -depends=('libnetfilter_conntrack' - 'libnetfilter_cttimeout' - 'libnetfilter_cthelper' - 'libnetfilter_queue') -backup=('etc/conntrackd.conf' 'etc/conf.d/conntrackd') -options=('!libtool') -source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2" - 'conntrackd.rc' - 'conntrackd.conf' - 'conntrackd.service' - '01-config-file-path.patch') -install=$pkgname.install -md5sums=('ee737c774e01349f75e935228a2d851b' - '478fe76da0202fcb5249bf65968d1c26' - 'd3e73e81b54e3e8166d357d434680684' - 'bd135eaefb47923bb8e8d26f084d3e9d' - 'e71ff7b8c4997b797cab3eaaccb693f4') - -build() { - cd $pkgname-$pkgver - for i in "$srcdir"/*.patch; do - patch -p1 -i "$i" - done - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - # install binaries - pushd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - popd - # initscripts & systemd - install -D -m 755 conntrackd.rc "$pkgdir/etc/rc.d/conntrackd" - install -D -m 644 conntrackd.conf "$pkgdir/etc/conf.d/conntrackd" - install -D -m 644 conntrackd.service \ - "$pkgdir/usr/lib/systemd/system/conntrackd.service" - # install empty configuration files - install -D -m 644 /dev/null "$pkgdir/etc/conntrackd.conf" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/conntrack-tools/conntrack-tools.install b/community-testing/conntrack-tools/conntrack-tools.install deleted file mode 100644 index d21a5f92c..000000000 --- a/community-testing/conntrack-tools/conntrack-tools.install +++ /dev/null @@ -1,9 +0,0 @@ -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - [ $(vercmp "$2" '1.0.1-2') -gt 0 ] || cat <<EOF -Config file have been moved from /etc/conntrackd/conntrackd.conf to /etc/conntrackd.conf. -EOF -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/conntrack-tools/conntrackd.conf b/community-testing/conntrack-tools/conntrackd.conf deleted file mode 100644 index 285f566d2..000000000 --- a/community-testing/conntrack-tools/conntrackd.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -#DAEMON_OPTIONS='' diff --git a/community-testing/conntrack-tools/conntrackd.rc b/community-testing/conntrack-tools/conntrackd.rc deleted file mode 100644 index 4300a7041..000000000 --- a/community-testing/conntrack-tools/conntrackd.rc +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/sbin/conntrackd -PID=$(pidof -o %PPID $DAEMON) -DAEMON_OPTIONS="-d $DAEMON_OPTIONS" - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTIONS && add_daemon ${0##*/} && stat_done && exit 0 - stat_fail - ;; - stop) - stat_busy "Stopping ${0##*/} daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon ${0##*/} && stat_done && exit 0 - stat_fail - ;; - restart) - $0 stop - $0 start - exit 0 - ;; - *) - echo "usage: ${0##*/} {start|stop|restart}" >&2 - ;; -esac - -exit 1 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/conntrack-tools/conntrackd.service b/community-testing/conntrack-tools/conntrackd.service deleted file mode 100644 index 25a113785..000000000 --- a/community-testing/conntrack-tools/conntrackd.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Conntrack Daemon - -[Service] -ExecStart=/usr/sbin/conntrackd - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/cython/PKGBUILD b/community-testing/cython/PKGBUILD deleted file mode 100644 index 3e20aed0f..000000000 --- a/community-testing/cython/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 78039 2012-10-16 11:50:02Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Igor Scabini <furester @ gmail.com> - -pkgname=('cython' 'cython2') -pkgbase=cython -pkgver=0.17 -pkgrel=2 -pkgdesc="C-Extensions for Python " -arch=(i686 x86_64) -url="http://www.cython.org" -license=('APACHE') -makedepends=('python-distribute' 'python2-distribute') -source=("http://cython.org/release/Cython-$pkgver.tar.gz") -md5sums=('d6b669956b25babf7dd86db0a98539e4') - -build() { - true -} - -package_cython() { - depends=('python') - - cd $srcdir/Cython-$pkgver - python setup.py install --root=$pkgdir - - sed -i 's|#!.*python|#!/usr/bin/python3|' $pkgdir/usr/bin/* -} - -package_cython2() { - depends=('python2') - - cd $srcdir/Cython-$pkgver - python2 setup.py install --root=$pkgdir - - mv $pkgdir/usr/bin/cygdb $pkgdir/usr/bin/cygdb2 - mv $pkgdir/usr/bin/cython $pkgdir/usr/bin/cython2 -} diff --git a/community-testing/darktable/PKGBUILD b/community-testing/darktable/PKGBUILD deleted file mode 100644 index 5ee3e0125..000000000 --- a/community-testing/darktable/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 74728 2012-08-02 15:23:34Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Christian Himpel <chressie at gmail dot com> -# Contributor: Johannes Hanika <hanatos at gmail dot com> - -pkgname=darktable -pkgver=1.0.5 -_pkgver=1.0 -pkgrel=2 -pkgdesc="Utility to organize and develop raw images" -arch=('i686' 'x86_64') -url=http://darktable.sf.net/ -license=('GPL3') -depends=('exiv2>=0.18' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade' 'dbus-glib' - 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite') -makedepends=('intltool>=0.40' 'cmake' 'librsvg') -# 'gnome-doc-utils' 'libxslt' 'fop') -optdepends=('librsvg') -install=darktable.install -options=(!libtool) -source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz) -md5sums=('9ad88a1a6b9761fce28c8073d8f47941') - -build() { - cd $srcdir/$pkgname-$pkgver -# mv doc/usermanual/CMakeLists.tx doc/usermanual/CMakeLists.txt - mkdir -p build - cd build - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DDONT_INSTALL_GCONF_SCHEMAS=True \ - -DBINARY_PACKAGE_BUILD=1 \ - -DUSE_GCONF_BACKEND=Off \ - -DBUILD_USERMANUAL=False \ - .. - make -} - -package() { - cd $srcdir/$pkgname-$pkgver/build - make DESTDIR=$pkgdir install - mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}" -# mkdir -p "${pkgdir}/usr/share/gconf/schemas/" -# mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/" -} diff --git a/community-testing/darktable/darktable.install b/community-testing/darktable/darktable.install deleted file mode 100644 index 9fd6af293..000000000 --- a/community-testing/darktable/darktable.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=darktable - -post_install() { -# usr/sbin/gconfpkg --install ${pkgname} - [ -x `which update-desktop-database` ] && update-desktop-database -q -} - -pre_upgrade() { - pre_remove -} - -post_upgrade() { - post_install -} - -pre_remove() { -# usr/sbin/gconfpkg --uninstall ${pkgname} - true -} - -post_remove() { - [ -x `which update-desktop-database` ] && update-desktop-database -q -} diff --git a/community-testing/dcron/PKGBUILD b/community-testing/dcron/PKGBUILD deleted file mode 100644 index 709124059..000000000 --- a/community-testing/dcron/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 72550 2012-06-16 17:08:55Z dreisner $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Paul Mattal <paul.archlinux.org> - -pkgname=dcron -pkgver=4.5 -pkgrel=3 -pkgdesc="dillon's lightweight cron daemon" -arch=('i686' 'x86_64') -license=('GPL') -url="http://www.jimpryor.net/linux/dcron.html" -backup=('var/spool/cron/root' 'etc/conf.d/crond') -depends=('bash') -provides=('cron') -conflicts=('cron') -optdepends=('smtp-server: sending cron job output via email') -install=$pkgname.install -source=(http://www.jimpryor.net/linux/releases/${pkgname}-${pkgver}.tar.gz - service) -md5sums=('078833f3281f96944fc30392b1888326' - '5a68a7aee883738e7f7f8549481bb297') - -build() { - cd "$srcdir/${pkgname}-${pkgver}" - - # by default, any member of group "users" can edit their own crontab - make \ - PREFIX=/usr \ - CRONTAB_GROUP=users \ - CRONTABS=/var/spool/cron \ - CRONSTAMPS=/var/spool/cronstamps -} - -package() { - cd "$srcdir/${pkgname}-${pkgver}" - make DESTDIR="$pkgdir" install - - # install standard configuration and scripts - install -d -m755 "$pkgdir/etc/cron."{hourly,daily,weekly,monthly} - - install -D -m755 extra/run-cron "$pkgdir/usr/sbin/run-cron" - install -D -m0600 extra/root.crontab "$pkgdir/var/spool/cron/root" - install -D -m755 extra/crond.rc "$pkgdir/etc/rc.d/crond" - install -D -m0644 extra/crond.conf "$pkgdir/etc/conf.d/crond" - install -D -m644 extra/crontab.vim "$pkgdir/usr/share/vim/vimfiles/ftplugin/crontab.vim" - sed -i -e 's=/var/spool/cron/cronstamps=/var/spool/cronstamps=' extra/prune-cronstamps - install -D -m755 extra/prune-cronstamps "$pkgdir/etc/cron.d/prune-cronstamps" - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/dcron.service -} diff --git a/community-testing/dcron/dcron.install b/community-testing/dcron/dcron.install deleted file mode 100644 index df23d0224..000000000 --- a/community-testing/dcron/dcron.install +++ /dev/null @@ -1,6 +0,0 @@ -post_upgrade() { - if [ $(vercmp $2 4.0) -lt 0 ] - then - echo "Restart crond, since you're upgrading to the dcron 4.x series." - fi -} diff --git a/community-testing/dcron/service b/community-testing/dcron/service deleted file mode 100644 index 59fc64b80..000000000 --- a/community-testing/dcron/service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Periodic Command Scheduler - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/crond -ExecStart=/usr/sbin/crond $CROND_ARGS - -[Install] -WantedBy=multi-user.target 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/dee/PKGBUILD b/community-testing/dee/PKGBUILD deleted file mode 100644 index 577c0efdb..000000000 --- a/community-testing/dee/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 78040 2012-10-16 11:50:05Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=dee -pkgver=1.0.14 -pkgrel=2 -pkgdesc="Library to provide objects allowing to create Model-View-Controller type programs across DBus" -arch=('i686' 'x86_64') -url="https://launchpad.net/dee" -license=('LGPL') -depends=('glib2' 'icu') -makedepends=('python2' 'gobject-introspection' 'vala') -options=('!libtool') -source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('473b4181e26538af0fb753255da7945c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-tests \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # Install GI overrides for python 3 as well - install -dm755 "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides" - ln -s ../../../../python2.7/site-packages/gi/overrides/Dee.py "$pkgdir/usr/lib/python3.3/site-packages/gi/overrides/Dee.py" -} diff --git a/community-testing/desmume/PKGBUILD b/community-testing/desmume/PKGBUILD deleted file mode 100644 index 2a5d0a3bf..000000000 --- a/community-testing/desmume/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 77556 2012-10-12 07:01:24Z schuay $ -# Maintainer: Jonathan Conder <jonno dot conder at gmail dot com> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Nathan Jones <nathanj@insightbb.com> -# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com> -# Contributor: angvp <angvp at archlinux dot us> -# Contributor: Allan <mcrae_allan at hotmail dot com> -# Contributor: w0rm <w0rmtux at gmail dot com> -# Contributor: vEX <vex at niechift dot com> -# Contributor: Asher256 <achrafcherti at gmail dot com> - -pkgname=desmume -pkgver=0.9.8 -pkgrel=3 -pkgdesc="Nintendo DS emulator" -arch=('i686' 'x86_64') -url="http://desmume.org/" -license=('GPL') -depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap' - 'soundtouch' 'alsa-lib' 'zziplib' 'glu') -makedepends=('intltool') -install=desmume.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz") - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --enable-wifi - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} - -md5sums=('fb7c984c924087888b9eaaad8cb1875e') diff --git a/community-testing/desmume/desmume.install b/community-testing/desmume/desmume.install deleted file mode 100644 index e111ef946..000000000 --- a/community-testing/desmume/desmume.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/directfb/DirectFB-1.6.1-zlib-include.patch b/community-testing/directfb/DirectFB-1.6.1-zlib-include.patch deleted file mode 100644 index e4f24a5cf..000000000 --- a/community-testing/directfb/DirectFB-1.6.1-zlib-include.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur DirectFB-1.6.0-orig/src/core/surface.c DirectFB-1.6.0/src/core/surface.c ---- DirectFB-1.6.0-orig/src/core/surface.c 2012-06-20 02:21:36.029994460 -0400 -+++ DirectFB-1.6.0/src/core/surface.c 2012-06-20 02:22:48.533330819 -0400 -@@ -28,6 +28,8 @@ - - #include <config.h> - -+#include <zlib.h> -+ - #include <direct/debug.h> - - #include <core/core.h> diff --git a/community-testing/directfb/PKGBUILD b/community-testing/directfb/PKGBUILD deleted file mode 100644 index f67f56ce3..000000000 --- a/community-testing/directfb/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 73967 2012-07-17 18:47:33Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=directfb -pkgver=1.6.1 -pkgrel=1 -pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" -arch=('i686' 'x86_64') -url="http://www.directfb.org" -license=('LGPL') -depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2') -options=('!libtool') -source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz \ - DirectFB-1.6.1-zlib-include.patch) -sha1sums=('121c7fd1e81ccb41962986126e1d69f188c2f2c2' - 'f2309edd87c772a7894d4b648d56197d91790cad') - -build() { - cd "${srcdir}/DirectFB-${pkgver}" - patch -p1 -i ../DirectFB-1.6.1-zlib-include.patch - ./configure --prefix=/usr --sysconfdir=/etc --enable-static \ - --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \ - --enable-video4linux2 --enable-voodoo - make -} - -package() { - cd "${srcdir}/DirectFB-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/drbd/01-remove-old-sanity-check.diff b/community-testing/drbd/01-remove-old-sanity-check.diff deleted file mode 100644 index 04edb7571..000000000 --- a/community-testing/drbd/01-remove-old-sanity-check.diff +++ /dev/null @@ -1,24 +0,0 @@ -From: Lars Ellenberg <lars.ellenberg@linbit.com> -Date: Thu, 3 Nov 2011 09:40:43 +0000 (+0100) -Subject: build: remove old sanity check to allow build against linux 3.1 -X-Git-Url: http://git.drbd.org/gitweb.cgi?p=drbd-8.3.git;a=commitdiff_plain;h=790c26b09519b9e02b3a7cf7897fb17c2ae339bf - -build: remove old sanity check to allow build against linux 3.1 ---- - -diff --git a/drbd/Makefile b/drbd/Makefile -index 0985340..7a09603 100644 ---- a/drbd/Makefile -+++ b/drbd/Makefile -@@ -90,11 +90,6 @@ else - endif - endif - -- KDIR_Makefile_PATCHLEVEL = $(shell test -e $(KDIR)/Makefile && grep "^PATCHLEVEL = " $(KDIR)/Makefile | cut -d " " -f 3) -- ifneq ($(findstring $(KDIR_Makefile_PATCHLEVEL),12345),) -- $(error "won't compile with this kernel version") -- endif -- - .PHONY: drbd.o default all greeting clean kbuild install dep tags - - drbd.o: greeting kbuild diff --git a/community-testing/drbd/PKGBUILD b/community-testing/drbd/PKGBUILD deleted file mode 100644 index 5afc6db41..000000000 --- a/community-testing/drbd/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 75398 2012-08-21 20:52:40Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=drbd -pkgver=8.3.13 -pkgrel=1 -arch=('i686' 'x86_64') -pkgdesc='Userland tools for Distributed Replicated Block Device' -url='http://www.drbd.org' -license=('GPL2') -depends=('perl' 'bash') -source=("http://oss.linbit.com/drbd/8.3/$pkgname-$pkgver.tar.gz" - "$pkgname.rc" - "$pkgname.service") -backup=('etc/drbd.conf' 'etc/drbd.d/global_common.conf') -md5sums=('760a25459ef6b7262a2a3572c1561c5b' - '8902a2f7aca6245c27e9566a1509312c' - 'afbb345094db49b0a474c0b4e51c0acd') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --localstatedir=/var \ - --sysconfdir=/etc \ - --with-distro=generic \ - --with-utils \ - --with-bashcompletion \ - --with-udev \ - --without-km \ - --without-rgmanager \ - --without-pacemaker \ - --without-heartbeat \ - --without-xen \ - --with-initdir=/etc/rc.d - #--with-legacy_utils \ - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # move forced /sbin binaries - cd "$pkgdir" - mv sbin/* usr/sbin - rmdir sbin - # fix hardcoded path in udev rules - sed -i 's,/sbin/drbdadm,/usr/sbin/drbdadm,' etc/udev/rules.d/65-drbd.rules - # move udev files - mv etc/udev usr/lib - # move bash completion - install -dm 755 usr/share/bash-completion - mv etc/bash_completion.d usr/share/bash-completion/completions - # remove /var/lock - rmdir var/lock - # autoload module - install -Dm 644 /dev/null usr/lib/modules-load.d/$pkgname.conf - echo 'drbd' > usr/lib/modules-load.d/$pkgname.conf - # setup initscript (replace) - cd "$srcdir" - install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - # install systemd stuff - install -Dm 644 $pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/drbd/drbd.rc b/community-testing/drbd/drbd.rc deleted file mode 100644 index b8b196e4b..000000000 --- a/community-testing/drbd/drbd.rc +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash -# Written by Sébastien Luttringer - -. /etc/rc.conf -. /etc/rc.d/functions - -DRBDADM='/usr/sbin/drbdadm' -PROC_DRBD='/proc/drbd' - -check_config() { - # check if module is loaded - if [[ ! -e $PROC_DRBD ]]; then - echo "Missing $PROC_DRBD. Try to load drbd module!" - stat_fail - exit 1 - fi - # check if config is correct - if ! $DRBDADM dump &>/dev/null; then - echo 'Invalid configuration' - stat_fail - exit 1 - fi -} - -case "$1" in - start) - stat_busy 'Starting DRBD resources' - # check module and config - check_config - # load config - $DRBDADM adjust all 2>/dev/null || { stat_fail; exit 1; } - # user interruptible version of wait-connect all - $DRBDADM wait-con-int 2>/dev/null || { stat_fail; exit 1; } - # become primary if configured - $DRBDADM sh-b-pri all 2>/dev/nul l|| { stat_fail; exit 1; } - add_daemon drbd - stat_done - ;; - stop) - stat_busy 'Stopping DRBD resources' - # check module and config - check_config - # disconnect and detach all resources - $DRBDADM down all 2>/dev/null || { stat_fail; exit 1; } - rm_daemon drbd - stat_done - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac - -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/drbd/drbd.service b/community-testing/drbd/drbd.service deleted file mode 100644 index ddd6c62b7..000000000 --- a/community-testing/drbd/drbd.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Distributed Replicated Block Device -After=systemd-modules-load.service network.target - -[Service] -Type=oneshot -RemainAfterExit=yes - -# load config -ExecStart=/usr/sbin/drbdadm adjust all -# user interruptible version of wait-connect all -ExecStart=/usr/sbin/drbdadm wait-con-int -# become primary if configured -ExecStart=/usr/sbin/drbdadm sh-b-pri all -# disconnect and detach all resources -ExecStop=/usr/sbin/drbdadm down all - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/duplicity/PKGBUILD b/community-testing/duplicity/PKGBUILD deleted file mode 100644 index fdfac734f..000000000 --- a/community-testing/duplicity/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 78042 2012-10-16 11:50:16Z allan $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Aaron Schaefer <aaron@elasticdog.com> - -pkgname=duplicity -pkgver=0.6.19 -pkgrel=2 -pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' -arch=('i686' 'x86_64') -url='http://www.nongnu.org/duplicity/' -license=('GPL') -depends=('librsync' 'ncftp' 'python2' 'python2-boto' 'python2-gnupginterface' 'python2-paramiko') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('c88122d0b651f84f3bfa42e55591c36b' - 'df672ed47b8eb4fd8ffa99711623b6b5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - python2 setup.py install --root="$pkgdir" --optimize=1 - - # fix broken documentation permissions until upstream does (FS#27301) - chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1" - chmod 644 "$pkgdir/usr/share/man/man1/rdiffdir.1" - chmod 644 "$pkgdir/usr/share/doc/$pkgname-$pkgver"/* -} diff --git a/community-testing/duplicity/botobackend.patch b/community-testing/duplicity/botobackend.patch deleted file mode 100644 index 302e1e2b1..000000000 --- a/community-testing/duplicity/botobackend.patch +++ /dev/null @@ -1,13 +0,0 @@ -=== modified file duplicity/backends/botobackend.py ---- duplicity/backends/botobackend.py 2011-11-25 17:47:57 +0000 -+++ duplicity/backends/botobackend.py 2011-12-01 16:15:25 +0000 -@@ -26,6 +26,6 @@ - if sys.version_info[:2] < (2,6): - print "Sorry, S3 multiprocessing requires version 2.6 or later of python" - sys.exit(1) -- import _boto_multi.py -+ import _boto_multi - else: -- import _boto_single.py -+ import _boto_single - diff --git a/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch b/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch deleted file mode 100644 index 1c4c8daff..000000000 --- a/community-testing/duplicity/duplicity-0.6.17-fix-memleak.patch +++ /dev/null @@ -1,29 +0,0 @@ -=== modified file 'duplicity/util.py' ---- duplicity/util.py 2011-08-23 18:14:17 +0000 -+++ duplicity/util.py 2012-01-20 21:50:01 +0000 -@@ -71,6 +71,10 @@ - else: - raise - -+class BlackHoleList(list): -+ def append(self, x): -+ pass -+ - class FakeTarFile: - debug = 0 - def __iter__(self): -@@ -83,7 +87,12 @@ - # yet. So we want to ignore ReadError exceptions, which are used to signal - # this. - try: -- return tarfile.TarFile("arbitrary", mode, fp) -+ tf = tarfile.TarFile("arbitrary", mode, fp) -+ # Now we cause TarFile to not cache TarInfo objects. It would end up -+ # consuming a lot of memory over the lifetime of our long-lasting -+ # signature files otherwise. -+ tf.members = BlackHoleList() -+ return tf - except tarfile.ReadError: - return FakeTarFile() - - diff --git a/community-testing/electricsheep/PKGBUILD b/community-testing/electricsheep/PKGBUILD deleted file mode 100644 index 548a0eda1..000000000 --- a/community-testing/electricsheep/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 74024 2012-07-18 04:18:44Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=electricsheep -pkgver=2.7b33 -pkgrel=3 -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/encfs/PKGBUILD b/community-testing/encfs/PKGBUILD deleted file mode 100644 index 373712a6c..000000000 --- a/community-testing/encfs/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 73750 2012-07-15 13:18:06Z ibiru $ -# 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-testing/espeakup/PKGBUILD b/community-testing/espeakup/PKGBUILD deleted file mode 100644 index 9ee2d9962..000000000 --- a/community-testing/espeakup/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 78549 2012-10-20 19:23:23Z tomegun $ -# Contributor: Chris Brannon <chris@the-brannons.com> -# Contributor: Kyle <kyle@gmx.ca> -pkgname=espeakup -pkgver=0.71 -pkgrel=5 -pkgdesc='Allows the Speakup screen review system to use the ESpeak synthesizer.' -arch=('i686' 'x86_64') -url="http://github.com/williamh/espeakup" -license=('GPL3') -source=("ftp://linux-speakup.org/pub/linux/goodies/${pkgname}-${pkgver}.tar.bz2" - espeakup espeakup.conf.d espeakup.service) -depends=(speakup-utils espeak) -backup=(etc/conf.d/espeakup) - -build() { - cd "$srcdir/$pkgname-$pkgver" - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="${pkgdir}" install - install -m755 -D "${srcdir}/espeakup" "${pkgdir}/etc/rc.d/espeakup" - install -m644 -D "${srcdir}/espeakup.conf.d" "${pkgdir}/etc/conf.d/espeakup" - install -m644 -D "${srcdir}/espeakup.service" "${pkgdir}/usr/lib/systemd/system/espeakup.service" -} -md5sums=('03daa70b3db3f4f6fbb42c2ee428eda7' - '7cf0abd493710ed924b7bb7c8d279fb3' - '0f93974845b15efa12f5e7a74cc0eecd' - '0c11c50b128234cda8e1357e88cf7c43') diff --git a/community-testing/espeakup/espeakup b/community-testing/espeakup/espeakup deleted file mode 100644 index 94a71701a..000000000 --- a/community-testing/espeakup/espeakup +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/conf.d/espeakup -. /etc/rc.d/functions - -PID=`pidof espeakup` -PIDFILE=/var/run/espeakup.pid -case "$1" in - start) - stat_busy "Starting Espeakup" - if [ -z "$PID" ]; then - if [ -f $PIDFILE ]; then - rm $PIDFILE - fi - /usr/bin/espeakup $ESPEAKUP_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon espeakup - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping Espeakup" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon espeakup - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/espeakup/espeakup.conf.d b/community-testing/espeakup/espeakup.conf.d deleted file mode 100644 index 66f7842c3..000000000 --- a/community-testing/espeakup/espeakup.conf.d +++ /dev/null @@ -1,6 +0,0 @@ -# -# Arguments to be passed to espeakup. -# Example: -# ESPEAKUP_ARGS="--default-voice=fr" -# will tell espeakup to use the French voice. -ESPEAKUP_ARGS="" diff --git a/community-testing/espeakup/espeakup.service b/community-testing/espeakup/espeakup.service deleted file mode 100644 index 58d7d47fa..000000000 --- a/community-testing/espeakup/espeakup.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Software speech output for Speakup - -[Service] -Type=forking -PIDFile=/run/espeakup.pid -ExecStart=/usr/bin/espeakup -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/evas_generic_loaders-svn/PKGBUILD b/community-testing/evas_generic_loaders-svn/PKGBUILD deleted file mode 100644 index 2100340bf..000000000 --- a/community-testing/evas_generic_loaders-svn/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 78472 2012-10-19 13:29:25Z bluewind $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Ronald van Haren <ronald.archlinux.org> - -pkgname=evas_generic_loaders-svn -pkgver=75875 -pkgrel=2 -pkgdesc="Additional generic loaders for Evas" -arch=('i686' 'x86_64') -groups=('e17-libs-svn' 'e17-svn') -url="http://www.enlightenment.org" -license=('BSD') -depends=('librsvg' 'gstreamer0.10' 'poppler' 'libraw' 'libspectre' 'eina-svn') -makedepends=('subversion') -conflicts=('evas_generic_loaders') -provides=('evas_generic_loaders') -options=('!libtool' '!emptydirs') - -_svntrunk="http://svn.enlightenment.org/svn/e/trunk/evas_generic_loaders" -_svnmod="evas_generic_loaders" - -build() { - cd "$srcdir" - -msg "Connecting to $_svntrunk SVN server...." - if [ -d $_svnmod/.svn ]; then - (cd $_svnmod && svn up -r $pkgver) - else - svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - cp -r $_svnmod $_svnmod-build - cd $_svnmod-build - - ./autogen.sh --prefix=/usr - make -} - -package() { - cd "$srcdir/$_svnmod-build" - make DESTDIR="$pkgdir" install - -# install license files - install -Dm644 "$srcdir/$_svnmod-build/COPYING" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYING" - - rm -r "$srcdir/$_svnmod-build" -} diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD deleted file mode 100644 index 3016b5224..000000000 --- a/community-testing/exim/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 72552 2012-06-16 17:09:24Z dreisner $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=exim -pkgver=4.80 -pkgrel=2 -pkgdesc="Message Transfer Agent" -arch=('x86_64' 'i686') -url='http://www.exim.org/' -license=('GPL') -backup=(etc/mail/aliases etc/mail/exim.conf etc/logrotate.d/exim etc/conf.d/exim) -install=exim.install -depends=('db' 'pcre' 'pam' 'openssl' 'libldap') -provides=('smtp-server') -conflicts=('smtp-server') -options=('!makeflags') -source=("http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/exim-$pkgver.tar.bz2" - aliases - exim - exim.logrotate - exim.conf.d - exim.Makefile - exim-submission@.service - exim.service - exim@.service - exim.socket - exim-submission.socket) -sha256sums=('787b6defd37fa75311737bcfc42e9e2b2cc62c5d027eed35bb7d800b2d9a0984' - '932c9149b6809c70e94c1256e28325d197bbf80d27322793e217d4b692d49c5a' - '48457622b22de9721efe9f143a88e5f5ce833b792d2e757237b6cdb74a1708e6' - '7f1408f9c5d905968e665941f5c5efcf9da53e7a0bbef6c66220343bc2ae994b' - '0209c701f8696a9628d43c1684105eadd35d1caba199b94e3a54a4d26cecff01' - '7d1e062c907a06293eee40a3139f70c74a055374b234fb8c431ea68362bdda55' - '32def7387aaa040b994c0d399c6053dc42d9da4c8c8f0a34d33da653be27e324' - '99aaf3c960396fc08ec918fdca1cf73850960f6c519982d1a653f2e673754445' - '0436411932d6b6268db54a84e4ffc209bde0fa7567442d8e3d138557eeccbad4' - '3e3d8b6be2741d2587a496196c08b3f2ffa05b5803b2bf9fb49359cef3a98d26' - 'd3bb58f0fbeaaa33c812a823708664bbcd828da7d24e2a098f84a15aee443fee') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cp "$srcdir/$pkgname.Makefile" Local/Makefile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm0644 $srcdir/exim.logrotate "${pkgdir}/etc/logrotate.d/exim" - install -Dm0644 $srcdir/exim.conf.d "${pkgdir}/etc/conf.d/exim" - install -Dm0644 doc/exim.8 "${pkgdir}/usr/share/man/man8/exim.8" - install -Dm0755 $srcdir/exim "${pkgdir}/etc/rc.d/exim" - - mkdir -p "${pkgdir}/var/spool/exim/db" "${pkgdir}/etc/mail" \ - "${pkgdir}/var/log/exim" "${pkgdir}/usr"/{lib,sbin} - - chmod 770 "${pkgdir}/var/spool/exim" "${pkgdir}/var/spool/exim/db" "${pkgdir}/var/log/exim" - - cd build-Linux-* - for i in exicyclog exim_checkaccess exim_dumpdb exim_lock exim_tidydb exipick exiqsumm exigrep \ - exim_dbmbuild exim exim_fixdb eximstats exinext exiqgrep exiwhat; do - install -m0755 "$i" "$pkgdir/usr/sbin" - done - - cd "$srcdir/exim-$pkgver/src" - sed -e "s|/etc/aliases|/etc/mail/aliases|g" -e "s|SYSTEM_ALIASES_FILE|/etc/mail/aliases|g" \ - configure.default > "$pkgdir/etc/mail/exim.conf" - - cp "$srcdir/aliases" "$pkgdir/etc/mail" - - cd "$pkgdir/usr/sbin" - for i in mailq rmail rsmtp runq sendmail; do - ln -s exim "$i" - done - # fhs compliancy - ln -s ../sbin/exim ../lib/sendmail - - install -Dm0644 "$srcdir/exim-submission@.service" \ - "${pkgdir}/usr/lib/systemd/system/exim-submission@.service" - install -Dm0644 "$srcdir/exim.service" "${pkgdir}/usr/lib/systemd/system/exim.service" - install -Dm0644 "$srcdir/exim@.service" "${pkgdir}/usr/lib/systemd/system/exim@.service" - install -Dm0644 "$srcdir/exim.socket" "${pkgdir}/usr/lib/systemd/system/exim.socket" - install -Dm0644 "$srcdir/exim-submission.socket" \ - "${pkgdir}/usr/lib/systemd/system/exim-submission.socket" -} diff --git a/community-testing/exim/aliases b/community-testing/exim/aliases deleted file mode 100644 index 5a76ff7d5..000000000 --- a/community-testing/exim/aliases +++ /dev/null @@ -1,35 +0,0 @@ -# -# /etc/mail/aliases -# -# NOTE: Make sure you run 'newaliases' after modifying this file -# - -# Basic system aliases -- these MUST be present. -MAILER-DAEMON: postmaster -postmaster: root -hostmaster: root -webmaster: hostmaster -ftpmaster: hostmaster -admin: hostmaster -administrator: hostmaster - -# General redirections for pseudo accounts. -bin: root -daemon: root -games: root -ingres: root -nobody: root -system: root -toor: root -uucp: root - -# Well-known aliases. -manager: root -dumper: root -operator: root - -# trap decode to catch security attacks -decode: root - -# Person who should get root's mail -#root: diff --git a/community-testing/exim/exim b/community-testing/exim/exim deleted file mode 100644 index 8e9640b32..000000000 --- a/community-testing/exim/exim +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/exim ] && . /etc/conf.d/exim - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/exim` - -case "$1" in - start) - stat_busy "Starting Exim" - [ -z "$PID" ] && /usr/sbin/exim $EXIM_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon exim - stat_done - fi - ;; - stop) - stat_busy "Stopping Exim" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/exim.pid - rm_daemon exim - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/exim/exim-submission.socket b/community-testing/exim/exim-submission.socket deleted file mode 100644 index b9593e2ef..000000000 --- a/community-testing/exim/exim-submission.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Exim Mail Transfer Agent (message submission) -Conflicts=exim.service - -[Socket] -ListenStream=587 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/community-testing/exim/exim-submission@.service b/community-testing/exim/exim-submission@.service deleted file mode 100644 index 8b1d056a8..000000000 --- a/community-testing/exim/exim-submission@.service +++ /dev/null @@ -1,11 +0,0 @@ -# It doesn't make sense for this to be separate from exim@.service -# However, I couldn't think of a way to have two .socket files point -# to it ([Socket] Service= is rejected if Accept=yes is set). - -[Unit] -Description=Exim Mail Daemon per-connection server (message submission) - -[Service] -ExecStart=-/usr/sbin/exim -bs -StandardInput=socket -StandardError=syslog diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile deleted file mode 100644 index a304ce829..000000000 --- a/community-testing/exim/exim.Makefile +++ /dev/null @@ -1,1227 +0,0 @@ -# $Cambridge: exim/src/src/EDITME,v 1.27 2010/06/12 15:21:25 jetmore Exp $ - -################################################## -# The Exim mail transport agent # -################################################## - -# This is the template for Exim's main build-time configuration file. It -# contains settings that are independent of any operating system. These are -# things that are mostly sysadmin choices. The items below are divided into -# those you must specify, those you probably want to specify, those you might -# often want to specify, and those that you almost never need to mention. - -# Edit this file and save the result to a file called Local/Makefile within the -# Exim distribution directory before running the "make" command. - -# Things that depend on the operating system have default settings in -# OS/Makefile-Default, but these are overridden for some OS by files called -# called OS/Makefile-<osname>. You can further override these by creating files -# called Local/Makefile-<osname>, where "<osname>" stands for the name of your -# operating system - look at the names in the OS directory to see which names -# are recognized. - -# However, if you are building Exim for a single OS only, you don't need to -# worry about setting up Local/Makefile-<osname>. Any build-time configuration -# settings you require can in fact be placed in the one file called -# Local/Makefile. It is only if you are building for several OS from the same -# source files that you need to worry about splitting off your own OS-dependent -# settings into separate files. (There's more explanation about how this all -# works in the toplevel README file, under "Modifying the building process", as -# well as in the Exim specification.) - -# One OS-specific thing that may need to be changed is the command for running -# the C compiler; the overall default is gcc, but some OS Makefiles specify cc. -# You can override anything that is set by putting CC=whatever in your -# Local/Makefile. - -# NOTE: You should never need to edit any of the distributed Makefiles; all -# overriding can be done in your Local/Makefile(s). This will make it easier -# for you when the next release comes along. - -# The location of the X11 libraries is something else that is quite variable -# even between different versions of the same operating system (and indeed -# there are different versions of X11 as well, of course). The four settings -# concerned here are X11, XINCLUDE, XLFLAGS (linking flags) and X11_LD_LIB -# (dynamic run-time library). You need not worry about X11 unless you want to -# compile the Exim monitor utility. Exim itself does not use X11. - -# Another area of variability between systems is the type and location of the -# DBM library package. Exim has support for ndbm, gdbm, tdb, and Berkeley DB. -# By default the code assumes ndbm; this often works with gdbm or DB, provided -# they are correctly installed, via their compatibility interfaces. However, -# Exim can also be configured to use the native calls for Berkeley DB (obsolete -# versions 1.85, 2.x, 3.x, or the current 4.x version) and also for gdbm. - -# For some operating systems, a default DBM library (other than ndbm) is -# selected by a setting in the OS-specific Makefile. Most modern OS now have -# a DBM library installed as standard, and in many cases this will be selected -# for you by the OS-specific configuration. If Exim compiles without any -# problems, you probably do not have to worry about the DBM library. If you -# do want or need to change it, you should first read the discussion in the -# file doc/dbm.discuss.txt, which also contains instructions for testing Exim's -# interface to the DBM library. - -# In Local/Makefiles blank lines and lines starting with # are ignored. It is -# also permitted to use the # character to add a comment to a setting, for -# example -# -# EXIM_GID=42 # the "mail" group -# -# However, with some versions of "make" this works only if there is no white -# space between the end of the setting and the #, so perhaps it is best -# avoided. A consequence of this facility is that it is not possible to have -# the # character present in any setting, but I can't think of any cases where -# this would be wanted. -############################################################################### - - - -############################################################################### -# THESE ARE THINGS YOU MUST SPECIFY # -############################################################################### - -# Exim will not build unless you specify BIN_DIRECTORY, CONFIGURE_FILE, and -# EXIM_USER. You also need EXIM_GROUP if EXIM_USER specifies a uid by number. - -# If you don't specify SPOOL_DIRECTORY, Exim won't fail to build. However, it -# really is a very good idea to specify it here rather than at run time. This -# is particularly true if you let the logs go to their default location in the -# spool directory, because it means that the location of the logs is known -# before Exim has read the run time configuration file. - -#------------------------------------------------------------------------------ -# BIN_DIRECTORY defines where the exim binary will be installed by "make -# install". The path is also used internally by Exim when it needs to re-invoke -# itself, either to send an error message, or to recover root privilege. Exim's -# utility binaries and scripts are also installed in this directory. There is -# no "standard" place for the binary directory. Some people like to keep all -# the Exim files under one directory such as /usr/exim; others just let the -# Exim binaries go into an existing directory such as /usr/sbin or -# /usr/local/sbin. The installation script will try to create this directory, -# and any superior directories, if they do not exist. - -BIN_DIRECTORY=/usr/sbin - - -#------------------------------------------------------------------------------ -# CONFIGURE_FILE defines where Exim's run time configuration file is to be -# found. It is the complete pathname for the file, not just a directory. The -# location of all other run time files and directories can be changed in the -# run time configuration file. There is a lot of variety in the choice of -# location in different OS, and in the preferences of different sysadmins. Some -# common locations are in /etc or /etc/mail or /usr/local/etc or -# /usr/local/etc/mail. Another possibility is to keep all the Exim files under -# a single directory such as /usr/exim. Whatever you choose, the installation -# script will try to make the directory and any superior directories if they -# don't exist. It will also install a default runtime configuration if this -# file does not exist. - -CONFIGURE_FILE=/etc/mail/exim.conf - -# It is possible to specify a colon-separated list of files for CONFIGURE_FILE. -# In this case, Exim will use the first of them that exists when it is run. -# However, if a list is specified, the installation script no longer tries to -# make superior directories or to install a default runtime configuration. - - -#------------------------------------------------------------------------------ -# The Exim binary must normally be setuid root, so that it starts executing as -# root, but (depending on the options with which it is called) it does not -# always need to retain the root privilege. These settings define the user and -# group that is used for Exim processes when they no longer need to be root. In -# particular, this applies when receiving messages and when doing remote -# deliveries. (Local deliveries run as various non-root users, typically as the -# owner of a local mailbox.) Specifying these values as root is not supported. - -EXIM_USER=ref:exim - -# If you specify EXIM_USER as a name, this is looked up at build time, and the -# uid number is built into the binary. However, you can specify that this -# lookup is deferred until runtime. In this case, it is the name that is built -# into the binary. You can do this by a setting of the form: - -# EXIM_USER=ref:exim - -# In other words, put "ref:" in front of the user name. If you set EXIM_USER -# like this, any value specified for EXIM_GROUP is also passed "by reference". -# Although this costs a bit of resource at runtime, it is convenient to use -# this feature when building binaries that are to be run on multiple systems -# where the name may refer to different uids. It also allows you to build Exim -# on a system where there is no Exim user defined. - -# If the setting of EXIM_USER is numeric (e.g. EXIM_USER=42), there must -# also be a setting of EXIM_GROUP. If, on the other hand, you use a name -# for EXIM_USER (e.g. EXIM_USER=exim), you don't need to set EXIM_GROUP unless -# you want to use a group other than the default group for the given user. - -# EXIM_GROUP= - -# Many sites define a user called "exim", with an appropriate default group, -# and use -# -# EXIM_USER=exim -# -# while leaving EXIM_GROUP unspecified (commented out). - - -#------------------------------------------------------------------------------ -# SPOOL_DIRECTORY defines the directory where all the data for messages in -# transit is kept. It is strongly recommended that you define it here, though -# it is possible to leave this till the run time configuration. - -# Exim creates the spool directory if it does not exist. The owner and group -# will be those defined by EXIM_USER and EXIM_GROUP, and this also applies to -# all the files and directories that are created in the spool directory. - -# Almost all installations choose this: - -SPOOL_DIRECTORY=/var/spool/exim - - - -############################################################################### -# THESE ARE THINGS YOU PROBABLY WANT TO SPECIFY # -############################################################################### - -# If you need extra header file search paths on all compiles, put the -I -# options in INCLUDE. If you want the extra searches only for certain -# parts of the build, see more specific xxx_INCLUDE variables below. - -# INCLUDE=-I/example/include - -# You need to specify some routers and transports if you want the Exim that you -# are building to be capable of delivering mail. You almost certainly need at -# least one type of lookup. You should consider whether you want to build -# the Exim monitor or not. - - -#------------------------------------------------------------------------------ -# These settings determine which individual router drivers are included in the -# Exim binary. There are no defaults in the code; those routers that are wanted -# must be defined here by setting the appropriate variables to the value "yes". -# Including a router in the binary does not cause it to be used automatically. -# It has also to be configured in the run time configuration file. By -# commenting out those you know you don't want to use, you can make the binary -# a bit smaller. If you are unsure, leave all of these included for now. - -ROUTER_ACCEPT=yes -ROUTER_DNSLOOKUP=yes -ROUTER_IPLITERAL=yes -ROUTER_MANUALROUTE=yes -ROUTER_QUERYPROGRAM=yes -ROUTER_REDIRECT=yes - -# This one is very special-purpose, so is not included by default. - -# ROUTER_IPLOOKUP=yes - - -#------------------------------------------------------------------------------ -# These settings determine which individual transport drivers are included in -# the Exim binary. There are no defaults; those transports that are wanted must -# be defined here by setting the appropriate variables to the value "yes". -# Including a transport in the binary does not cause it to be used -# automatically. It has also to be configured in the run time configuration -# file. By commenting out those you know you don't want to use, you can make -# the binary a bit smaller. If you are unsure, leave all of these included for -# now. - -TRANSPORT_APPENDFILE=yes -TRANSPORT_AUTOREPLY=yes -TRANSPORT_PIPE=yes -TRANSPORT_SMTP=yes - -# This one is special-purpose, and commonly not required, so it is not -# included by default. - -TRANSPORT_LMTP=yes - - -#------------------------------------------------------------------------------ -# The appendfile transport can write messages to local mailboxes in a number -# of formats. The code for three specialist formats, maildir, mailstore, and -# MBX, is included only when requested. If you do not know what this is about, -# leave these settings commented out. - -SUPPORT_MAILDIR=yes -# SUPPORT_MAILSTORE=yes -# SUPPORT_MBX=yes - - -#------------------------------------------------------------------------------ -# See below for dynamic lookup modules. -# LOOKUP_MODULE_DIR=/usr/lib/exim/lookups/ -# If not using package management but using this anyway, then think about how -# you perform upgrades and revert them. You should consider the benefit of -# embedding the Exim version number into LOOKUP_MODULE_DIR, so that you can -# maintain two concurrent sets of modules. - -# To build a module dynamically, you'll need to define CFLAGS_DYNAMIC for -# your platform. Eg: -# CFLAGS_DYNAMIC=-shared -rdynamic -# CFLAGS_DYNAMIC=-shared -rdynamic -fPIC - -#------------------------------------------------------------------------------ -# These settings determine which file and database lookup methods are included -# in the binary. See the manual chapter entitled "File and database lookups" -# for discussion. DBM and lsearch (linear search) are included by default. If -# you are unsure about the others, leave them commented out for now. -# LOOKUP_DNSDB does *not* refer to general mail routing using the DNS. It is -# for the specialist case of using the DNS as a general database facility (not -# common). -# If set to "2" instead of "yes" then the corresponding lookup will be -# built as a module and must be installed into LOOKUP_MODULE_DIR. You need to -# add -export-dynamic -rdynamic to EXTRALIBS. You may also need to add -ldl to -# EXTRALIBS so that dlopen() is available to Exim. You need to define -# LOOKUP_MODULE_DIR above so the exim binary actually loads dynamic lookup -# modules. -# Also, instead of adding all the libraries/includes to LOOKUP_INCLUDE and -# LOOKUP_LIBS, add them to the respective LOOKUP_*_INCLUDE and LOOKUP_*_LIBS -# (where * is the name as given here in this list). That ensures that only -# the dynamic library and not the exim binary will be linked against the -# library. -# NOTE: LDAP cannot be built as a module! - -LOOKUP_DBM=yes -LOOKUP_LSEARCH=yes -LOOKUP_DNSDB=yes - -# LOOKUP_CDB=yes -LOOKUP_DSEARCH=yes -# LOOKUP_IBASE=yes -LOOKUP_LDAP=yes -# LOOKUP_MYSQL=yes -# LOOKUP_NIS=yes -# LOOKUP_NISPLUS=yes -# LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes -# LOOKUP_WHOSON=yes - -# These two settings are obsolete; all three lookups are compiled when -# LOOKUP_LSEARCH is enabled. However, we retain these for backward -# compatibility. Setting one forces LOOKUP_LSEARCH if it is not set. - -# LOOKUP_WILDLSEARCH=yes -# LOOKUP_NWILDLSEARCH=yes - - -#------------------------------------------------------------------------------ -# If you have set LOOKUP_LDAP=yes, you should set LDAP_LIB_TYPE to indicate -# which LDAP library you have. Unfortunately, though most of their functions -# are the same, there are minor differences. Currently Exim knows about four -# LDAP libraries: the one from the University of Michigan (also known as -# OpenLDAP 1), OpenLDAP 2, the Netscape SDK library, and the library that comes -# with Solaris 7 onwards. Uncomment whichever of these you are using. - -# LDAP_LIB_TYPE=OPENLDAP1 -LDAP_LIB_TYPE=OPENLDAP2 -# LDAP_LIB_TYPE=NETSCAPE -# LDAP_LIB_TYPE=SOLARIS - -# If you don't set any of these, Exim assumes the original University of -# Michigan (OpenLDAP 1) library. - - -#------------------------------------------------------------------------------ -# The PCRE library is required for exim. There is no longer an embedded -# version of the PCRE library included with the source code, instead you -# must use a system library or build your own copy of PCRE. -# In either case you must specify the library link info here. If the -# PCRE header files are not in the standard search path you must also -# modify the INCLUDE path (above) -# The default setting of PCRE_LIBS should work on the vast majority of -# systems - -PCRE_LIBS=-lpcre - - -#------------------------------------------------------------------------------ -# Additional libraries and include directories may be required for some -# lookup styles (e.g. LDAP, MYSQL or PGSQL). LOOKUP_LIBS is included only on -# the command for linking Exim itself, not on any auxiliary programs. You -# don't need to set LOOKUP_INCLUDE if the relevant directories are already -# specified in INCLUDE. The settings below are just examples; -lpq is for -# PostgreSQL, -lgds is for Interbase, -lsqlite3 is for SQLite. - -# LOOKUP_INCLUDE=-I /usr/local/ldap/include -I /usr/local/mysql/include -I /usr/local/pgsql/include -# LOOKUP_LIBS=-L/usr/local/lib -lldap -llber -lmysqlclient -lpq -lgds -lsqlite3 - - -#------------------------------------------------------------------------------ -# Compiling the Exim monitor: If you want to compile the Exim monitor, a -# program that requires an X11 display, then EXIM_MONITOR should be set to the -# value "eximon.bin". Comment out this setting to disable compilation of the -# monitor. The locations of various X11 directories for libraries and include -# files are defaulted in the OS/Makefile-Default file, but can be overridden in -# local OS-specific make files. - - - - -#------------------------------------------------------------------------------ -# Compiling Exim with content scanning support: If you want to compile Exim -# with support for message body content scanning, set WITH_CONTENT_SCAN to -# the value "yes". This will give you malware and spam scanning in the DATA ACL, -# and the MIME ACL. Please read the documentation to learn more about these -# features. - -WITH_CONTENT_SCAN=yes - -# If you want to use the deprecated "demime" condition in the DATA ACL, -# uncomment the line below. Doing so will also explicitly turn on the -# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of -# the "demime" condition. - -WITH_OLD_DEMIME=yes - -# If you're using ClamAV and are backporting fixes to an old version, instead -# of staying current (which is the more usual approach) then you may need to -# use an older API which uses a STREAM command, now deprecated, instead of -# zINSTREAM. If you need to set this, please let the Exim developers know, as -# if nobody reports a need for it, we'll remove this option and clean up the -# code. zINSTREAM was introduced with ClamAV 0.95. -# -# WITH_OLD_CLAMAV_STREAM=yes - -#------------------------------------------------------------------------------ -# By default Exim includes code to support DKIM (DomainKeys Identified -# Mail, RFC4871) signing and verification. Verification of signatures is -# turned on by default. See the spec for information on conditionally -# disabling it. To disable the inclusion of the entire feature, set -# DISABLE_DKIM to "yes" - -# DISABLE_DKIM=yes - - -#------------------------------------------------------------------------------ -# Compiling Exim with experimental features. These are documented in -# experimental-spec.txt. "Experimental" means that the way these features are -# implemented may still change. Backward compatibility is not guaranteed. - -# Uncomment the following lines to add SPF support. You need to have libspf2 -# installed on your system (www.libspf2.org). Depending on where it is installed -# you may have to edit the CFLAGS and LDFLAGS lines. - -# EXPERIMENTAL_SPF=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lspf2 - -# Uncomment the following lines to add SRS (Sender rewriting scheme) support. -# You need to have libsrs_alt installed on your system (srs.mirtol.com). -# Depending on where it is installed you may have to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_SRS=yes -# CFLAGS += -I/usr/local/include -# LDFLAGS += -lsrs_alt - -# Uncomment the following lines to add Brightmail AntiSpam support. You need -# to have the Brightmail client SDK installed. Please check the experimental -# documentation for implementation details. You need to edit the CFLAGS and -# LDFLAGS lines. - -# EXPERIMENTAL_BRIGHTMAIL=yes -# CFLAGS += -I/opt/brightmail/bsdk-6.0/include -# LDFLAGS += -lxml2_single -lbmiclient_single -L/opt/brightmail/bsdk-6.0/lib - - - -############################################################################### -# THESE ARE THINGS YOU MIGHT WANT TO SPECIFY # -############################################################################### - -# The items in this section are those that are commonly changed according to -# the sysadmin's preferences, but whose defaults are often acceptable. The -# first five are concerned with security issues, where differing levels of -# paranoia are appropriate in different environments. Sysadmins also vary in -# their views on appropriate levels of defence in these areas. If you do not -# understand these issues, go with the defaults, which are used by many sites. - - -#------------------------------------------------------------------------------ -# Although Exim is normally a setuid program, owned by root, it refuses to run -# local deliveries as root by default. There is a runtime option called -# "never_users" which lists the users that must never be used for local -# deliveries. There is also the setting below, which provides a list that -# cannot be overridden at runtime. This guards against problems caused by -# unauthorized changes to the runtime configuration. You are advised not to -# remove "root" from this option, but you can add other users if you want. The -# list is colon-separated. It must NOT contain any spaces. - -# FIXED_NEVER_USERS=root:bin:daemon -FIXED_NEVER_USERS=root - - -#------------------------------------------------------------------------------ -# By default, Exim insists that its configuration file be owned by root. You -# can specify one additional permitted owner here. - -# CONFIGURE_OWNER= - -# If the configuration file is group-writeable, Exim insists by default that it -# is owned by root. You can specify one additional permitted group owner here. - -# CONFIGURE_GROUP= - -# If you specify CONFIGURE_OWNER or CONFIGURE_GROUP as a name, this is looked -# up at build time, and the uid or gid number is built into the binary. -# However, you can specify that the lookup is deferred until runtime. In this -# case, it is the name that is built into the binary. You can do this by a -# setting of the form: - -# CONFIGURE_OWNER=ref:mail -# CONFIGURE_GROUP=ref:sysadmin - -# In other words, put "ref:" in front of the user or group name. Although this -# costs a bit of resource at runtime, it is convenient to use this feature when -# building binaries that are to be run on multiple systems where the names may -# refer to different uids or gids. It also allows you to build Exim on a system -# where the relevant user or group is not defined. - - -#------------------------------------------------------------------------------ -# The -C option allows Exim to be run with an alternate runtime configuration -# file. When this is used by root, root privilege is retained by the binary -# (for any other caller including the Exim user, it is dropped). You can -# restrict the location of alternate configurations by defining a prefix below. -# Any file used with -C must then start with this prefix (except that /dev/null -# is also permitted if the caller is root, because that is used in the install -# script). If the prefix specifies a directory that is owned by root, a -# compromise of the Exim account does not permit arbitrary alternate -# configurations to be used. The prefix can be more restrictive than just a -# directory (the second example). - -# ALT_CONFIG_PREFIX=/some/directory/ -# ALT_CONFIG_PREFIX=/some/directory/exim.conf- - - -#------------------------------------------------------------------------------ -# When a user other than root uses the -C option to override the configuration -# file (including the Exim user when re-executing Exim to regain root -# privileges for local message delivery), this will normally cause Exim to -# drop root privileges. The TRUSTED_CONFIG_LIST option, specifies a file which -# contains a list of trusted configuration filenames, one per line. If the -C -# option is used by the Exim user or by the user specified in the -# CONFIGURE_OWNER setting, to specify a configuration file which is listed in -# the TRUSTED_CONFIG_LIST file, then root privileges are not dropped by Exim. - -# TRUSTED_CONFIG_LIST=/usr/exim/trusted_configs - - -#------------------------------------------------------------------------------ -# Uncommenting this option disables the use of the -D command line option, -# which changes the values of macros in the runtime configuration file. -# This is another protection against somebody breaking into the Exim account. - -# DISABLE_D_OPTION=yes - - -#------------------------------------------------------------------------------ -# By contrast, you might be maintaining a system which relies upon the ability -# to override values with -D and assumes that these will be passed through to -# the delivery processes. As of Exim 4.73, this is no longer the case by -# default. Going forward, we strongly recommend that you use a shim Exim -# configuration file owned by root stored under TRUSTED_CONFIG_LIST. -# That shim can set macros before .include'ing your main configuration file. -# -# As a strictly transient measure to ease migration to 4.73, the -# WHITELIST_D_MACROS value definies a colon-separated list of macro-names -# which are permitted to be overridden from the command-line which will be -# honoured by the Exim user. So these are macros that can persist to delivery -# time. -# Examples might be -DTLS or -DSPOOL=/some/dir. The values on the -# command-line are filtered to only permit: [A-Za-z0-9_/.-]* -# -# This option is highly likely to be removed in a future release. It exists -# only to make 4.73 as easy as possible to migrate to. If you use it, we -# encourage you to schedule time to rework your configuration to not depend -# upon it. Most people should not need to use this. -# -# By default, no macros are whitelisted for -D usage. - -# WHITELIST_D_MACROS=TLS:SPOOL - -#------------------------------------------------------------------------------ -# Exim has support for the AUTH (authentication) extension of the SMTP -# protocol, as defined by RFC 2554. If you don't know what SMTP authentication -# is, you probably won't want to include this code, so you should leave these -# settings commented out. If you do want to make use of SMTP authentication, -# you must uncomment at least one of the following, so that appropriate code is -# included in the Exim binary. You will then need to set up the run time -# configuration to make use of the mechanism(s) selected. - -AUTH_CRAM_MD5=yes -# AUTH_CYRUS_SASL=yes -AUTH_DOVECOT=yes -AUTH_PLAINTEXT=yes -AUTH_SPA=yes - - -#------------------------------------------------------------------------------ -# If you specified AUTH_CYRUS_SASL above, you should ensure that you have the -# Cyrus SASL library installed before trying to build Exim, and you probably -# want to uncomment the following line: - -# AUTH_LIBS=-lsasl2 - - -#------------------------------------------------------------------------------ -# When Exim is decoding MIME "words" in header lines, most commonly for use -# in the $header_xxx expansion, it converts any foreign character sets to the -# one that is set in the headers_charset option. The default setting is -# defined by this setting: - -HEADERS_CHARSET="ISO-8859-1" - -# If you are going to make use of $header_xxx expansions in your configuration -# file, or if your users are going to use them in filter files, and the normal -# character set on your host is something other than ISO-8859-1, you might -# like to specify a different default here. This value can be overridden in -# the runtime configuration, and it can also be overridden in individual filter -# files. -# -# IMPORTANT NOTE: The iconv() function is needed for character code -# conversions. Please see the next item... - - -#------------------------------------------------------------------------------ -# Character code conversions are possible only if the iconv() function is -# installed on your operating system. There are two places in Exim where this -# is relevant: (a) The $header_xxx expansion (see the previous item), and (b) -# the Sieve filter support. For those OS where iconv() is known to be installed -# as standard, the file in OS/Makefile-xxxx contains -# -# HAVE_ICONV=yes -# -# If you are not using one of those systems, but have installed iconv(), you -# need to uncomment that line above. In some cases, you may find that iconv() -# and its header file are not in the default places. You might need to use -# something like this: -# -# HAVE_ICONV=yes -# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -liconv -# -# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM -# as well. - - -#------------------------------------------------------------------------------ -# The passwords for user accounts are normally encrypted with the crypt() -# function. Comparisons with encrypted passwords can be done using Exim's -# "crypteq" expansion operator. (This is commonly used as part of the -# configuration of an authenticator for use with SMTP AUTH.) At least one -# operating system has an extended function called crypt16(), which uses up to -# 16 characters of a password (the normal crypt() uses only the first 8). Exim -# supports the use of crypt16() as well as crypt() but note the warning below. - -# You can always indicate a crypt16-encrypted password by preceding it with -# "{crypt16}". If you want the default handling (without any preceding -# indicator) to use crypt16(), uncomment the following line: - -# DEFAULT_CRYPT=crypt16 - -# If you do that, you can still access the basic crypt() function by preceding -# an encrypted password with "{crypt}". For more details, see the description -# of the "crypteq" condition in the manual chapter on string expansions. - -# Some operating systems do not include a crypt16() function, so Exim has one -# of its own, which it uses unless HAVE_CRYPT16 is defined. Normally, that will -# be set in an OS-specific Makefile for the OS that have such a function, so -# you should not need to bother with it. - -# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** -# It turns out that the above is not entirely accurate. As well as crypt16() -# there is a function called bigcrypt() that some operating systems have. This -# may or may not use the same algorithm, and both of them may be different to -# Exim's built-in crypt16() that is used unless HAVE_CRYPT16 is defined. -# -# However, since there is now a move away from the traditional crypt() -# functions towards using SHA1 and other algorithms, tidying up this area of -# Exim is seen as very low priority. In practice, if you need to, you can -# define DEFAULT_CRYPT to the name of any function that has the same interface -# as the traditional crypt() function. -# *** WARNING *** WARNING *** WARNING *** WARNING *** WARNING *** - - -#------------------------------------------------------------------------------ -# Exim can be built to support the SMTP STARTTLS command, which implements -# Transport Layer Security using SSL (Secure Sockets Layer). To do this, you -# must install the OpenSSL library package or the GnuTLS library. Exim contains -# no cryptographic code of its own. Uncomment the following lines if you want -# to build Exim with TLS support. If you don't know what this is all about, -# leave these settings commented out. - -# This setting is required for any TLS support (either OpenSSL or GnuTLS) -SUPPORT_TLS=yes - -# Uncomment this setting if you are using OpenSSL -TLS_LIBS=-lssl -lcrypto - -# Uncomment these settings if you are using GnuTLS -# USE_GNUTLS=yes -# TLS_LIBS=-lgnutls -ltasn1 -lgcrypt - -# If you are running Exim as a server, note that just building it with TLS -# support is not all you need to do. You also need to set up a suitable -# certificate, and tell Exim about it by means of the tls_certificate -# and tls_privatekey run time options. You also need to set tls_advertise_hosts -# to specify the hosts to which Exim advertises TLS support. On the other hand, -# if you are running Exim only as a client, building it with TLS support -# is all you need to do. - -# Additional libraries and include files are required for both OpenSSL and -# GnuTLS. The TLS_LIBS settings above assume that the libraries are installed -# with all your other libraries. If they are in a special directory, you may -# need something like - -# TLS_LIBS=-L/usr/local/openssl/lib -lssl -lcrypto -# or -# TLS_LIBS=-L/opt/gnu/lib -lgnutls -ltasn1 -lgcrypt - -# TLS_LIBS is included only on the command for linking Exim itself, not on any -# auxiliary programs. If the include files are not in a standard place, you can -# set TLS_INCLUDE to specify where they are, for example: - -# TLS_INCLUDE=-I/usr/local/openssl/include/ -# or -# TLS_INCLUDE=-I/opt/gnu/include - -# You don't need to set TLS_INCLUDE if the relevant directories are already -# specified in INCLUDE. - - -#------------------------------------------------------------------------------ -# The default distribution of Exim contains only the plain text form of the -# documentation. Other forms are available separately. If you want to install -# the documentation in "info" format, first fetch the Texinfo documentation -# sources from the ftp directory and unpack them, which should create files -# with the extension "texinfo" in the doc directory. You may find that the -# version number of the texinfo files is different to your Exim version number, -# because the main documentation isn't updated as often as the code. For -# example, if you have Exim version 4.43, the source tarball upacks into a -# directory called exim-4.43, but the texinfo tarball unpacks into exim-4.40. -# In this case, move the contents of exim-4.40/doc into exim-4.43/doc after you -# have unpacked them. Then set INFO_DIRECTORY to the location of your info -# directory. This varies from system to system, but is often /usr/share/info. -# Once you have done this, "make install" will build the info files and -# install them in the directory you have defined. - -# INFO_DIRECTORY=/usr/share/info - - -#------------------------------------------------------------------------------ -# Exim log directory and files: Exim creates several log files inside a -# single log directory. You can define the directory and the form of the -# log file name here. If you do not set anything, Exim creates a directory -# called "log" inside its spool directory (see SPOOL_DIRECTORY above) and uses -# the filenames "mainlog", "paniclog", and "rejectlog". If you want to change -# this, you can set LOG_FILE_PATH to a path name containing one occurrence of -# %s. This will be replaced by one of the strings "main", "panic", or "reject" -# to form the final file names. Some installations may want something like this: - -LOG_FILE_PATH=/var/log/exim/%slog - -# which results in files with names /var/log/exim_mainlog, etc. The directory -# in which the log files are placed must exist; Exim does not try to create -# it for itself. It is also your responsibility to ensure that Exim is capable -# of writing files using this path name. The Exim user (see EXIM_USER above) -# must be able to create and update files in the directory you have specified. - -# You can also configure Exim to use syslog, instead of or as well as log -# files, by settings such as these - -# LOG_FILE_PATH=syslog -# LOG_FILE_PATH=syslog:/var/log/exim_%slog - -# The first of these uses only syslog; the second uses syslog and also writes -# to log files. Do not include white space in such a setting as it messes up -# the building process. - - -#------------------------------------------------------------------------------ -# When logging to syslog, the following option caters for syslog replacements -# that are able to accept log entries longer than the 1024 characters allowed -# by RFC 3164. It is up to you to make sure your syslog daemon can handle this. -# Non-printable characters are usually unacceptable regardless, so log entries -# are still split on newline characters. - -# SYSLOG_LONG_LINES=yes - -# If you are not interested in the process identifier (pid) of the Exim that is -# making the call to syslog, then comment out the following line. - -SYSLOG_LOG_PID=yes - - -#------------------------------------------------------------------------------ -# Cycling log files: this variable specifies the maximum number of old -# log files that are kept by the exicyclog log-cycling script. You don't have -# to use exicyclog. If your operating system has other ways of cycling log -# files, you can use them instead. The exicyclog script isn't run by default; -# you have to set up a cron job for it if you want it. - -EXICYCLOG_MAX=10 - - -#------------------------------------------------------------------------------ -# The compress command is used by the exicyclog script to compress old log -# files. Both the name of the command and the suffix that it adds to files -# need to be defined here. See also the EXICYCLOG_MAX configuration. - -COMPRESS_COMMAND=/bin/gzip -COMPRESS_SUFFIX=gz - - -#------------------------------------------------------------------------------ -# If the exigrep utility is fed compressed log files, it tries to uncompress -# them using this command. - -ZCAT_COMMAND=/bin/zcat - - -#------------------------------------------------------------------------------ -# Compiling in support for embedded Perl: If you want to be able to -# use Perl code in Exim's string manipulation language and you have Perl -# (version 5.004 or later) installed, set EXIM_PERL to perl.o. Using embedded -# Perl costs quite a lot of resources. Only do this if you really need it. - -# EXIM_PERL=perl.o - - -#------------------------------------------------------------------------------ -# Support for dynamically-loaded string expansion functions via ${dlfunc. If -# you are using gcc the dynamically-loaded object must be compiled with the -# -shared option, and you will need to add -export-dynamic to EXTRALIBS so -# that the local_scan API is made available by the linker. You may also need -# to add -ldl to EXTRALIBS so that dlopen() is available to Exim. - -# EXPAND_DLFUNC=yes - - -#------------------------------------------------------------------------------ -# Exim has support for PAM (Pluggable Authentication Modules), a facility -# which is available in the latest releases of Solaris and in some GNU/Linux -# distributions (see http://ftp.kernel.org/pub/linux/libs/pam/). The Exim -# support, which is intended for use in conjunction with the SMTP AUTH -# facilities, is included only when requested by the following setting: - -SUPPORT_PAM=yes - -# You probably need to add -lpam to EXTRALIBS, and in some releases of -# GNU/Linux -ldl is also needed. - - -#------------------------------------------------------------------------------ -# Support for authentication via Radius is also available. The Exim support, -# which is intended for use in conjunction with the SMTP AUTH facilities, -# is included only when requested by setting the following parameter to the -# location of your Radius configuration file: - -# RADIUS_CONFIG_FILE=/etc/radiusclient/radiusclient.conf -# RADIUS_CONFIG_FILE=/etc/radius.conf - -# If you have set RADIUS_CONFIG_FILE, you should also set one of these to -# indicate which RADIUS library is used: - -# RADIUS_LIB_TYPE=RADIUSCLIENT -# RADIUS_LIB_TYPE=RADIUSCLIENTNEW -# RADIUS_LIB_TYPE=RADLIB - -# RADIUSCLIENT is the radiusclient library; you probably need to add -# -lradiusclient to EXTRALIBS. -# -# The API for the radiusclient library was changed at release 0.4.0. -# Unfortunately, the header file does not define a version number that clients -# can use to support both the old and new APIs. If you are using version 0.4.0 -# or later of the radiusclient library, you should use RADIUSCLIENTNEW. -# -# RADLIB is the Radius library that comes with FreeBSD (the header file is -# called radlib.h); you probably need to add -lradius to EXTRALIBS. -# -# If you do not set RADIUS_LIB_TYPE, Exim assumes the radiusclient library, -# using the original API. - - -#------------------------------------------------------------------------------ -# Support for authentication via the Cyrus SASL pwcheck daemon is available. -# Note, however, that pwcheck is now deprecated in favour of saslauthd (see -# next item). The Exim support for pwcheck, which is intented for use in -# conjunction with the SMTP AUTH facilities, is included only when requested by -# setting the following parameter to the location of the pwcheck daemon's -# socket. -# -# There is no need to install all of SASL on your system. You just need to run -# ./configure --with-pwcheck, cd to the pwcheck directory within the sources, -# make and make install. You must create the socket directory (default -# /var/pwcheck) and chown it to exim's user and group. Once you have installed -# pwcheck, you should arrange for it to be started by root at boot time. - -# CYRUS_PWCHECK_SOCKET=/var/pwcheck/pwcheck - - -#------------------------------------------------------------------------------ -# Support for authentication via the Cyrus SASL saslauthd daemon is available. -# The Exim support, which is intented for use in conjunction with the SMTP AUTH -# facilities, is included only when requested by setting the following -# parameter to the location of the saslauthd daemon's socket. -# -# There is no need to install all of SASL on your system. You just need to run -# ./configure --with-saslauthd (and any other options you need, for example, to -# select or deselect authentication mechanisms), cd to the saslauthd directory -# within the sources, make and make install. You must create the socket -# directory (default /var/state/saslauthd) and chown it to exim's user and -# group. Once you have installed saslauthd, you should arrange for it to be -# started by root at boot time. - -# CYRUS_SASLAUTHD_SOCKET=/var/state/saslauthd/mux - - -#------------------------------------------------------------------------------ -# TCP wrappers: If you want to use tcpwrappers from within Exim, uncomment -# this setting. See the manual section entitled "Use of tcpwrappers" in the -# chapter on building and installing Exim. -# -# USE_TCP_WRAPPERS=yes -# -# You may well also have to specify a local "include" file and an additional -# library for TCP wrappers, so you probably need something like this: -# -# USE_TCP_WRAPPERS=yes -# CFLAGS=-O -I/usr/local/include -# EXTRALIBS_EXIM=-L/usr/local/lib -lwrap -# -# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM -# as well. -# -# To use a name other than exim in the tcpwrappers config file, -# e.g. if you're running multiple daemons with different access lists, -# or multiple MTAs with the same access list, define -# TCP_WRAPPERS_DAEMON_NAME accordingly -# -# TCP_WRAPPERS_DAEMON_NAME="exim" - - -#------------------------------------------------------------------------------ -# The default action of the exim_install script (which is run by "make -# install") is to install the Exim binary with a unique name such as -# exim-4.43-1, and then set up a symbolic link called "exim" to reference it, -# moving the symbolic link from any previous version. If you define NO_SYMLINK -# (the value doesn't matter), the symbolic link is not created or moved. You -# will then have to "turn Exim on" by setting up the link manually. - -# NO_SYMLINK=yes - - -#------------------------------------------------------------------------------ -# Another default action of the install script is to install a default runtime -# configuration file if one does not exist. This configuration has a router for -# expanding system aliases. The default assumes that these aliases are kept -# in the traditional file called /etc/aliases. If such a file does not exist, -# the installation script creates one that contains just comments (no actual -# aliases). The following setting can be changed to specify a different -# location for the system alias file. - -SYSTEM_ALIASES_FILE=/etc/mail/aliases - - -#------------------------------------------------------------------------------ -# There are some testing options (-be, -bt, -bv) that read data from the -# standard input when no arguments are supplied. By default, the input lines -# are read using the standard fgets() function. This does not support line -# editing during interactive input (though the terminal's "erase" character -# works as normal). If your operating system has the readline() function, and -# in addition supports dynamic loading of library functions, you can cause -# Exim to use readline() for the -be testing option (only) by uncommenting the -# following setting. Dynamic loading is used so that the library is loaded only -# when the -be testing option is given; by the time the loading occurs, -# Exim has given up its root privilege and is running as the calling user. This -# is the reason why readline() is NOT supported for -bt and -bv, because Exim -# runs as root or as exim, respectively, for those options. When USE_READLINE -# is "yes", as well as supporting line editing, a history of input lines in the -# current run is maintained. - -# USE_READLINE=yes - -# You may need to add -ldl to EXTRALIBS when you set USE_READLINE=yes. -# Note that this option adds to the size of the Exim binary, because the -# dynamic loading library is not otherwise included. - - - -############################################################################### -# THINGS YOU ALMOST NEVER NEED TO MENTION # -############################################################################### - -# The settings in this section are available for use in special circumstances. -# In the vast majority of installations you need not change anything below. - - -#------------------------------------------------------------------------------ -# The following commands live in different places in some OS. Either the -# ultimate default settings, or the OS-specific files should already point to -# the right place, but they can be overridden here if necessary. These settings -# are used when building various scripts to ensure that the correct paths are -# used when the scripts are run. They are not used in the Makefile itself. Perl -# is not necessary for running Exim unless you set EXIM_PERL (see above) to get -# it embedded, but there are some utilities that are Perl scripts. If you -# haven't got Perl, Exim will still build and run; you just won't be able to -# use those utilities. - -# CHOWN_COMMAND=/usr/bin/chown -# CHGRP_COMMAND=/usr/bin/chgrp -# CHMOD_COMMAND=/usr/bin/chmod -# MV_COMMAND=/bin/mv -# RM_COMMAND=/bin/rm -# TOUCH_COMMAND=/usr/bin/touch -# PERL_COMMAND=/usr/bin/perl - - -#------------------------------------------------------------------------------ -# The following macro can be used to change the command for building a library -# of functions. By default the "ar" command is used, with options "cq". -# Only in rare circumstances should you need to change this. - -# AR=ar cq - - -#------------------------------------------------------------------------------ -# In some operating systems, the value of the TMPDIR environment variable -# controls where temporary files are created. Exim does not make use of -# temporary files, except when delivering to MBX mailboxes. However, if Exim -# calls any external libraries (e.g. DBM libraries), they may use temporary -# files, and thus be influenced by the value of TMPDIR. For this reason, when -# Exim starts, it checks the environment for TMPDIR, and if it finds it is set, -# it replaces the value with what is defined here. Commenting this setting -# suppresses the check altogether. - -TMPDIR="/tmp" - - -#------------------------------------------------------------------------------ -# The following macros can be used to change the default modes that are used -# by the appendfile transport. In most installations the defaults are just -# fine, and in any case, you can change particular instances of the transport -# at run time if you want. - -# APPENDFILE_MODE=0600 -# APPENDFILE_DIRECTORY_MODE=0700 -# APPENDFILE_LOCKFILE_MODE=0600 - - -#------------------------------------------------------------------------------ -# In some installations there may be multiple machines sharing file systems, -# where a different configuration file is required for Exim on the different -# machines. If CONFIGURE_FILE_USE_NODE is defined, then Exim will first look -# for a configuration file whose name is that defined by CONFIGURE_FILE, -# with the node name obtained by uname() tacked on the end, separated by a -# period (for example, /usr/exim/configure.host.in.some.domain). If this file -# does not exist, then the bare configuration file name is tried. - -# CONFIGURE_FILE_USE_NODE=yes - - -#------------------------------------------------------------------------------ -# In some esoteric configurations two different versions of Exim are run, -# with different setuid values, and different configuration files are required -# to handle the different cases. If CONFIGURE_FILE_USE_EUID is defined, then -# Exim will first look for a configuration file whose name is that defined -# by CONFIGURE_FILE, with the effective uid tacked on the end, separated by -# a period (for eximple, /usr/exim/configure.0). If this file does not exist, -# then the bare configuration file name is tried. In the case when both -# CONFIGURE_FILE_USE_EUID and CONFIGURE_FILE_USE_NODE are set, four files -# are tried: <name>.<euid>.<node>, <name>.<node>, <name>.<euid>, and <name>. - -# CONFIGURE_FILE_USE_EUID=yes - - -#------------------------------------------------------------------------------ -# The size of the delivery buffers: These specify the sizes (in bytes) of -# the buffers that are used when copying a message from the spool to a -# destination. There is rarely any need to change these values. - -# DELIVER_IN_BUFFER_SIZE=8192 -# DELIVER_OUT_BUFFER_SIZE=8192 - - -#------------------------------------------------------------------------------ -# The mode of the database directory: Exim creates a directory called "db" -# in its spool directory, to hold its databases of hints. This variable -# determines the mode of the created directory. The default value in the -# source is 0750. - -# EXIMDB_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# Database file mode: The mode of files created in the "db" directory defaults -# to 0640 in the source, and can be changed here. - -# EXIMDB_MODE=0640 - - -#------------------------------------------------------------------------------ -# Database lock file mode: The mode of zero-length files created in the "db" -# directory to use for locking purposes defaults to 0640 in the source, and -# can be changed here. - -# EXIMDB_LOCKFILE_MODE=0640 - - -#------------------------------------------------------------------------------ -# This parameter sets the maximum length of the header portion of a message -# that Exim is prepared to process. The default setting is one megabyte. The -# limit exists in order to catch rogue mailers that might connect to your SMTP -# port, start off a header line, and then just pump junk at it for ever. The -# message_size_limit option would also catch this, but it may not be set. -# The value set here is the default; it can be changed at runtime. - -# HEADER_MAXSIZE="(1024*1024)" - - -#------------------------------------------------------------------------------ -# The mode of the input directory: The input directory is where messages are -# kept while awaiting delivery. Exim creates it if necessary, using a mode -# which can be defined here (default 0750). - -# INPUT_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The mode of Exim's log directory, when it is created by Exim inside the spool -# directory, defaults to 0750 but can be changed here. - -# LOG_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The log files themselves are created as required, with a mode that defaults -# to 0640, but which can be changed here. - -# LOG_MODE=0640 - - -#------------------------------------------------------------------------------ -# The TESTDB lookup is for performing tests on the handling of lookup results, -# and is not useful for general running. It should be included only when -# debugging the code of Exim. - -# LOOKUP_TESTDB=yes - - -#------------------------------------------------------------------------------ -# /bin/sh is used by default as the shell in which to run commands that are -# defined in the makefiles. This can be changed if necessary, by uncommenting -# this line and specifying another shell, but note that a Bourne-compatible -# shell is expected. - -# MAKE_SHELL=/bin/sh - - -#------------------------------------------------------------------------------ -# The maximum number of named lists of each type (address, domain, host, and -# local part) can be increased by changing this value. It should be set to -# a multiple of 16. - -MAX_NAMED_LIST=16 - - -#------------------------------------------------------------------------------ -# Network interfaces: Unless you set the local_interfaces option in the runtime -# configuration file to restrict Exim to certain interfaces only, it will run -# code to find all the interfaces there are on your host. Unfortunately, -# the call to the OS that does this requires a buffer large enough to hold -# data for all the interfaces - it was designed in the days when a host rarely -# had more than three or four interfaces. Nowadays hosts can have very many -# virtual interfaces running on the same hardware. If you have more than 250 -# virtual interfaces, you will need to uncomment this setting and increase the -# value. - -# MAXINTERFACES=250 - - -#------------------------------------------------------------------------------ -# Per-message logs: While a message is in the process of being delivered, -# comments on its progress are written to a message log, for the benefit of -# human administrators. These logs are held in a directory called "msglog" -# in the spool directory. Its mode defaults to 0750, but can be changed here. -# The message log directory is also used for storing files that are used by -# transports for returning data to a message's sender (see the "return_output" -# option for transports). - -# MSGLOG_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# There are three options which are used when compiling the Perl interface and -# when linking with Perl. The default values for these are placed automatically -# at the head of the Makefile by the script which builds it. However, if you -# want to override them, you can do so here. - -# PERL_CC= -# PERL_CCOPTS= -# PERL_LIBS= - - -#------------------------------------------------------------------------------ -# Identifying the daemon: When an Exim daemon starts up, it writes its pid -# (process id) to a file so that it can easily be identified. The path of the -# file can be specified here. Some installations may want something like this: - -PID_FILE_PATH=/var/run/exim.pid - -# If PID_FILE_PATH is not defined, Exim writes a file in its spool directory -# using the name "exim-daemon.pid". - -# If you start up a daemon without the -bd option (for example, with just -# the -q15m option), a pid file is not written. Also, if you override the -# configuration file with the -oX option, no pid file is written. In other -# words, the pid file is written only for a "standard" daemon. - - -#------------------------------------------------------------------------------ -# If Exim creates the spool directory, it is given this mode, defaulting in the -# source to 0750. - -# SPOOL_DIRECTORY_MODE=0750 - - -#------------------------------------------------------------------------------ -# The mode of files on the input spool which hold the contents of messages can -# be changed here. The default is 0640 so that information from the spool is -# available to anyone who is a member of the Exim group. - -# SPOOL_MODE=0640 - - -#------------------------------------------------------------------------------ -# Moving frozen messages: If the following is uncommented, Exim is compiled -# with support for automatically moving frozen messages out of the main spool -# directory, a facility that is found useful by some large installations. A -# run time option is required to cause the moving actually to occur. Such -# messages become "invisible" to the normal management tools. - -# SUPPORT_MOVE_FROZEN_MESSAGES=yes - - -#------------------------------------------------------------------------------ -# Disabling the use of fsync(): DO NOT UNCOMMENT THE FOLLOWING LINE unless you -# really, really, really know what you are doing. And even then, think again. -# You should never uncomment this when compiling a binary for distribution. -# Use it only when compiling Exim for your own use. -# -# Uncommenting this line enables the use of a runtime option called -# disable_fsync, which can be used to stop Exim using fsync() to ensure that -# files are written to disc before proceeding. When this is disabled, crashes -# and hardware problems such as power outages can cause data to be lost. This -# feature should only be used in very exceptional circumstances. YOU HAVE BEEN -# WARNED. - -# ENABLE_DISABLE_FSYNC=yes - -HAVE_IPV6=YES -LOOKUP_LIBS=-lldap -llber -EXTRALIBS_EXIM=-lpam -# End of EDITME for Exim 4. diff --git a/community-testing/exim/exim.conf.d b/community-testing/exim/exim.conf.d deleted file mode 100644 index b9bec4335..000000000 --- a/community-testing/exim/exim.conf.d +++ /dev/null @@ -1 +0,0 @@ -EXIM_ARGS="-bd -q15m" diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install deleted file mode 100644 index 8ed329559..000000000 --- a/community-testing/exim/exim.install +++ /dev/null @@ -1,25 +0,0 @@ -# arg 1: the new package version -post_install() { - getent group exim >/dev/null 2>&1 || groupadd -g 79 exim - if getent passwd exim > /dev/null 2>&1; then - usr/sbin/usermod -d /var/spool/exim -c 'Exim MTA' -s /sbin/nologin exim > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Exim MTA' -u 79 -g exim -d /var/spool/exim -s /sbin/nologin exim - fi - passwd -l exim > /dev/null - chown root.exim /var/spool/exim /var/log/exim - chown exim.exim /var/spool/exim/db - chmod u+s /usr/sbin/exim -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - -# arg 1: the old package version -pre_remove() { - getent passwd exim >/dev/null 2>&1 && userdel exim -} - diff --git a/community-testing/exim/exim.logrotate b/community-testing/exim/exim.logrotate deleted file mode 100644 index 070ba4747..000000000 --- a/community-testing/exim/exim.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/exim/*log { - su exim exim - missingok - notifempty - delaycompress -} diff --git a/community-testing/exim/exim.service b/community-testing/exim/exim.service deleted file mode 100644 index de52fd14f..000000000 --- a/community-testing/exim/exim.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Exim Mail Daemon - -[Service] -PIDFile=/var/run/exim.pid -ExecStart=/usr/sbin/exim -bdf -q30m -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/exim/exim.socket b/community-testing/exim/exim.socket deleted file mode 100644 index 36d28684f..000000000 --- a/community-testing/exim/exim.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Exim Mail Transfer Agent -Conflicts=exim.service - -[Socket] -ListenStream=25 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/community-testing/exim/exim@.service b/community-testing/exim/exim@.service deleted file mode 100644 index 120485b8b..000000000 --- a/community-testing/exim/exim@.service +++ /dev/null @@ -1,7 +0,0 @@ -[Unit] -Description=Exim Mail Daemon per-connection server - -[Service] -ExecStart=-/usr/sbin/exim -bs -StandardInput=socket -StandardError=syslog diff --git a/community-testing/extremetuxracer/PKGBUILD b/community-testing/extremetuxracer/PKGBUILD deleted file mode 100644 index 9292787b9..000000000 --- a/community-testing/extremetuxracer/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 77580 2012-10-12 23:39:40Z ebelanger $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Eric Belanger <eric.archlinux.org> -# Contributor: Fabio Scotoni <CCuleX.gmail.com> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -pkgname=extremetuxracer -pkgver=0.4 -pkgrel=4 -pkgdesc="Downhill racing game starring Tux" -arch=('x86_64' 'i686') -url="http://www.extremetuxracer.com" -license=('GPL') -depends=('gcc-libs' 'sdl_mixer' 'tcl>=8.5.0' 'libpng>=1.4.0' 'freetype2' 'glu') -makedepends=('mesa' 'libxi' 'libxmu') -conflicts=('ppracer' 'etracer') -replaces=('ppracer' 'etracer') -source=("http://downloads.sourceforge.net/extremetuxracer/extremetuxracer-$pkgver.tar.gz" - "$pkgname.png" - "$pkgname.desktop" - "libpng15.patch") -sha256sums=('5e4057f90e6854e774f251f189b0e676cfd7e2f15779c75544c9ac5b8e30273d' - 'ec1426171fc80b07b702e373bf9528244a3b224e887ab24b52f90740691e92fb' - '349448e8be522bbbe9fd896e875a4add7e02c35d0fafa46c5b10582562da3ca8' - '2b693eaf421d56887615fc02d40f742e9b8bf817ae36be1f1f9e33a52719eea8') - -build() { - cd "$srcdir/extremetuxracer-$pkgver" - - patch -Np1 -i "${srcdir}/libpng15.patch" - sed -i -e 's/libpng12/libpng15/g' configure - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/extremetuxracer-$pkgver" - make DESTDIR="$pkgdir" install - - # Install icon and desktop file - install -Dm644 "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/extremetuxracer/extremetuxracer.desktop b/community-testing/extremetuxracer/extremetuxracer.desktop deleted file mode 100644 index 6593607b8..000000000 --- a/community-testing/extremetuxracer/extremetuxracer.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Encoding=UTF-8 -Name=Extreme Tux Racer -Comment=Open source racing game featuring Tux the Linux Penguin. -Icon=/usr/share/pixmaps/extremetuxracer.png -Exec=etracer -Terminal=false -StartupNotify=true -Categories=Application;Game;ArcadeGame - diff --git a/community-testing/extremetuxracer/extremetuxracer.png b/community-testing/extremetuxracer/extremetuxracer.png Binary files differdeleted file mode 100644 index 6c4aec00b..000000000 --- a/community-testing/extremetuxracer/extremetuxracer.png +++ /dev/null diff --git a/community-testing/extremetuxracer/libpng15.patch b/community-testing/extremetuxracer/libpng15.patch deleted file mode 100644 index 5c9999857..000000000 --- a/community-testing/extremetuxracer/libpng15.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp ---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp 2007-09-01 19:38:12.000000000 +0300 -+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp 2010-01-25 03:47:21.000000000 +0200 -@@ -53,7 +53,7 @@ - if (!info_ptr) - { - png_destroy_read_struct(&png_ptr, -- (png_infopp)NULL, (png_infopp)NULL); -+ NULL, NULL); - fclose(fp); - return; - } -@@ -62,7 +62,7 @@ - if (!end_info) - { - png_destroy_read_struct(&png_ptr, &info_ptr, -- (png_infopp)NULL); -+ NULL); - fclose(fp); - return; - } -@@ -77,7 +77,7 @@ - - - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - - if(bit_depth == 16) - png_set_strip_16(png_ptr); -@@ -88,7 +88,7 @@ - png_set_expand(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - } - - if( color_type == PNG_COLOR_TYPE_GRAY || -@@ -96,7 +96,7 @@ - png_set_gray_to_rgb(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - } - - this->width=width; -@@ -114,7 +114,7 @@ - } - - png_read_end(png_ptr, info_ptr); -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - } - diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD deleted file mode 100644 index 961996a6a..000000000 --- a/community-testing/fatrat/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 73751 2012-07-15 13:18:09Z ibiru $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=fatrat -pkgver=1.2.0_beta2 -pkgrel=1 -pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more" -arch=('i686' 'x86_64') -url="http://fatrat.dolezel.info/" -license=('GPL') -depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit') -optdepends=('geoip: GeoIP support') -makedepends=('boost' 'cmake' 'java-environment') -source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz) -md5sums=('ad823d2a81f0583316ece815b928c71b') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - - cmake \ - -DWITH_EVERYTHING=ON \ - -DCMAKE_INSTALL_PREFIX=/usr \ - . - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/fcron/PKGBUILD b/community-testing/fcron/PKGBUILD deleted file mode 100644 index a8a579cb5..000000000 --- a/community-testing/fcron/PKGBUILD +++ /dev/null @@ -1,80 +0,0 @@ -# $Id: PKGBUILD 72553 2012-06-16 17:09:37Z dreisner $ -# Contributor: Giorgio Lando <lando at imap dot cc> -# Contributor: Sergej Pupykin -# Contributor: Thomas Bächler -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> - -pkgname=fcron -pkgver=3.0.6 -pkgrel=7 -pkgdesc="feature-rich cron implementation" -arch=(i686 x86_64) -url="http://fcron.free.fr" -license=('GPL') -depends=('pam') -makedepends=('smtp-server') -optdepends=('smtp-server: to receive mails from cron jobs') -provides=('cron') -conflicts=('dcron') -backup=(etc/fcron/fcron.conf etc/fcron/fcron.allow etc/fcron/fcron.deny \ - var/spool/fcron/systab var/spool/fcron/systab.orig) -options=('emptydirs' '!makeflags') -source=(http://fcron.free.fr/archives/$pkgname-$pkgver.src.tar.gz fcron.rc \ - systab systab.orig run-cron fcron.service) -md5sums=('69ebcb41921e2a282f41ebecb3a27053' - 'e0c3f0bdc3c98fbbe46eff19001c18f2' - '938722c6654ef7b07f4aa10001905ba1' - 'bfb7daa22ebe22b9917e455c1ca4a382' - '5ff0cdcb9ec99778938ac6ef26800327' - 'ab589cc6813ec32b5e96bf05c2b51c4c') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --sysconfdir=/etc/fcron \ - --with-answer-all=no \ - --with-boot-install=no \ - --with-username=root \ - --with-groupname=root \ - --datarootdir=/usr/share \ - --datadir=/usr/share \ - --with-docdir=/usr/share/doc \ - --localstatedir=/var \ - --with-editor=/usr/bin/vi \ - --with-sendmail=/usr/sbin/sendmail - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - install -D -m755 "$srcdir/fcron.rc" "$pkgdir/etc/rc.d/fcron" - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" - # Install default fcrontab so that fcron can completely replace dcron - - install -D -m600 "$srcdir/systab" "$pkgdir/var/spool/fcron/systab" - # In order to preserve the systab crontab in any case it is better to have - # it in non-binary form too - install -D -m600 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" - - # Add cron.* directories - install -d -m755 "$pkgdir/etc/cron.daily" - install -d -m755 "$pkgdir/etc/cron.hourly" - install -d -m755 "$pkgdir/etc/cron.monthly" - install -d -m755 "$pkgdir/etc/cron.weekly" - - # Install run-cron script to make fcron run without dcron - install -D -m755 "$srcdir/run-cron" "$pkgdir/usr/sbin/run-cron" - - # Install systemd service - install -D -m644 "$srcdir/fcron.service" \ - "$pkgdir/usr/lib/systemd/system/fcron.service" - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/fcron/fcron.rc b/community-testing/fcron/fcron.rc deleted file mode 100644 index 880439a1d..000000000 --- a/community-testing/fcron/fcron.rc +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/fcron` -case "$1" in - start) - stat_busy "Starting Fcron Daemon" - [ -z "$PID" ] && /usr/sbin/fcron -b - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon fcron - stat_done - fi - ;; - stop) - stat_busy "Stopping Fcron Daemon" - [ -n "$PID" ] && kill $PID >/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon fcron - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/fcron/fcron.service b/community-testing/fcron/fcron.service deleted file mode 100644 index a47b4f19b..000000000 --- a/community-testing/fcron/fcron.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Cron Daemon - -[Service] -Type=forking -PIDFile=/run/fcron.pid -ExecStart=/usr/sbin/fcron - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/fcron/run-cron b/community-testing/fcron/run-cron deleted file mode 100644 index 51007a15a..000000000 --- a/community-testing/fcron/run-cron +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - - -if [ -z $1 ]; then - echo "Usage: $0 crondir" - exit 1 -fi - -for cron in $1/* ; do - if [ -x $cron ]; then - $cron - fi -done -unset cron diff --git a/community-testing/fcron/systab b/community-testing/fcron/systab Binary files differdeleted file mode 100644 index 11c7e2fd0..000000000 --- a/community-testing/fcron/systab +++ /dev/null diff --git a/community-testing/fcron/systab.orig b/community-testing/fcron/systab.orig deleted file mode 100644 index 5b0045626..000000000 --- a/community-testing/fcron/systab.orig +++ /dev/null @@ -1,4 +0,0 @@ -&bootrun 01 * * * * /usr/sbin/run-cron /etc/cron.hourly -&bootrun 02 00 * * * /usr/sbin/run-cron /etc/cron.daily -&bootrun 22 00 * * 0 /usr/sbin/run-cron /etc/cron.weekly -&bootrun 42 00 1 * * /usr/sbin/run-cron /etc/cron.monthly 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/fish/PKGBUILD b/community-testing/fish/PKGBUILD deleted file mode 100644 index b79fe66e6..000000000 --- a/community-testing/fish/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 74385 2012-07-26 06:57:15Z bpiotrowski $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Abhishek Dasgupta <abhidg@gmail.com> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Jan Fader <jan.fader@web.de> - -pkgname=fish -pkgver=2.0b2 -pkgrel=1 -pkgdesc='Smart and user friendly shell intended mostly for interactive use' -arch=('i686' 'x86_64') -url='http://ridiculousfish.com/shell/' -license=('GPL2') -depends=('python') -makedepends=('doxygen') -install=fish.install -source=($pkgname-$pkgver.tar.gz::http://ridiculousfish.com/shell/files/fishfish.tar.gz) -md5sums=('ebe5fe17f6925b9142aadc8ebae5fba1') - -build() { - cd "$srcdir"/fishfish - autoconf - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --without-xsel - make -} - -package() { - cd "$srcdir"/fishfish - make DESTDIR="$pkgdir" install - - # compress man pages - find "$pkgdir"/usr/share/fish/man/ -type f | xargs gzip -9 -} diff --git a/community-testing/fish/fish.install b/community-testing/fish/fish.install deleted file mode 100644 index 765006f95..000000000 --- a/community-testing/fish/fish.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - grep -q '/usr/bin/zsh' etc/shells || echo '/usr/bin/zsh' >> etc/shells -} - -post_upgrade() { - post_install -} - -pre_remove() { - sed -i '/^\/usr\/bin\/fish/d' /etc/shells -} diff --git a/community-testing/flightgear/PKGBUILD b/community-testing/flightgear/PKGBUILD deleted file mode 100644 index 3f075f553..000000000 --- a/community-testing/flightgear/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 77277 2012-10-08 14:22:31Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: William Rea <sillywilly@gmail.com> -# Contributor: Hans Janssen <hans@janserv.xs4all.nl> - -pkgname=flightgear -pkgver=2.8.0 -pkgrel=2 -pkgdesc="An open-source, multi-platform flight simulator" -arch=(i686 x86_64) -depends=('simgear' 'libxmu' 'libxi' 'zlib' 'openscenegraph' 'subversion' 'libxrandr' 'glu') -makedepends=('boost' 'cmake') -license=("GPL") -url="http://www.flightgear.org" -options=('!makeflags') -#source=("$pkgname-$pkgver.tar.gz::https://gitorious.org/fg/flightgear/archive-tarball/release/$pkgver") -#source=("ftp://ftp.de.flightgear.org/pub/fgfs/Source/flightgear-$pkgver.tar.bz2") -source=("http://mirrors.ibiblio.org/pub/mirrors/flightgear/ftp/Source/flightgear-$pkgver.tar.bz2") -md5sums=('9499194146f414323efef8cb3451b750') - -build() { - cd $srcdir/flightgear-$pkgver - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DFG_DATA_DIR:STRING="/usr/share/flightgear/data" . - make - sed -i 's|Exec=.*|Exec=fgfs --fg-root=/usr/share/flightgear/data|' package/flightgear.desktop -} - -package() { - depends=(${depends[@]} 'flightgear-data') - - cd $srcdir/flightgear-$pkgver - make DESTDIR=$pkgdir install - - install -Dm0644 package/flightgear.desktop $pkgdir/usr/share/applications/flightgear.desktop - install -Dm0644 package/flightgear.ico $pkgdir/usr/share/icons/flightgear.ico - ln -sf flightgear $pkgdir/usr/share/FlightGear -} diff --git a/community-testing/fox/PKGBUILD b/community-testing/fox/PKGBUILD deleted file mode 100644 index efce724b7..000000000 --- a/community-testing/fox/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 77273 2012-10-08 13:51:06Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Ben <ben@benmazer.net> - -pkgname=fox -pkgver=1.6.46 -pkgrel=2 -pkgdesc="Free Objects for X: GUI Toolkit for C++" -arch=('i686' 'x86_64') -url="http://www.fox-toolkit.org/" -license=('LGPL' 'custom') -depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libtiff' 'glu') -optdepends=('perl') -options=('!libtool') -source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz) -md5sums=('da2c5cf36eff32a0c49cfcd9494fe6b7') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - export CPPFLAGS="$CPPFLAGS -I/usr/include/freetype2" - ./configure --prefix=/usr \ - --enable-release \ - --with-xft=yes \ - --with-opengl=yes \ - --with-xim \ - --with-xshm \ - --with-shape \ - --with-xcursor \ - --with-xrender \ - --with-xrandr \ - --with-xfixes \ - --with-xinput - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - cd ${srcdir}/${pkgname}-${pkgver}/tests - make ControlPanel - install -m755 ${srcdir}/${pkgname}-${pkgver}/tests/.libs/ControlPanel ${pkgdir}/usr/bin/ - install -Dm644 ../LICENSE_ADDENDUM ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-testing/freedroidrpg/PKGBUILD b/community-testing/freedroidrpg/PKGBUILD deleted file mode 100644 index c4f67ddbb..000000000 --- a/community-testing/freedroidrpg/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 75738 2012-08-30 16:55:50Z heftig $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: nut543 <kfs1@online.no> - -#pkgbase=freedroidrpg -#pkgname=('freedroidrpg' 'freedroidrpg-data') -pkgname='freedroidrpg' -pkgver=0.15.1 -pkgrel=2 -arch=('i686' 'x86_64') -# depends=('sdl_mixer' 'sdl_image' 'libogg' 'libvorbis' 'libgl' 'freedroidrpg-data') -depends=('sdl_mixer' 'sdl_image' 'sdl_gfx' 'libogg' 'libvorbis' 'libgl' 'mesa') -optdepends=('python2' 'espeak') -pkgdesc="a mature science fiction role playing game set in the future" -url="http://freedroid.sourceforge.net" -license=("GPL") -source=(http://downloads.sourceforge.net/project/freedroid/freedroidRPG/freedroidRPG-0.15/freedroidRPG-$pkgver.tar.gz - freedroidrpg.jpg - freedroidrpg.desktop) -md5sums=('b95ea6abae46bea6ee3ace9a1902f682' - 'b73d9dac44c7e83a6c80fbe4eb96ba79' - '9a10c2a2064439cdcff5b945dfb1c3ac') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir/ install - install -D -m644 $srcdir/freedroidrpg.jpg $pkgdir/usr/share/icons/freedroidrpg.jpg - install -D -m644 $srcdir/freedroidrpg.desktop $pkgdir/usr/share/applications/freedroidrpg.desktop -} diff --git a/community-testing/freedroidrpg/freedroidrpg.desktop b/community-testing/freedroidrpg/freedroidrpg.desktop deleted file mode 100644 index 33ee2f5b8..000000000 --- a/community-testing/freedroidrpg/freedroidrpg.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=freedroidrpg -Comment=Extension/modification of the classical Freedroid game(based on paradroid) into an RPG -Exec=freedroidRPG -Encoding=UTF-8 -Icon=/usr/share/icons/freedroidrpg.jpg -Categories=Game;RolePlaying; -Terminal=false -StartupNotify=false diff --git a/community-testing/freedroidrpg/freedroidrpg.jpg b/community-testing/freedroidrpg/freedroidrpg.jpg Binary files differdeleted file mode 100644 index 4daa89313..000000000 --- a/community-testing/freedroidrpg/freedroidrpg.jpg +++ /dev/null diff --git a/community-testing/freemat/ChangeLog b/community-testing/freemat/ChangeLog deleted file mode 100644 index dba4cf7ec..000000000 --- a/community-testing/freemat/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community-testing/freemat/PKGBUILD b/community-testing/freemat/PKGBUILD deleted file mode 100644 index 7e5702b32..000000000 --- a/community-testing/freemat/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 77431 2012-10-10 12:16:20Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=freemat -pkgver=4.1 -pkgrel=5 -pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing" -arch=('i686' 'x86_64') -url="http://freemat.sourceforge.net" -license=('GPL') -depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi' 'mesa' 'glu') -makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2') -install=freemat.install -source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz - build-fix.patch) -md5sums=('929d31e2310feaff5d380fc2f7b4d1a2' - '2d11a28aa2a7df89c4618ed1c4be5973') - -build() { - cd $srcdir/FreeMat-$pkgver-Source - - unset LDFLAGS - rm -f CMakeCache.txt - find . -type f -name '*.moc.cpp' -exec rm -f {} \; - find . -type f -name 'add.so' -exec rm -f {} \; - patch -p1 <$srcdir/build-fix.patch - echo >libs/libMatC/CJitFuncClang.hpp - echo >libs/libMatC/CJitFuncClang.cpp - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DUSE_LLVM=OFF \ - -DFORCE_BUNDLED_UMFPACK=ON \ - -DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \ - -DPYTHON_EXECUTABLE=/usr/bin/python2 \ - . - make -} -package() { - cd $srcdir/FreeMat-$pkgver-Source - - make DESTDIR=$pkgdir install -j1 - sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install - rm $pkgdir/usr/bin/blas.ini -} diff --git a/community-testing/freemat/build-fix.patch b/community-testing/freemat/build-fix.patch deleted file mode 100644 index c1ea63088..000000000 --- a/community-testing/freemat/build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp ---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp 2011-11-27 04:27:43.000000000 +0400 -+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp 2012-01-20 19:07:48.000000000 +0400 -@@ -20,6 +20,7 @@ - #include <qimage.h> - #include <qpainter.h> - #include <QtOpenGL> -+#include <GL/glu.h> - #include <math.h> - #include "IEEEFP.hpp" - diff --git a/community-testing/freemat/freemat.install b/community-testing/freemat/freemat.install deleted file mode 100644 index 051cca866..000000000 --- a/community-testing/freemat/freemat.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location" -} - -post_upgrade() { - echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location" -} diff --git a/community-testing/freeorion/PKGBUILD b/community-testing/freeorion/PKGBUILD deleted file mode 100644 index a778d6807..000000000 --- a/community-testing/freeorion/PKGBUILD +++ /dev/null @@ -1,105 +0,0 @@ -# $Id: PKGBUILD 73752 2012-07-15 13:18:16Z ibiru $ -# 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-testing/freeorion/freeorion.install b/community-testing/freeorion/freeorion.install deleted file mode 100644 index ad97d7bab..000000000 --- a/community-testing/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-testing/freeorion/freeorion.sh b/community-testing/freeorion/freeorion.sh deleted file mode 100644 index d80623ab2..000000000 --- a/community-testing/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-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/freewrl/PKGBUILD b/community-testing/freewrl/PKGBUILD deleted file mode 100644 index a3c68dbe4..000000000 --- a/community-testing/freewrl/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 77283 2012-10-08 14:36:02Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=freewrl -pkgver=1.22.13.1 -_pkgver=1.22.13 -pkgrel=2 -pkgdesc="VRML viewer" -arch=('i686' 'x86_64') -url="http://freewrl.sourceforge.net/" -license=('GPL') -depends=('java-runtime' 'libxaw' 'glew' 'freeglut' 'curl' 'freetype2' 'imlib2' 'sox' - 'unzip' 'imagemagick' 'libxml2' 'ttf-bitstream-vera' 'lesstif' 'js' 'glu') -makedepends=('java-environment' 'xulrunner' 'wget') -options=(!libtool) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2) -md5sums=('27f4bf163011d8ac2088a535cb58a13d') - -build() { - . /etc/profile.d/jre.sh - . /etc/profile.d/jdk.sh - cd $srcdir/$pkgname-${_pkgver} - export JAVASCRIPT_ENGINE_CFLAGS="-I/usr/include/js -DXP_UNIX -DJS_THREADSAFE $(pkg-config --cflags nspr)" - export JAVASCRIPT_ENGINE_LIBS="$(pkg-config --libs nspr) -lmozjs185" - ./configure \ - --prefix=/usr --with-fontsdir=/usr/share/fonts/TTF --enable-libeai \ - --enable-libcurl --with-expat=/usr --with-target=x11 --enable-plugin \ - --disable-mozilla-js --enable-xulrunner-js --disable-firefox-js \ - --disable-seamonkey-js - make -} - -package() { - cd $srcdir/$pkgname-${_pkgver} - make DESTDIR=$pkgdir install -} diff --git a/community-testing/fxdesktop/PKGBUILD b/community-testing/fxdesktop/PKGBUILD deleted file mode 100644 index f03c3025a..000000000 --- a/community-testing/fxdesktop/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 77285 2012-10-08 14:36:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=fxdesktop -pkgver=0.1.12 -pkgrel=6 -pkgdesc="Lightweight Desktop Environment" -arch=('i686' 'x86_64') -url="http://code.google.com/p/fxdesktop/" -license=('GPL') -depends=('fox>=1.6.0') -makedepends=('glu') -source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -md5sums=('9489e7369b5e052e0b6836a3b0670832') - -build() { - cd $srcdir/$pkgname-$pkgver - # Override default flags - export CFLAGS="-Wall -O2 -pipe" - export CXXFLAGS="-Wall -O2 -pipe" - [ "$CARCH" = "x86_64" ] && (sed -i -e 's|lib64|lib|g' build/config.linux_x86_64) - # Compile - ./gb --prefix=/usr - ./gb --package-root=$pkgdir/usr install -} diff --git a/community-testing/fxprocessview/PKGBUILD b/community-testing/fxprocessview/PKGBUILD deleted file mode 100644 index 0b0bba20a..000000000 --- a/community-testing/fxprocessview/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 77289 2012-10-08 15:03:29Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=fxprocessview -pkgver=0.5.0 -pkgrel=5 -pkgdesc="Process Viewer" -arch=('i686' 'x86_64') -license=('GPL') -depends=('fox>=1.4.0') -makedepends=('glu') -url="http://code.google.com/p/fxdesktop/" -source=(http://archlinux-stuff.googlecode.com/files/$pkgname-$pkgver.tar.gz \ - build-fix.patch) -md5sums=('5d3cc8d7aec770997c281a743ddfda5a' - '2d2c3d54dcd2404149955f12cccb21a5') - -build() { - cd $srcdir/$pkgname-$pkgver - # Override default flags - export CFLAGS="-Wall -O2 -pipe" - export CXXFLAGS="-Wall -O2 -pipe" - # Compile - patch -Np1 <../build-fix.patch - ./gb - # gb does not return valid error code - [ -f src/fxprocessview ] - # make sure destination exists - mkdir -p $pkgdir/usr/bin - # Install - ./gb install --package-root=$pkgdir/usr -} diff --git a/community-testing/fxprocessview/build-fix.patch b/community-testing/fxprocessview/build-fix.patch deleted file mode 100644 index 7c883454c..000000000 --- a/community-testing/fxprocessview/build-fix.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -wbBur fxprocessview-0.5.0/src/processlist.cpp fxprocessview-0.5.0.my/src/processlist.cpp ---- fxprocessview-0.5.0/src/processlist.cpp 2005-07-15 06:39:17.000000000 +0400 -+++ fxprocessview-0.5.0.my/src/processlist.cpp 2007-03-07 19:21:34.000000000 +0300 -@@ -696,7 +696,7 @@ - - long FXProcessList::onCmdUserMode(FXObject* sender,FXSelector,void* ){ - if (userfilter.empty()){ -- userfilter=FXFile::getCurrentUserName(); -+ userfilter=FXSystem::currentUserName(); - } - else { - userfilter=""; -@@ -942,12 +942,17 @@ - - - -- FXint num_processes = FXFile::listFiles(dirlist,"/proc","[0123456789]*",LIST_MATCH_ALL|LIST_NO_FILES|LIST_NO_PARENT); -+ FXint num_processes = FXDir::listFiles(dirlist,"/proc","[0123456789]*",FXDir::MatchAll | FXDir::NoFiles | FXDir::NoParent); - task_total=num_processes; - for (FXint i=0;i<num_processes;i++){ - - /// Check the Owner -- owner = FXFile::owner("/proc/" + dirlist[i]); -+ FXStat stat; -+ FXStat::statFile("/proc/" + dirlist[i], stat); -+ owner = FXSystem::userName(stat.user()); -+ -+// owner = FXSystem::userName(FXStat::user("/proc/" + dirlist[i])); -+ - if (!userfilter.empty() && (owner!=userfilter)) continue; - - /// Read in Process Stat -@@ -1027,7 +1032,7 @@ - } - - filename = "/proc/" + dirlist[i] + "/cmdline"; -- if (FXFile::exists(filename)) { -+ if (FXStat::exists(filename)) { - fp = fopen(filename.text(),"r"); - if (fp) { - if (fgets(buffer,80,fp)!=NULL){ diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD deleted file mode 100644 index d10a71c86..000000000 --- a/community-testing/gambas2/PKGBUILD +++ /dev/null @@ -1,923 +0,0 @@ -# $Id: PKGBUILD 78473 2012-10-19 13:29:38Z bluewind $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Biru Ionut <ionut@archlinux.ro> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Toni Foerster <stonerl@skeps.de> - -pkgbase="gambas2" -pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' - 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') -pkgver=2.24.0 -pkgrel=8 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net" -makedepends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'glu' 'gtk2' 'librsvg' 'xdg-utils' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'mesa' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft' - 'libxcursor' 'libsm' 'intltool' 'mysql' 'postgresql') -license=('GPL2') -options=('!emptydirs' '!makeflags') -groups=('gambas2') -replaces=('gambas2') -conflicts=('gambas2') -source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2 - 'fix-gbi-gba-path.patch' - 'gambas2-script.install' 'gambas2-runtime.install' - 'poppler-0.20.patch') -md5sums=('b59072b6f57b681d586cc84c02333690' - '9dda03a1bbfb7e7ba8b6a4ae91b6752b' - '870ff5b4b33cd75aa9c290539e6fdd5d' - 'ab5667175c4945282d2f40a35d0e9e5b' - '5eb70afe712c0f8667a700df4d9a6735') -_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc" - -_buildgbcomp() { - cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install $1.gambas ${pkgdir}/usr/lib/gambas2/ - install .component ${pkgdir}/usr/lib/gambas2/$1.component - chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component - install .info ${pkgdir}/usr/share/gambas2/info/$1.info - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info - install .list ${pkgdir}/usr/share/gambas2/info/$1.list - chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list - if test -d control; then - install -d ${pkgdir}/usr/share/gambas2/control/$1 - install control/*.png ${pkgdir}/usr/share/gambas2/control/$1 - chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png - fi -} - -build() { - cd "${srcdir}/$pkgbase-$pkgver" - - msg "Applying patches ..." - # workaround to allow package splitting - patch -Np1 -i ../fix-gbi-gba-path.patch - # fix building with poppler-0.20.x (merged upstream) - cd gb.pdf - patch -Np0 -i ../../poppler-0.20.patch - cd .. - - ./reconf-all - ## - - . /etc/profile.d/kde3.sh - . /etc/profile.d/qt3.sh - - ./configure -C --disable-qte --prefix=/usr - make bindir=${pkgdir}/usr/bin -} - -package_gambas2-meta() { - depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help' - 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' - 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') - pkgdesc="Gambas2 meta package" -} - -package_gambas2-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Gambas2 runtime environment" - provides=('gambas2-gb-gui') - conflicts=('gambas2-gb-gui') - install=gambas2-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \ - ${pkgdir}/usr/lib/gambas2 - ln -s gbx2 ${pkgdir}/usr/bin/gbr2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm ${pkgdir}/usr/lib/gambas2/gb.{qt.*,so*,la} - rm ${pkgdir}/usr/share/gambas2/info/gb.qt* - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \ - ${pkgdir}/usr/share/gambas2/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas2/icons - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \ - ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png -} - -package_gambas2-devel() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-ide() { - depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings' - 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel') - pkgdesc="Gambas2 Integrated Development Environment" -# arch=('any') - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - _buildgbcomp gb.form.mdi - _buildgbcomp gb.settings - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/ - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin - install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin - ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2 - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \ - ${pkgdir}/usr/share/applications/gambas2.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \ - ${pkgdir}/usr/share/pixmaps/gambas2.png -} - -package_gambas2-examples() { - depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt' - 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql' - 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3' - 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' - 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' - 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl' - 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre' - 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl' - 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl' - 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb' - 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt') - pkgdesc="Gambas2 examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas2/{help,info} -} - -package_gambas2-help() { - depends=() - pkgdesc="Gambas2 help files" - - cd ${srcdir}/${pkgbase}-${pkgver}/help - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - #fix help - chown root:root -R ${pkgdir}/usr/share/gambas2/help/help -} - -package_gambas2-script() { - depends=('gambas2-devel') - pkgdesc="Gambas2 scripter and server programs support" - install=gambas2-script.install - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2 - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2 - install -m755 gbs2.gambas ${pkgdir}/usr/bin - - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2 - ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2 - - ## cleanup the workaround - rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib - rm ${pkgdir}/usr/bin/gbx2 - ## - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas2/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/ - ## -} - -package_gambas2-gb-chart() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 chart component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.chart - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-compress() { - depends=('gambas2-runtime' 'bzip2' 'zlib') - pkgdesc="Gambas2 compression support component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-corba() { - depends=('gambas2-runtime' 'omniorb') - pkgdesc="Gambas2 corba component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-crypt() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 MD5/DES crypting component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-firebird() { - depends=('gambas2-gb-db' 'libfbclient') - pkgdesc="Gambas2 Firebird database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-form() { - depends=('gambas2-gb-db' 'gambas2-gb-form') - pkgdesc="Gambas2 database form component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.db.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-db-mysql() { - depends=('gambas2-gb-db' 'libmysqlclient') - pkgdesc="Gambas2 MySQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-odbc() { - depends=('gambas2-gb-db' 'unixodbc') - pkgdesc="Gambas2 ODBC database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-postgresql() { - depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1') - pkgdesc="Gambas2 PostgreSQL database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite2() { - depends=('gambas2-gb-db' 'sqlite2' 'gcc-libs') - pkgdesc="Gambas2 Sqlite2 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-db-sqlite3() { - depends=('gambas2-gb-db' 'sqlite' 'gcc-libs') - pkgdesc="Gambas2 Sqlite3 database access component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-desktop() { - depends=('gambas2-runtime' 'libsm' 'libxtst') - pkgdesc="Gambas2 desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*} - rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 form component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-dialog() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form dialog component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.dialog - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-form-mdi() { - depends=('gambas2-gb-form') - pkgdesc="Gambas2 form MDI component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.form.mdi - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk() { - depends=('gambas2-runtime' 'gtk2') - pkgdesc="Gambas2 graphical GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-ext() { - depends=('gambas2-gb-gtk') - pkgdesc="Gambas2 graphical GTK+ toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-gtk-svg() { - depends=('gambas2-gb-gtk' 'librsvg') - pkgdesc="Gambas2 graphical GTK+ toolkit svg component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-image() { - depends=('gambas2-runtime' 'gcc-libs') - pkgdesc="Gambas2 image processing component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-info() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 info component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.info - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-net() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-curl() { - depends=('gambas2-runtime' 'curl') - pkgdesc="Gambas2 advanced networking component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-net-smtp() { - depends=('gambas2-runtime' 'glib2') - pkgdesc="Gambas2 SMTP component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-opengl() { - depends=('gambas2-runtime' 'glu') - pkgdesc="Gambas2 OpenGL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-option() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 command-line options component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pcre() { - depends=('gambas2-runtime' 'pcre') - pkgdesc="Gambas2 PCRE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-pdf() { - depends=('gambas2-runtime' 'poppler-glib') - pkgdesc="Gambas2 PDF component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-qt() { - depends=('gambas2-runtime' 'qt3') - pkgdesc="Gambas2 graphical QT toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-ext() { - depends=('gambas2-gb-qt') - pkgdesc="Gambas2 graphical QT toolkit extension component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-opengl() { - depends=('gambas2-gb-qt' 'libgl') - pkgdesc="Gambas2 graphical QT toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-qt-kde() { - depends=('gambas2-gb-qt' 'kdelibs3') - pkgdesc="Gambas2 KDE component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html* - rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html* -} - -package_gambas2-gb-qt-kde-html() { - depends=('gambas2-gb-qt-kde') - pkgdesc="Gambas2 KHTML component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-report() { - depends=('gambas2-runtime' 'gambas2-gb-form') - pkgdesc="Gambas2 report component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - _buildgbcomp gb.form - _buildgbcomp gb.report - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*} - rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-sdl() { - depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'glu') - pkgdesc="Gambas2 SDL component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-sdl-sound() { - depends=('gambas2-runtime' 'sdl_mixer') - pkgdesc="Gambas2 SDL sound component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-settings() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 settings management component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.settings - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-v4l() { - depends=('gambas2-runtime' 'libjpeg' 'libpng') - pkgdesc="Gambas2 V4L component" - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-vb() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 VB transitional component" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install -} - -package_gambas2-gb-web() { - depends=('gambas2-runtime') - pkgdesc="Gambas2 CGI component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - _buildgbcomp gb.web - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml() { - depends=('gambas2-runtime' 'libxml2') - pkgdesc="Gambas2 xml component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*} - rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-rpc() { - depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl') - pkgdesc="Gambas2 xml-rpc component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*} - rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*} - rm -rf ${pkgdir}/usr/bin - ## -} - -package_gambas2-gb-xml-xslt() { - depends=('gambas2-gb-xml' 'libxslt') - pkgdesc="Gambas2 xml-xslt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - mkdir -p ${pkgdir}/usr/share/gambas2/info - ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install - - ## cleanup the workaround - rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list} - rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la} - rm -rf ${pkgdir}/usr/bin - ## -} diff --git a/community-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch deleted file mode 100644 index 9be8e921e..000000000 --- a/community-testing/gambas2/fix-gbi-gba-path.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- component.am 2010-03-15 20:54:43.000000000 +0100 -+++ ../component.am 2010-04-30 15:00:47.218700833 +0200 -@@ -6,17 +6,17 @@ - @if test -d $(COMPONENT); then \ - echo "Compiling the $(COMPONENT) project..."; \ - ( \ -- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ -+ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \ - cd $(COMPONENT); \ -- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \ -+ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \ -+ $(GBFILES)/gba$(GAMBAS_VERSION); \ - rm -rf .gambas; \ - $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \ - ) \ - fi - @echo - @echo "Creating the information files for $(COMPONENT) component..." -- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) -+ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT) - @echo - - uninstall-hook: diff --git a/community-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-testing/gambas2/gambas2-runtime.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install deleted file mode 100644 index 86558e434..000000000 --- a/community-testing/gambas2/gambas2-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml -} diff --git a/community-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install deleted file mode 100644 index 4729f7ef6..000000000 --- a/community-testing/gambas2/gambas2.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas - xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas - xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gambas2/poppler-0.20.patch b/community-testing/gambas2/poppler-0.20.patch deleted file mode 100644 index a73d42a7f..000000000 --- a/community-testing/gambas2/poppler-0.20.patch +++ /dev/null @@ -1,100 +0,0 @@ -Index: src/CPdfDocument.cpp -=================================================================== ---- src/CPdfDocument.cpp (révision 4732) -+++ src/CPdfDocument.cpp (copie de travail) -@@ -407,7 +407,11 @@ - white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; - THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); - -+ #if POPPLER_VERSION_0_20 -+ THIS->dev->startDoc(THIS->doc); -+ #else - THIS->dev->startDoc(THIS->doc->getXRef ()); -+ #endif - - outline=THIS->doc->getOutline(); - if (outline) THIS->index=outline->getItems(); -@@ -833,13 +837,22 @@ - - if ( (w<0) || (h<0) ) return NULL; - -+ #if POPPLER_VERSION_0_20 - THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, - rotation, - gFalse, - gTrue, - x,y,w,h, -+ gFalse); -+ #else -+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, -+ rotation, - gFalse, -+ gTrue, -+ x,y,w,h, -+ gFalse, - THIS->doc->getCatalog ()); -+ #endif - - map=THIS->dev->getBitmap(); - -@@ -929,9 +942,14 @@ - w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); - h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); - -+ #if POPPLER_VERSION_0_20 -+ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); -+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); -+ #else - dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); - gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, \ - gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); -+ #endif - - THIS->page->display(gfx); - dev->endPage(); -@@ -960,7 +978,9 @@ - - void aux_fill_links(void *_object) - { -- #if POPPLER_VERSION_0_17 -+ #if POPPLER_VERSION_0_20 -+ THIS->links = new Links (THIS->page->getAnnots ()); -+ #elif POPPLER_VERSION_0_17 - THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); - #else - Object obj; -@@ -1200,12 +1220,21 @@ - - if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); - -+ #if POPPLER_VERSION_0_20 -+ textdev = new TextOutputDev (NULL, true, 0, false, false); -+ THIS->page->display (textdev, 72, 72, 0, false, false, false); -+ #else - textdev = new TextOutputDev (NULL, true, false, false); - THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); -+ #endif - - if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } - -+ #if POPPLER_VERSION_0_20 -+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) -+ #else - while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) -+ #endif - { - if (!THIS->Found) { - GB.NewArray(POINTER(&THIS->Found),sizeof(FoundRect),1); -Index: configure.ac -=================================================================== ---- configure.ac (révision 4732) -+++ configure.ac (copie de travail) -@@ -25,6 +25,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) - pkg-config --atleast-version=0.17.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) -+ pkg-config --atleast-version=0.20.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) - fi - - AC_OUTPUT( \ diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD deleted file mode 100644 index 222bbe42b..000000000 --- a/community-testing/gambas3/PKGBUILD +++ /dev/null @@ -1,1342 +0,0 @@ -# $Id: PKGBUILD 78474 2012-10-19 13:29:46Z bluewind $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor : sebikul <sebikul@gmail.com> - -pkgbase=gambas3 -pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart' - 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' - 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3' - 'gambas3-gb-desktop' 'gambas3-gb-desktop-gnome' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' - 'gambas3-gb-form-stock' 'gambas3-gb-gsl' 'gambas3-gb-gtk' 'gambas3-gb-gtk-opengl' 'gambas3-gb-image' - 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-jit' 'gambas3-gb-libxml' 'gambas3-gb-media' 'gambas3-gb-mime' - 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' - 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' - 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' - 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-html' 'gambas3-gb-xml-rpc' - 'gambas3-gb-xml-xslt' 'gambas3-gb-web') -pkgver=3.3.3 -pkgrel=2 -pkgdesc="A free development environment based on a Basic interpreter." -arch=('i686' 'x86_64') -url="http://gambas.sourceforge.net/" -license=('GPL2') -groups=('gambas3') -makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils' - 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2' - 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite' 'librsvg' - 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit' - 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring' - 'gsl' 'gstreamer0.10' 'gstreamer0.10-base' 'gtkglext' 'ncurses' 'llvm' - 'gmime' 'glu') -options=('!emptydirs') -source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2" - 'gambas3-script.install' 'gambas3-runtime.install') -md5sums=('18902ae2bbd0d66d165503aba7e89474' - 'b284be39d147ec799f1116a6abc068b4' - '6d9e080b66443e7246387b1716d24e31') - -build() { - cd ${srcdir}/${pkgbase}-${pkgver} - - ./reconf-all - ./configure --prefix=/usr -C - - make bindir=${pkgdir}/usr/bin -} - -package_gambas3-runtime() { - depends=('libffi' 'xdg-utils') - pkgdesc="Runtime environment" - conflicts=('gambas3-gb-gui') - replaces=('gambas3-gb-gui') - provides=("gambas3-gb-gui=${pkgver}") - install=gambas3-runtime.install - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make -j1 DESTDIR="${pkgdir}" install - - cd ../gbx - make -j1 DESTDIR="${pkgdir}" install - cd ../lib/debug - make -j1 DESTDIR="${pkgdir}" install - cd ../eval - make -j1 DESTDIR="${pkgdir}" install - cd ../draw - make -j1 DESTDIR="${pkgdir}" install - install -D -m644 ../gb.component \ - ${pkgdir}/usr/lib/gambas3 - - cd ${srcdir}/${pkgbase}-${pkgver}/main - ln -s gbx3 ${pkgdir}/usr/bin/gbr3 - gbc/gbi3 -r ${pkgdir}/usr gb - rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la} - - ## needed for postinst with xdg-utils - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 mime/* \ - ${pkgdir}/usr/share/gambas3/mime/ - install -d -m755 ${pkgdir}/usr/share/gambas3/icons - install -D -m644 mime/application-x-gambas3.png \ - ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui.opengl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-devel() { - depends=('gambas3-runtime') - pkgdesc="Development environment" - - cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc - make -j1 DESTDIR="${pkgdir}" install -} - -package_gambas3-ide() { - depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' - 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect' - 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit') - pkgdesc="Integrated Development Environment" - - cd ${srcdir}/${pkgbase}-${pkgver} - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - #!! with the ide !! - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \ - ${pkgdir}/usr/share/applications/gambas3.desktop - install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \ - ${pkgdir}/usr/share/pixmaps/gambas3.png - - rm -r ${pkgdir}/usr/bin/gb* - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3 -} - -package_gambas3-script() { - depends=('gambas3-devel') - pkgdesc="Scripter and server programs support" - install=gambas3-script.install - - cd ${srcdir}/${pkgbase}-${pkgver} - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## needed for postinst with xdg-utils - cd ${srcdir}/${pkgbase}-${pkgver}/app/mime - install -d -m755 ${pkgdir}/usr/share/gambas3/mime - install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/ - install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/ - ## - - rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}} - rm -r ${pkgdir}/usr/lib - rm -r ${pkgdir}/usr/share/gambas3/[c-i]* -} - -package_gambas3-examples() { - depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-complex' 'gambas3-gb-compress' 'gambas3-gb-complex' 'gambas3-gb-crypt' - 'gambas3-gb-data' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' - 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog' - 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' - 'gambas3-gb-image-io' 'gambas3-gb-media' 'gambas3-gb-mime' 'gambas3-gb-ncurses' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-pop3' - 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' - 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' - 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal' 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' - 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web') - pkgdesc="Applications examples" - - cd ${srcdir}/${pkgbase}-${pkgver} - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - rm -r ${pkgdir}/usr/{bin,lib} - rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl} -} - -package_gambas3-gb-cairo() { - depends=('gambas3-runtime' 'cairo') - pkgdesc="Cairo component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-chart() { - depends=('gambas3-gb-form') - pkgdesc="Chart component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]* - ## -} - -package_gambas3-gb-complex() { - depends=('gambas3-runtime') - pkgdesc="Complex numbers component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.{comp{r,o}*,[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compr*,[d-v]*} - ## -} - -package_gambas3-gb-compress() { - depends=('gambas3-runtime' 'bzip2' 'zlib') - pkgdesc="Compression support component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2 - make -j1 DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp{o,l}*,gb.[d-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{compl*,[d-v]*} - ## -} - -package_gambas3-gb-crypt() { - depends=('gambas3-runtime') - pkgdesc="MD5/DES crypting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-data() { - depends=('gambas3-runtime') - pkgdesc="Data containers component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.{c*,d{b,e,r}*,[e-v]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{c*,d{b,e}*,[e-v]*} - ## -} - -package_gambas3-gb-db() { - depends=('gambas3-runtime') - pkgdesc="Database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{a,e,r}*,gb.[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.d{a,e}*,gb.[e-z]*} - ## -} - -package_gambas3-gb-db-form() { - depends=('gambas3-gb-db' 'gambas3-gb-form') - pkgdesc="Database form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*} - ## -} - -package_gambas3-gb-db-mysql() { - depends=('gambas3-gb-db' 'libmysqlclient') - pkgdesc="MySQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-odbc() { - depends=('gambas3-gb-db' 'unixodbc') - pkgdesc="ODBC database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-postgresql() { - depends=('gambas3-gb-db' 'postgresql-libs') - pkgdesc="PostgreSQL database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite2() { - depends=('gambas3-gb-db' 'sqlite2' 'gcc-libs') - pkgdesc="Sqlite2 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-db-sqlite3() { - depends=('gambas3-gb-db' 'sqlite' 'gcc-libs') - pkgdesc="Sqlite3 database access component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop() { - depends=('gambas3-gb-image' 'libsm' 'libxtst') - pkgdesc="Desktop component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop - make -j1 DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome - make DESTDIR="${pkgdir}" uninstall - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-desktop-gnome() { - depends=('gambas3-gb-desktop' 'libgnome-keyring') - pkgdesc="Desktop component for Gnome" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop/src/gnome - make -j1 DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-dbus() { - depends=('gambas3-runtime' 'dbus-core') - pkgdesc="DBUS component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-eval-highlight() { - depends=('gambas3-runtime') - pkgdesc="Expression evaluator highlight component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-d]*,[f-z]*} - rm -r ${pkgdir}/usr/share/gambas3/control - ## -} - -package_gambas3-gb-form() { - depends=('gambas3-runtime') - pkgdesc="Form component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}} - ## -} - -package_gambas3-gb-form-dialog() { - depends=('gambas3-gb-form') - pkgdesc="Form dialog component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}} - ## -} - -package_gambas3-gb-form-mdi() { - depends=('gambas3-gb-form') - pkgdesc="Form MDI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report} - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}} - ## -} - -package_gambas3-gb-form-stock() { - depends=('gambas3-runtime') - pkgdesc="Default stock icons component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - # rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*} - # rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*} - rm -r ${pkgdir}/usr/lib/gambas3/gb.[m-w]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[m-w]* - ## -} - -package_gambas3-gb-gtk() { - depends=('gambas3-gb-image' 'gtk2' 'librsvg') - pkgdesc="GTK+ toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gtk-opengl() { - depends=('gambas3-gb-gtk' 'gambas3-gb-opengl' 'gtkglext' 'glu') - pkgdesc="GTK+ toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/opengl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-gsl() { - depends=('gambas3-runtime' 'gsl') - pkgdesc="The GNU Scientific Library component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.gsl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image() { - depends=('gambas3-runtime') - pkgdesc="Image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*} - ## -} - -package_gambas3-gb-image-effect() { - depends=('gambas3-gb-image' 'gcc-libs') - pkgdesc="Image effect component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*} - ## -} - -package_gambas3-gb-image-imlib() { - depends=('gambas3-gb-image' 'imlib2') - pkgdesc="Imlib component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-image-io() { - depends=('gambas3-gb-image' 'gdk-pixbuf2') - pkgdesc="Input/Output image component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-jit() { - depends=('gambas3-runtime' 'llvm') - pkgdesc="Just-in-time compiler component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.jit - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-libxml() { - depends=('gambas3-runtime' 'libxml2') - pkgdesc="libxml2 component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.libxml - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-media() { - depends=('gambas3-runtime' 'gstreamer0.10' 'gstreamer0.10-base') - pkgdesc="Simplified interface to the GStreamer library component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.media - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-mime() { - depends=('gambas3-runtime' 'gmime') - pkgdesc="MIME message component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-ncurses() { - depends=('gambas3-runtime' 'ncurses') - pkgdesc="Ncurses component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.ncurses - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net() { - depends=('gambas3-runtime') - pkgdesc="Network component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-curl() { - depends=('gambas3-gb-net' 'curl') - pkgdesc="Curl component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-net-pop3() { - depends=('gambas3-gb-net' 'gambas3-gb-mime') - pkgdesc="POP3 component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.mime - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[f-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[f-m]*,[s-w]*} - ## -} - -package_gambas3-gb-net-smtp() { - depends=('gambas3-runtime' 'glib2') - pkgdesc="SMTP component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl() { - depends=('gambas3-runtime' 'glew') - pkgdesc="OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glu() { - depends=('gambas3-gb-opengl') - pkgdesc="GL Utility component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-opengl-glsl() { - depends=('gambas3-gb-opengl') - pkgdesc="GLSL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-option() { - depends=('gambas3-runtime') - pkgdesc="Getopt component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*} - ## -} - -package_gambas3-gb-pcre() { - depends=('gambas3-runtime' 'pcre') - pkgdesc="PCRE component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-pdf() { - depends=('gambas3-runtime' 'poppler') - pkgdesc="PDF component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4() { - depends=('gambas3-gb-image' 'qt') - pkgdesc="Qt4 toolkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-ext() { - depends=('gambas3-gb-qt4') - pkgdesc="Qt4 toolkit extended component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-opengl() { - depends=('gambas3-gb-qt4' 'gambas3-gb-opengl') - pkgdesc="Qt4 toolkit OpenGL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-qt4-webkit() { - depends=('gambas3-gb-qt4' 'qtwebkit') - pkgdesc="Qt4 toolkit webkit component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-report() { - depends=('gambas3-gb-form' 'gambas3-gb-image-io') - pkgdesc="Report component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4 - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]* - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*} - ## -} - -package_gambas3-gb-sdl() { - depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew') - pkgdesc="SDL component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-sdl-sound() { - depends=('gambas3-runtime' 'sdl_mixer') - pkgdesc="SDL sound component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-settings() { - depends=('gambas3-runtime') - pkgdesc="Setting component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*} - rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*} - ## -} - -package_gambas3-gb-signal() { - depends=('gambas3-runtime') - pkgdesc="POSIX Signals component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## cleanup the workaround - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*} - rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*} - ## -} - -package_gambas3-gb-v4l() { - depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng') - pkgdesc="Video4linux component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-vb() { - depends=('gambas3-runtime') - pkgdesc="Visual Basic transitional component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - ## Workaround for splitting - rm -r ${pkgdir}/usr/bin - rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]* - ## -} - -package_gambas3-gb-xml() { - depends=('gambas3-runtime' 'gcc-libs') - pkgdesc="XML component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-html() { - depends=('gambas3-gb-xml') - pkgdesc="HTML generator component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/html - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-xml-rpc() { - depends=('gambas3-gb-xml' 'gambas3-gb-net-curl') - pkgdesc="XML-RPC component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm ${pkgdir}/usr/lib/gambas3/gb.xml.[c-l]* - rm ${pkgdir}/usr/lib/gambas3/gb.xml.[s-x]* - rm ${pkgdir}/usr/share/gambas3/info/gb.xml.[h-l]* - rm ${pkgdir}/usr/share/gambas3/info/gb.xml.xslt.* - ## -} - -package_gambas3-gb-xml-xslt() { - depends=('gambas3-gb-xml' 'libxslt') - pkgdesc="XML-XSLT component" - - ## workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - - ## cleanup the workaround - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - ## -} - -package_gambas3-gb-web() { - depends=('gambas3-runtime') - pkgdesc="CGI component" - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make -j1 XDG_UTILS='' DESTDIR="${pkgdir}" install - ## - - cd ${srcdir}/${pkgbase}-${pkgver}/comp - make -j1 DESTDIR="${pkgdir}" install - - ## Workaround for splitting - cd ${srcdir}/${pkgbase}-${pkgver}/main - make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall - rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]* - rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]* - ## -} diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install deleted file mode 100644 index cfb5812fe..000000000 --- a/community-testing/gambas3/gambas3-runtime.install +++ /dev/null @@ -1,10 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambas3.png application-x-gambas3 - xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3 - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml -} diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install deleted file mode 100644 index 77c1aa52f..000000000 --- a/community-testing/gambas3/gambas3-script.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript - xdg-icon-resource install --context mimetypes --size 64 \ - /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage - xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} - -pre_remove() { - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript - xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml - xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml -} diff --git a/community-testing/gambas3/poppler-0-20.patch b/community-testing/gambas3/poppler-0-20.patch deleted file mode 100644 index 3b0e4612a..000000000 --- a/community-testing/gambas3/poppler-0-20.patch +++ /dev/null @@ -1,106 +0,0 @@ -diff -ur gb.pdf/configure.ac gb.pdf.fixed/configure.ac ---- gb.pdf/configure.ac 2012-05-14 08:55:02.448921378 +0200 -+++ gb.pdf.fixed/configure.ac 2012-05-14 08:52:19.098596499 +0200 -@@ -24,6 +24,8 @@ - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3) - pkg-config --atleast-version=0.17.0 poppler - AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17) -+ pkg-config --atleast-version=0.20.0 poppler -+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_20, $((1-$?)), Poppler version >= 0.20) - fi - - AC_OUTPUT( \ -diff -ur gb.pdf/src/CPdfDocument.cpp gb.pdf.fixed/src/CPdfDocument.cpp ---- gb.pdf/src/CPdfDocument.cpp 2012-05-14 08:55:02.388922483 +0200 -+++ gb.pdf.fixed/src/CPdfDocument.cpp 2012-05-15 09:25:45.168457227 +0200 -@@ -449,9 +449,13 @@ - - white[0] = 0xFF; white[1] = 0xFF; white[2] = 0xFF; - THIS->dev=new SplashOutputDev(splashModeRGB8, 3, gFalse, white); -- -- THIS->dev->startDoc(THIS->doc->getXRef ()); - -+ #if POPPLER_VERSION_0_20 -+ THIS->dev->startDoc(THIS->doc); -+ #else -+ THIS->dev->startDoc(THIS->doc->getXRef ()); -+ #endif -+ - outline=THIS->doc->getOutline(); - if (outline) THIS->index=outline->getItems(); - -@@ -875,6 +879,14 @@ - - if ( (w<0) || (h<0) ) return NULL; - -+ #if POPPLER_VERSION_0_20 -+ THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, -+ rotation, -+ gFalse, -+ gTrue, -+ x,y,w,h, -+ gFalse); -+ #else - THIS->page->displaySlice(THIS->dev,72.0*scale,72.0*scale, - rotation, - gFalse, -@@ -882,7 +894,8 @@ - x,y,w,h, - gFalse, - THIS->doc->getCatalog ()); -- -+ #endif -+ - map=THIS->dev->getBitmap(); - - data=(uint32_t*)map->getDataPtr(); -@@ -940,9 +953,14 @@ - w = VARGOPT(W, (int32_t)THIS->page->getMediaWidth()); - h = VARGOPT(H, (int32_t)THIS->page->getMediaHeight()); - -+ #if POPPLER_VERSION_0_20 -+ dev = new TextOutputDev (NULL, gTrue, 0, gFalse, gFalse); -+ gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse, NULL, NULL); -+ #else - dev = new TextOutputDev (NULL, gTrue, gFalse, gFalse); - gfx = THIS->page->createGfx(dev,72.0,72.0,0,gFalse,gTrue,-1, -1, -1, -1, gFalse,THIS->doc->getCatalog (),NULL, NULL, NULL, NULL); -- -+ #endif -+ - THIS->page->display(gfx); - dev->endPage(); - -@@ -970,7 +988,9 @@ - - void aux_fill_links(void *_object) - { -- #if POPPLER_VERSION_0_17 -+ #if POPPLER_VERSION_0_20 -+ THIS->links = new Links (THIS->page->getAnnots ()); -+ #elif POPPLER_VERSION_0_17 - THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog())); - #else - Object obj; -@@ -1152,13 +1172,22 @@ - - if (!MISSING(Sensitive)) sensitive=VARG(Sensitive); - -+ #if POPPLER_VERSION_0_20 -+ textdev = new TextOutputDev (NULL, true, 0, false, false); -+ THIS->page->display (textdev, 72, 72, 0, false, false, false); -+ #else - textdev = new TextOutputDev (NULL, true, false, false); - THIS->page->display (textdev, 72, 72, 0, false, false, false, THIS->doc->getCatalog()); -+ #endif - - if (THIS->Found) { GB.FreeArray(POINTER(&THIS->Found)); THIS->Found=NULL; } - - count = 0; -+ #if POPPLER_VERSION_0_20 -+ while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,gFalse,&x0,&y0,&x1,&y1)) -+ #else - while (textdev->findText (block,nlen,gFalse,gTrue,gTrue,gFalse,sensitive,gFalse,&x0,&y0,&x1,&y1)) -+ #endif - { - if (!THIS->Found) - GB.NewArray(POINTER(&THIS->Found),sizeof(CPDFFIND),1); diff --git a/community-testing/gcompris/PKGBUILD b/community-testing/gcompris/PKGBUILD deleted file mode 100644 index ef43565a4..000000000 --- a/community-testing/gcompris/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 78045 2012-10-16 11:50:27Z allan $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Daniel Isenmann <daniel.isenmann [at] gmx.de> - -pkgname=gcompris -pkgver=12.05 -pkgrel=2 -pkgdesc="Educational software suite comprising of numerous activities for children aged 2 to 10" -arch=('i686' 'x86_64') -url="http://gcompris.net/" -license=('GPL3') -depends=('pygtk' 'pyxml' 'librsvg' 'gnet' 'python2-pysqlite' - 'gstreamer0.10-base-plugins') -optdepends=('gnucap: for computer simulation within the electricity activity' - 'tuxpaint: for the painting activity' - 'gnuchess: for the chess activity') -makedepends=('texinfo' 'texi2html' 'intltool' 'gettext' 'gnuchess') -options=('!libtool') -source=(http://downloads.sourceforge.net/project/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2) -sha256sums=('a4e9b9d04fd405c4b9ddc30f84a5f521f7ad1966c5f66c3e873bb84269ef55d0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - depends+=('gcompris-data') - - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install-exec -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gedit-plugins/PKGBUILD b/community-testing/gedit-plugins/PKGBUILD deleted file mode 100644 index 44dc262a0..000000000 --- a/community-testing/gedit-plugins/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 78582 2012-10-21 11:43:49Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Hugo Doria <hugo@archlinux.org> -# Contributor: Sergej Chodarev <sergejx@centrum.sk> -# Contributor: zhuqin <zhuqin83@gmail.com> - -pkgname=gedit-plugins -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Plugins for gedit" -arch=('x86_64' 'i686') -license=('GPL') -url="http://live.gnome.org/GeditPlugins" -depends=('gedit' 'dbus-python') -optdepends=('gucharmap: for charmap plugin' - 'vte3: for embedded terminal') -makedepends=('intltool' 'gnome-doc-utils' 'vte3') -options=('!libtool' '!emptydirs') -install=gedit-plugins.install -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz") -sha256sums=('c5e92830e6029110bf1117bd9f31b23a9ad907210b8cb37039772f5bfcf6d174') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --with-plugins=all \ - --disable-schemas-compile - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR=$pkgdir install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gedit-plugins/gedit-plugins.install b/community-testing/gedit-plugins/gedit-plugins.install deleted file mode 100644 index d5bcc00ae..000000000 --- a/community-testing/gedit-plugins/gedit-plugins.install +++ /dev/null @@ -1,23 +0,0 @@ -pkgname=gedit-plugins - -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} - - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/gigi/PKGBUILD b/community-testing/gigi/PKGBUILD deleted file mode 100644 index 860c05544..000000000 --- a/community-testing/gigi/PKGBUILD +++ /dev/null @@ -1,79 +0,0 @@ -# $Id: PKGBUILD 78047 2012-10-16 11:50:33Z allan $ -# 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=14 -_fixedrevision=5208 -pkgdesc="Small, efficient and feature rich GUI for C++ and OpenGL (freeorion fork)" -url="http://gigi.sourceforge.net/" -arch=('x86_64' 'i686') -license=('LGPL') -depends=('boost' 'libpng' 'libtiff' 'ogre' 'sdl' 'python') -makedepends=('subversion' 'cmake' 'setconf' 'doxygen' 'mesa') - -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/ \ - svn co https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/GG/ \ - --config-dir ./ -r "$_fixedrevision" gigi - fi - - rm -rf gigi-build - svn export gigi gigi-build - cd gigi-build - - 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 "Fixing python3 shebang..." - for f in `find "$pkgdir/usr" -name "*.py"`; do - sed -i "s:/env python:/python3: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-testing/girara/PKGBUILD b/community-testing/girara/PKGBUILD deleted file mode 100644 index f9973b8c1..000000000 --- a/community-testing/girara/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# $Id: PKGBUILD 75776 2012-08-31 00:57:20Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: mlq <mlq@pwmt.org> - -pkgbase=girara -pkgname=(girara-common girara-gtk2 girara-gtk3) -pkgver=0.1.4 -pkgrel=1 -pkgdesc="user interface library" -arch=('i686' 'x86_64') -url="http://pwmt.org/projects/girara" -license=('custom') -makedepends=('gtk3' 'gtk2') -source=(http://pwmt.org/projects/girara/download/girara-$pkgver.tar.gz) -md5sums=('f348fbe96ceda4a89142cec92de08d25') - -build() { - true -} - -package_girara-common() { - depends=() - pkgdesc="user interface library - common files" - - cd "$srcdir/girara-$pkgver" - - make clean - - # install header - make DESTDIR="$pkgdir/" install-headers - - # install language files - make DESTDIR="$pkgdir/" -C po install - - # remove pkgconfig files - rm -r $pkgdir/usr/lib/pkgconfig - - # install license - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_girara-gtk2() { - depends=('gtk2' 'girara-common') - provides=('girara') - - cd "$srcdir/girara-$pkgver" - - make clean - make GIRARA_GTK_VERSION=2 - - # install files - make GIRARA_GTK_VERSION=2 DESTDIR="$pkgdir/" install - - # remove common files - rm -r "$pkgdir/usr/include" - rm -r "$pkgdir/usr/share" - - # install license - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_girara-gtk3() { - depends=('gtk3' 'girara-common') - provides=('girara') - - cd "$srcdir/girara-$pkgver" - - make clean - make GIRARA_GTK_VERSION=3 - - # install files - make GIRARA_GTK_VERSION=3 DESTDIR="$pkgdir/" install - - # remove common files - rm -r "$pkgdir/usr/include" - rm -r "$pkgdir/usr/share" - - # install license - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-testing/gl-117/PKGBUILD b/community-testing/gl-117/PKGBUILD deleted file mode 100644 index 99d6e8a9c..000000000 --- a/community-testing/gl-117/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 77291 2012-10-08 15:04:07Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: andrewski - -pkgname=gl-117 -pkgver=1.3.2 -pkgrel=6 -pkgdesc="An action flight simulator" -arch=('i686' 'x86_64') -url="http://www.heptargon.de/gl-117/gl-117.html" -license=("GPL") -depends=('freeglut' 'sdl_mixer' 'libxmu' 'libxi' 'glu') -source=(http://downloads.sourceforge.net/project/gl-117/gl-117/GL-117%20Source/gl-117-$pkgver-src.tar.bz2 - gl-117.desktop - gl-117.png) -md5sums=('aad53c5531943529fd769fae4efeae02' - 'db985c5188f1706677b12dc80b797779' - '6975de5572084b78d3ec1a748de85164') - -build() { - cd $srcdir/gl-117-$pkgver-src - # This will link everything to these three libraries, - # but it wouldn't work otherwise. The devs have been contacted. - LDFLAGS="-lX11 -lXi -lXmu" ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - install -D -m0644 $srcdir/gl-117.desktop $pkgdir/usr/share/applications/gl-117.desktop - install -D -m0644 $srcdir/gl-117.png $pkgdir/usr/share/pixmaps/gl-117.png -} diff --git a/community-testing/gl-117/gl-117.desktop b/community-testing/gl-117/gl-117.desktop deleted file mode 100644 index 59748fb86..000000000 --- a/community-testing/gl-117/gl-117.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Application -Name=GL-117 -Exec=gl-117 -Icon=gl-117 diff --git a/community-testing/gl-117/gl-117.png b/community-testing/gl-117/gl-117.png Binary files differdeleted file mode 100644 index 8bbdba58b..000000000 --- a/community-testing/gl-117/gl-117.png +++ /dev/null diff --git a/community-testing/glabels/PKGBUILD b/community-testing/glabels/PKGBUILD deleted file mode 100644 index 375e33922..000000000 --- a/community-testing/glabels/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 78511 2012-10-20 03:03:20Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: yugrotavele <yugrotavele at archlinux dot us> -# Contributor: Damir Perisa <damir@archlinux.org> - -pkgname=glabels -pkgver=3.0.1 -pkgrel=2 -pkgdesc="Creating labels and business cards the very easy way" -arch=('i686' 'x86_64') -url="http://glabels.org/" -license=('GPL' 'LGPL') -depends=('librsvg' 'evolution-data-server>=3.6.0' 'qrencode' 'iec16022' 'dconf' 'desktop-file-utils' 'xdg-utils') -makedepends=('barcode' 'intltool' 'gnome-doc-utils') -options=('!libtool') -install=$pkgname.install -source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz - glabels-3.0.0-new-eds.patch) -sha256sums=('99810705b9fcb234f085ed4ac6dbea50cc5b232c6d8ca05ab2c0634673fb9bd2' - 'f02ecf12e10b1d406607bad65f81e53ebd5d56fabe46035a47bd6fe1ec8bf70b') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i "$srcdir/glabels-3.0.0-new-eds.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/glabels/glabels-3.0.0-new-eds.patch b/community-testing/glabels/glabels-3.0.0-new-eds.patch deleted file mode 100644 index 9cae4c076..000000000 --- a/community-testing/glabels/glabels-3.0.0-new-eds.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -up glabels-3.0.0/src/merge-evolution.c.new-eds glabels-3.0.0/src/merge-evolution.c ---- glabels-3.0.0/src/merge-evolution.c.new-eds 2011-04-04 01:02:48.000000000 +0200 -+++ glabels-3.0.0/src/merge-evolution.c 2012-08-29 11:54:20.240577838 +0200 -@@ -29,7 +29,7 @@ - - #include "merge-evolution.h" - --#include <libebook/e-book.h> -+#include <libebook/libebook.h> - #include <glib/gi18n.h> - #include <stdio.h> - #include <string.h> -@@ -297,6 +297,31 @@ static gint sort_contact_by_file_as(gcon - /*--------------------------------------------------------------------------*/ - /* Open merge source. */ - /*--------------------------------------------------------------------------*/ -+static EBook * -+gl_open_system_addressbook (GError **error) -+{ -+ ESourceRegistry *registry; -+ EBook *book = NULL; -+ ESource *source; -+ -+ registry = e_source_registry_new_sync (NULL, error); -+ if (!registry) -+ return NULL; -+ -+ source = e_source_registry_ref_builtin_address_book (registry); -+ if (!source) { -+ g_object_unref (registry); -+ return NULL; -+ } -+ -+ book = e_book_new (source, error); -+ -+ g_object_unref (source); -+ g_object_unref (registry); -+ -+ return book; -+} -+ - static void - gl_merge_evolution_open (glMerge *merge) - { -@@ -317,12 +342,12 @@ gl_merge_evolution_open (glMerge *merge) - return; - } - -- merge_evolution->priv->book = e_book_new_system_addressbook(&error); -+ merge_evolution->priv->book = gl_open_system_addressbook(&error); - if (!merge_evolution->priv->book) { - g_warning ("Couldn't open addressbook."); - if (error) - { -- g_warning ("e_book_new_system_addressbook: %s", error->message); -+ g_warning ("gl_open_system_addressbook: %s", error->message); - g_error_free (error); - } - e_book_query_unref(query); -diff -up glabels-3.0.0/src/merge-vcard.c.new-eds glabels-3.0.0/src/merge-vcard.c ---- glabels-3.0.0/src/merge-vcard.c.new-eds 2011-04-04 01:02:48.000000000 +0200 -+++ glabels-3.0.0/src/merge-vcard.c 2012-08-29 11:54:20.241577849 +0200 -@@ -27,7 +27,7 @@ - - #include "merge-vcard.h" - --#include <libebook/e-contact.h> -+#include <libebook/libebook.h> - #include <stdio.h> - #include <string.h> - #include <errno.h> diff --git a/community-testing/glabels/glabels.install b/community-testing/glabels/glabels.install deleted file mode 100644 index 42bb5884d..000000000 --- a/community-testing/glabels/glabels.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/community-testing/glob2/PKGBUILD b/community-testing/glob2/PKGBUILD deleted file mode 100644 index 5df095eb0..000000000 --- a/community-testing/glob2/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 77582 2012-10-13 01:45:16Z ebelanger $ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> - -pkgname=glob2 -pkgver=0.9.4.4 -pkgrel=13 -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' 'glu' - 'fribidi' 'desktop-file-utils' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('scons' 'boost' 'mesa') -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-testing/glob2/glob2-0.9.4.1-gcc44.patch b/community-testing/glob2/glob2-0.9.4.1-gcc44.patch deleted file mode 100644 index b425b25ec..000000000 --- a/community-testing/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-testing/glob2/glob2.install b/community-testing/glob2/glob2.install deleted file mode 100644 index 20264b3a8..000000000 --- a/community-testing/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-testing/glom/PKGBUILD b/community-testing/glom/PKGBUILD deleted file mode 100644 index 46b188c3e..000000000 --- a/community-testing/glom/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 73756 2012-07-15 13:18:39Z ibiru $ -# 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-testing/glom/glom.install b/community-testing/glom/glom.install deleted file mode 100644 index 2b88145e3..000000000 --- a/community-testing/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-testing/gnash/PKGBUILD b/community-testing/gnash/PKGBUILD deleted file mode 100644 index 86bc19f73..000000000 --- a/community-testing/gnash/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 77223 2012-10-07 17:51:25Z heftig $ -# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> - -pkgbase=gnash -pkgname=(gnash-common gnash-gtk) -pkgver=0.8.10 -pkgrel=5 -arch=(i686 x86_64) -url="http://www.gnu.org/software/gnash/" -license=(GPL3) -makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa glu - 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 gnash-0.8.10-boost-1.50.patch) -sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224' - '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551' - 'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c') - -build() { - cd gnash-$pkgver - - # Disable very, very verbose debugging (gigabytes of logs) - patch -Np1 -i ../nodebug.patch - - # Link to libboost_system.so - patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch - - ./autogen.sh - ./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 libgl glu - speex fontconfig cairo - gstreamer0.10-base - boost-libs) - backup=(etc/gnashrc etc/gnashthumbnailrc) - - cd 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 gtk/* "$pkgdir" - - cd 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-0.8.10-boost-1.50.patch b/community-testing/gnash/gnash-0.8.10-boost-1.50.patch deleted file mode 100644 index a422ce932..000000000 --- a/community-testing/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-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/gnome-packagekit/PKGBUILD b/community-testing/gnome-packagekit/PKGBUILD deleted file mode 100644 index e0a5edfd4..000000000 --- a/community-testing/gnome-packagekit/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 78514 2012-10-20 07:24:57Z jconder $ -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> - -pkgname=gnome-packagekit -pkgver=3.6.0 -pkgrel=1 -pkgdesc='Collection of graphical tools for PackageKit to be used in the GNOME desktop' -arch=('i686' 'x86_64') -url='http://www.packagekit.org/' -license=('GPL') -depends=('desktop-file-utils' 'gtk3' 'hicolor-icon-theme' 'libnotify' - 'packagekit') -makedepends=('gconf' 'gtk-doc' 'intltool' 'itstool' 'libcanberra' 'upower') -optdepends=('polkit-gnome: required for privileged actions' - 'gnome-settings-daemon-updates: update and message notifications') -options=('!emptydirs' '!libtool') -install="$pkgname.install" -source=("http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz") -sha256sums=('9f096ec72fb81a78c426d9747145405a8b99e1d8418978828796768c8532d676') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - _mime='application/x-xz-compressed-tar;application/x-servicepack;' - sed -i "s@MimeType=.*@MimeType=$_mime@" data/gpk-install-local-file.desktop.in - - sed -i 's@python@python2@' python/enum-convertor.py - sed -i 's@python enum-convertor.py@python2 enum-convertor.py@' python/packagekit/Makefile.{am,in} - - export PYTHON=/usr/bin/python2 - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --disable-gtk-doc \ - --disable-schemas-compile \ - --disable-scrollkeeper - make -s -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make -s DESTDIR="$pkgdir" install -} diff --git a/community-testing/gnome-packagekit/gnome-packagekit.install b/community-testing/gnome-packagekit/gnome-packagekit.install deleted file mode 100644 index 620670d57..000000000 --- a/community-testing/gnome-packagekit/gnome-packagekit.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - if (( $(vercmp $2 2.91.90) < 0 )); then - usr/sbin/gconfpkg --uninstall gnome-packagekit - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch b/community-testing/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch deleted file mode 100644 index 293a419df..000000000 --- a/community-testing/gnome-settings-daemon-updates/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch +++ /dev/null @@ -1,1473 +0,0 @@ -From 79ead5309fe21e77cfe58adc6a9340953c2d52f4 Mon Sep 17 00:00:00 2001 -From: Richard Hughes <richard@hughsie.com> -Date: Fri, 21 Sep 2012 11:56:53 +0100 -Subject: [PATCH] power and media-keys: Use logind for suspending and - rebooting the system - -Use the new logind features to suspend and resume but making sure we opt out -of logind handling the sleep and power keys, and also inhibiting for lid close -auto-suspend if there is an external monitor connected. - -Also use a delay inihibit for logind so that we can do actions on suspend like -blanking the screen using the screensaver and also poking the screensaver on -resume. - -https://bugzilla.gnome.org/show_bug.cgi?id=680689 ---- - plugins/common/Makefile.am | 4 +- - plugins/common/gsd-power-helper.c | 203 -------- - plugins/common/gsd-power-helper.h | 35 -- - plugins/media-keys/gsd-media-keys-manager.c | 156 +++++-- - plugins/power/gsd-power-manager.c | 699 +++++++++++++++++++--------- - 5 files changed, 595 insertions(+), 502 deletions(-) - delete mode 100644 plugins/common/gsd-power-helper.c - delete mode 100644 plugins/common/gsd-power-helper.h - -diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am -index 7e50db4..b0e907c 100644 ---- a/plugins/common/Makefile.am -+++ b/plugins/common/Makefile.am -@@ -6,9 +6,7 @@ libcommon_la_SOURCES = \ - gsd-keygrab.c \ - gsd-keygrab.h \ - gsd-input-helper.c \ -- gsd-input-helper.h \ -- gsd-power-helper.c \ -- gsd-power-helper.h -+ gsd-input-helper.h - - libcommon_la_CPPFLAGS = \ - $(AM_CPPFLAGS) -diff --git a/plugins/common/gsd-power-helper.c b/plugins/common/gsd-power-helper.c -deleted file mode 100644 -index 27d0eda..0000000 ---- a/plugins/common/gsd-power-helper.c -+++ /dev/null -@@ -1,203 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> -- * -- * 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. -- * -- */ -- --#include "config.h" -- --#include "gsd-power-helper.h" -- --#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" --#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" --#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -- --#define CONSOLEKIT_DBUS_NAME "org.freedesktop.ConsoleKit" --#define CONSOLEKIT_DBUS_PATH_MANAGER "/org/freedesktop/ConsoleKit/Manager" --#define CONSOLEKIT_DBUS_INTERFACE_MANAGER "org.freedesktop.ConsoleKit.Manager" -- --#ifdef HAVE_SYSTEMD --static void --systemd_stop (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "PowerOff", -- g_variant_new ("(b)", FALSE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_suspend (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Suspend", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --static void --systemd_hibernate (void) --{ -- GDBusConnection *bus; -- -- bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, NULL); -- g_dbus_connection_call (bus, -- SYSTEMD_DBUS_NAME, -- SYSTEMD_DBUS_PATH, -- SYSTEMD_DBUS_INTERFACE, -- "Hibernate", -- g_variant_new ("(b)", TRUE), -- NULL, 0, G_MAXINT, NULL, NULL, NULL); -- g_object_unref (bus); --} -- --#else /* HAVE_SYSTEMD */ -- --static void --consolekit_stop_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't stop using ConsoleKit: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --consolekit_stop (void) --{ -- GError *error = NULL; -- GDBusProxy *proxy; -- -- /* power down the machine in a safe way */ -- proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- CONSOLEKIT_DBUS_NAME, -- CONSOLEKIT_DBUS_PATH_MANAGER, -- CONSOLEKIT_DBUS_INTERFACE_MANAGER, -- NULL, &error); -- if (proxy == NULL) { -- g_warning ("cannot connect to ConsoleKit: %s", -- error->message); -- g_error_free (error); -- return; -- } -- g_dbus_proxy_call (proxy, -- "Stop", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- consolekit_stop_cb, NULL); -- g_object_unref (proxy); --} --static void --upower_sleep_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GVariant *result; -- GError *error = NULL; -- -- result = g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object), -- res, -- &error); -- if (result == NULL) { -- g_warning ("couldn't sleep using UPower: %s", -- error->message); -- g_error_free (error); -- } else { -- g_variant_unref (result); -- } --} -- --static void --upower_suspend (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Suspend", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} -- --static void --upower_hibernate (GDBusProxy *upower_proxy) --{ -- g_dbus_proxy_call (upower_proxy, -- "Hibernate", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, -- upower_sleep_cb, NULL); --} --#endif /* HAVE_SYSTEMD */ -- --void --gsd_power_suspend (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_suspend (); --#else -- upower_suspend (upower_proxy); --#endif --} -- --void --gsd_power_poweroff (void) --{ --#ifdef HAVE_SYSTEMD -- systemd_stop (); --#else -- consolekit_stop (); --#endif --} -- --void --gsd_power_hibernate (GDBusProxy *upower_proxy) --{ --#ifdef HAVE_SYSTEMD -- systemd_hibernate (); --#else -- upower_hibernate (upower_proxy); --#endif --} -diff --git a/plugins/common/gsd-power-helper.h b/plugins/common/gsd-power-helper.h -deleted file mode 100644 -index e3be14f..0000000 ---- a/plugins/common/gsd-power-helper.h -+++ /dev/null -@@ -1,35 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2012 Bastien Nocera <hadess@hadess.net> -- * -- * 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. -- */ -- --#ifndef __GSD_POWER_HELPER_H --#define __GSD_POWER_HELPER_H -- --#include <glib.h> -- --G_BEGIN_DECLS -- --#include <gio/gio.h> -- --void gsd_power_suspend (GDBusProxy *upower_proxy); --void gsd_power_hibernate (GDBusProxy *upower_proxy); --void gsd_power_poweroff (void); -- --G_END_DECLS -- --#endif /* __GSD_POWER_HELPER_H */ -diff --git a/plugins/media-keys/gsd-media-keys-manager.c b/plugins/media-keys/gsd-media-keys-manager.c -index 9c84d7f..a2f277e 100644 ---- a/plugins/media-keys/gsd-media-keys-manager.c -+++ b/plugins/media-keys/gsd-media-keys-manager.c -@@ -39,6 +39,7 @@ - #include <gdk/gdkx.h> - #include <gtk/gtk.h> - #include <gio/gdesktopappinfo.h> -+#include <gio/gunixfdlist.h> - - #ifdef HAVE_GUDEV - #include <gudev/gudev.h> -@@ -51,7 +52,6 @@ - #include "shortcuts-list.h" - #include "gsd-osd-window.h" - #include "gsd-input-helper.h" --#include "gsd-power-helper.h" - #include "gsd-enums.h" - - #include <canberra.h> -@@ -105,6 +105,10 @@ static const gchar introspection_xml[] = - #define KEY_CURRENT_INPUT_SOURCE "current" - #define KEY_INPUT_SOURCES "sources" - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - #define GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MEDIA_KEYS_MANAGER, GsdMediaKeysManagerPrivate)) - - typedef struct { -@@ -148,10 +152,13 @@ struct GsdMediaKeysManagerPrivate - - /* Power stuff */ - GSettings *power_settings; -- GDBusProxy *upower_proxy; - GDBusProxy *power_screen_proxy; - GDBusProxy *power_keyboard_proxy; - -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_keys_fd; -+ - /* Multihead stuff */ - GdkScreen *current_screen; - GSList *screens; -@@ -1618,6 +1625,38 @@ do_toggle_contrast_action (GsdMediaKeysManager *manager) - } - - static void -+power_action_suspend (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void -+power_action_hibernate (GsdMediaKeysManager *manager) -+{ -+#ifndef HAVE_SYSTEMD -+ g_warning ("no systemd support"); -+ return; -+#endif -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", TRUE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ manager->priv->bus_cancellable, -+ NULL, NULL); -+} -+ -+static void - do_config_power_action (GsdMediaKeysManager *manager, - const gchar *config_key) - { -@@ -1627,14 +1666,14 @@ do_config_power_action (GsdMediaKeysManager *manager, - config_key); - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ power_action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - case GSD_POWER_ACTION_SHUTDOWN: - gnome_session_shutdown (manager); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ power_action_hibernate (manager); - break; - case GSD_POWER_ACTION_BLANK: - case GSD_POWER_ACTION_NOTHING: -@@ -2248,6 +2287,7 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - } - #endif /* HAVE_GUDEV */ - -+ g_clear_object (&priv->logind_proxy); - if (priv->settings) { - g_object_unref (priv->settings); - priv->settings = NULL; -@@ -2268,11 +2308,6 @@ gsd_media_keys_manager_stop (GsdMediaKeysManager *manager) - priv->power_keyboard_proxy = NULL; - } - -- if (priv->upower_proxy) { -- g_object_unref (priv->upower_proxy); -- priv->upower_proxy = NULL; -- } -- - if (priv->cancellable != NULL) { - g_cancellable_cancel (priv->cancellable); - g_object_unref (priv->cancellable); -@@ -2363,9 +2398,85 @@ gsd_media_keys_manager_class_init (GsdMediaKeysManagerClass *klass) - } - - static void -+inhibit_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdMediaKeysManager *manager = GSD_MEDIA_KEYS_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit keypresses: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_keys_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_keys_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_keys_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void - gsd_media_keys_manager_init (GsdMediaKeysManager *manager) - { -+ GError *error; -+ GDBusConnection *bus; -+ -+ error = NULL; - manager->priv = GSD_MEDIA_KEYS_MANAGER_GET_PRIVATE (manager); -+ -+ bus = g_bus_get_sync (G_BUS_TYPE_SYSTEM, NULL, &error); -+ if (bus == NULL) { -+ g_warning ("Failed to connect to system bus: %s", -+ error->message); -+ g_error_free (error); -+ return; -+ } -+ -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_sync (bus, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ &error); -+ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("Failed to connect to systemd: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ g_object_unref (bus); -+ -+ g_debug ("Adding system inhibitors for power keys"); -+ manager->priv->inhibit_keys_fd = -1; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "handle-power-key:handle-suspend-key:handle-hibernate-key", -+ g_get_user_name (), -+ "GNOME handling keypresses", -+ "block"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_done, -+ manager); -+ - } - - static void -@@ -2382,6 +2493,8 @@ gsd_media_keys_manager_finalize (GObject *object) - - if (media_keys_manager->priv->start_idle_id != 0) - g_source_remove (media_keys_manager->priv->start_idle_id); -+ if (media_keys_manager->priv->inhibit_keys_fd != -1) -+ close (media_keys_manager->priv->inhibit_keys_fd); - - G_OBJECT_CLASS (gsd_media_keys_manager_parent_class)->finalize (object); - } -@@ -2401,21 +2514,6 @@ xrandr_ready_cb (GObject *source_object, - } - - static void --upower_ready_cb (GObject *source_object, -- GAsyncResult *res, -- GsdMediaKeysManager *manager) --{ -- GError *error = NULL; -- -- manager->priv->upower_proxy = g_dbus_proxy_new_finish (res, &error); -- if (manager->priv->upower_proxy == NULL) { -- g_warning ("Failed to get proxy for upower: %s", -- error->message); -- g_error_free (error); -- } --} -- --static void - power_screen_ready_cb (GObject *source_object, - GAsyncResult *res, - GsdMediaKeysManager *manager) -@@ -2517,16 +2615,6 @@ register_manager (GsdMediaKeysManager *manager) - manager->priv->bus_cancellable, - (GAsyncReadyCallback) on_bus_gotten, - manager); -- -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SYSTEM, -- G_DBUS_PROXY_FLAGS_NONE, -- NULL, -- "org.freedesktop.UPower", -- "/org/freedesktop/UPower", -- "org.freedesktop.UPower", -- NULL, -- (GAsyncReadyCallback) upower_ready_cb, -- manager); - } - - GsdMediaKeysManager * -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 070cf32..18fcedf 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -1,7 +1,7 @@ - /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- - * - * Copyright (C) 2007 William Jon McCann <mccann@jhu.edu> -- * Copyright (C) 2011 Richard Hughes <richard@hughsie.com> -+ * Copyright (C) 2011-2012 Richard Hughes <richard@hughsie.com> - * Copyright (C) 2011 Ritesh Khadgaray <khadgaray@gmail.com> - * - * This program is free software; you can redistribute it and/or modify -@@ -32,6 +32,7 @@ - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> - #include <canberra-gtk.h> -+#include <gio/gunixfdlist.h> - - #define GNOME_DESKTOP_USE_UNSTABLE_API - #include <libgnome-desktop/gnome-rr.h> -@@ -43,7 +44,6 @@ - #include "gnome-settings-session.h" - #include "gsd-enums.h" - #include "gsd-power-manager.h" --#include "gsd-power-helper.h" - - #define GNOME_SESSION_DBUS_NAME "org.gnome.SessionManager" - #define GNOME_SESSION_DBUS_PATH "/org/gnome/SessionManager" -@@ -78,6 +78,10 @@ - #define GSD_POWER_MANAGER_RECALL_DELAY 30 /* seconds */ - #define GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT 30 /* seconds */ - -+#define SYSTEMD_DBUS_NAME "org.freedesktop.login1" -+#define SYSTEMD_DBUS_PATH "/org/freedesktop/login1" -+#define SYSTEMD_DBUS_INTERFACE "org.freedesktop.login1.Manager" -+ - /* Keep this in sync with gnome-shell */ - #define SCREENSAVER_FADE_TIME 10 /* seconds */ - -@@ -193,14 +197,20 @@ struct GsdPowerManagerPrivate - ca_context *canberra_context; - ca_proplist *critical_alert_loop_props; - guint32 critical_alert_timeout_id; -- GDBusProxy *screensaver_proxy; - GDBusProxy *session_proxy; - GDBusProxy *session_presence_proxy; - GpmIdletime *idletime; - GsdPowerIdleMode current_idle_mode; -- guint lid_close_safety_timer_id; - GtkStatusIcon *status_icon; - guint xscreensaver_watchdog_timer_id; -+ -+ /* systemd stuff */ -+ GDBusProxy *logind_proxy; -+ gint inhibit_lid_switch_fd; -+ gboolean inhibit_lid_switch_taken; -+ gint inhibit_suspend_fd; -+ gboolean inhibit_suspend_taken; -+ guint inhibit_lid_switch_timer_id; - }; - - enum { -@@ -217,8 +227,8 @@ static GIcon *engine_get_icon (GsdPowerManager *manager); - static gchar *engine_get_summary (GsdPowerManager *manager); - static void do_power_action_type (GsdPowerManager *manager, GsdPowerActionType action_type); - static void do_lid_closed_action (GsdPowerManager *manager); --static void lock_screensaver (GsdPowerManager *manager); --static void kill_lid_close_safety_timer (GsdPowerManager *manager); -+static void uninhibit_lid_switch (GsdPowerManager *manager); -+static gboolean external_monitor_is_connected (GnomeRRScreen *screen); - - G_DEFINE_TYPE (GsdPowerManager, gsd_power_manager, G_TYPE_OBJECT) - -@@ -2048,6 +2058,57 @@ gnome_session_shutdown (void) - } - - static void -+action_poweroff (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "PowerOff", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Suspend", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void -+action_hibernate (GsdPowerManager *manager) -+{ -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return; -+ } -+ g_dbus_proxy_call (manager->priv->logind_proxy, -+ "Hibernate", -+ g_variant_new ("(b)", FALSE), -+ G_DBUS_CALL_FLAGS_NONE, -+ G_MAXINT, -+ NULL, -+ NULL, -+ NULL); -+} -+ -+static void - do_power_action_type (GsdPowerManager *manager, - GsdPowerActionType action_type) - { -@@ -2056,19 +2117,19 @@ do_power_action_type (GsdPowerManager *manager, - - switch (action_type) { - case GSD_POWER_ACTION_SUSPEND: -- gsd_power_suspend (manager->priv->upower_proxy); -+ action_suspend (manager); - break; - case GSD_POWER_ACTION_INTERACTIVE: - gnome_session_shutdown (); - break; - case GSD_POWER_ACTION_HIBERNATE: -- gsd_power_hibernate (manager->priv->upower_proxy); -+ action_hibernate (manager); - break; - case GSD_POWER_ACTION_SHUTDOWN: - /* this is only used on critically low battery where - * hibernate is not available and is marginally better - * than just powering down the computer mid-write */ -- gsd_power_poweroff (); -+ action_poweroff (manager); - break; - case GSD_POWER_ACTION_BLANK: - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -2140,85 +2201,20 @@ upower_kbd_toggle (GsdPowerManager *manager, - return ret; - } - --static void --do_lid_open_action (GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* play a sound, using sounds from the naming spec */ -- ca_context_play (manager->priv->canberra_context, 0, -- CA_PROP_EVENT_ID, "lid-open", -- /* TRANSLATORS: this is the sound description */ -- CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -- NULL); -- -- /* ensure we turn the panel back on after lid open */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after lid open: %s", -- error->message); -- g_clear_error (&error); -- } -- -- /* only toggle keyboard if present and already toggled off */ -- if (manager->priv->upower_kdb_proxy != NULL && -- manager->priv->kbd_brightness_old != -1) { -- ret = upower_kbd_toggle (manager, &error); -- if (!ret) { -- g_warning ("failed to turn the kbd backlight on: %s", -- error->message); -- g_error_free (error); -- } -- } -- -- kill_lid_close_safety_timer (manager); --} -- - static gboolean --is_on (GnomeRROutput *output) -+inhibit_lid_switch_timer_cb (GsdPowerManager *manager) - { -- GnomeRRCrtc *crtc; -- -- crtc = gnome_rr_output_get_crtc (output); -- if (!crtc) -- return FALSE; -- return gnome_rr_crtc_get_current_mode (crtc) != NULL; --} -- --static gboolean --non_laptop_outputs_are_all_off (GnomeRRScreen *screen) --{ -- GnomeRROutput **outputs; -- int i; -- -- outputs = gnome_rr_screen_list_outputs (screen); -- for (i = 0; outputs[i] != NULL; i++) { -- if (gnome_rr_output_is_laptop (outputs[i])) -- continue; -- -- if (is_on (outputs[i])) -- return FALSE; -+ if (!external_monitor_is_connected (manager->priv->x11_screen) || -+ g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ g_debug ("no external monitors for a while; uninhibiting lid close"); -+ uninhibit_lid_switch (manager); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ return G_SOURCE_REMOVE; - } - -- return TRUE; --} -- --/* Timeout callback used to check conditions when the laptop's lid is closed but -- * the machine is not suspended yet. We try to suspend again, so that the laptop -- * won't overheat if placed in a backpack. -- */ --static gboolean --lid_close_safety_timer_cb (GsdPowerManager *manager) --{ -- manager->priv->lid_close_safety_timer_id = 0; -- -- g_debug ("lid has been closed for a while; trying to suspend again"); -- do_lid_closed_action (manager); -- -- return FALSE; -+ g_debug ("external monitor still there; trying again later"); -+ return G_SOURCE_CONTINUE; - } - - /* Sets up a timer to be triggered some seconds after closing the laptop lid -@@ -2226,82 +2222,73 @@ lid_close_safety_timer_cb (GsdPowerManager *manager) - * again in the timeout handler to see if we can suspend then. - */ - static void --setup_lid_close_safety_timer (GsdPowerManager *manager) -+setup_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("lid close safety timer already set up"); - return; -+ } -+ -+ g_debug ("setting up lid close safety timer"); - -- manager->priv->lid_close_safety_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -- (GSourceFunc) lid_close_safety_timer_cb, -+ manager->priv->inhibit_lid_switch_timer_id = g_timeout_add_seconds (GSD_POWER_MANAGER_LID_CLOSE_SAFETY_TIMEOUT, -+ (GSourceFunc) inhibit_lid_switch_timer_cb, - manager); -- g_source_set_name_by_id (manager->priv->lid_close_safety_timer_id, "[GsdPowerManager] lid close safety timer"); -+ g_source_set_name_by_id (manager->priv->inhibit_lid_switch_timer_id, "[GsdPowerManager] lid close safety timer"); - } - - static void --kill_lid_close_safety_timer (GsdPowerManager *manager) -+restart_inhibit_lid_switch_timer (GsdPowerManager *manager) - { -- if (manager->priv->lid_close_safety_timer_id != 0) { -- g_source_remove (manager->priv->lid_close_safety_timer_id); -- manager->priv->lid_close_safety_timer_id = 0; -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_debug ("restarting lid close safety timer"); -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ setup_inhibit_lid_switch_timer (manager); - } - } - - static void --suspend_with_lid_closed (GsdPowerManager *manager) -+do_lid_open_action (GsdPowerManager *manager) - { - gboolean ret; - GError *error = NULL; -- GsdPowerActionType action_type; - -- /* maybe lock the screen if the lid is closed */ -- lock_screensaver (manager); -- -- /* we have different settings depending on AC state */ -- if (up_client_get_on_battery (manager->priv->up_client)) { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-battery-action"); -- } else { -- action_type = g_settings_get_enum (manager->priv->settings, -- "lid-close-ac-action"); -- } -- -- /* check we won't melt when the lid is closed */ -- if (action_type != GSD_POWER_ACTION_SUSPEND && -- action_type != GSD_POWER_ACTION_HIBERNATE) { -- if (up_client_get_lid_force_sleep (manager->priv->up_client)) { -- g_warning ("to prevent damage, now forcing suspend"); -- do_power_action_type (manager, GSD_POWER_ACTION_SUSPEND); -- return; -- } -- } -+ /* play a sound, using sounds from the naming spec */ -+ ca_context_play (manager->priv->canberra_context, 0, -+ CA_PROP_EVENT_ID, "lid-open", -+ /* TRANSLATORS: this is the sound description */ -+ CA_PROP_EVENT_DESCRIPTION, _("Lid has been opened"), -+ NULL); - -- /* ensure we turn the panel back on after resume */ -+ /* ensure we turn the panel back on after lid open */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_OFF, -+ GNOME_RR_DPMS_ON, - &error); - if (!ret) { -- g_warning ("failed to turn the panel off after lid close: %s", -+ g_warning ("failed to turn the panel on after lid open: %s", - error->message); -- g_error_free (error); -+ g_clear_error (&error); - } - -- /* only toggle keyboard if present and not already toggled */ -- if (manager->priv->upower_kdb_proxy && -- manager->priv->kbd_brightness_old == -1) { -+ /* only toggle keyboard if present and already toggled off */ -+ if (manager->priv->upower_kdb_proxy != NULL && -+ manager->priv->kbd_brightness_old != -1) { - ret = upower_kbd_toggle (manager, &error); - if (!ret) { -- g_warning ("failed to turn the kbd backlight off: %s", -+ g_warning ("failed to turn the kbd backlight on: %s", - error->message); - g_error_free (error); - } - } -- -- do_power_action_type (manager, action_type); - } - - static void - do_lid_closed_action (GsdPowerManager *manager) - { -+ gboolean ret; -+ GError *error = NULL; -+ - /* play a sound, using sounds from the naming spec */ - ca_context_play (manager->priv->canberra_context, 0, - CA_PROP_EVENT_ID, "lid-close", -@@ -2309,21 +2296,22 @@ do_lid_closed_action (GsdPowerManager *manager) - CA_PROP_EVENT_DESCRIPTION, _("Lid has been closed"), - NULL); - -+ /* turn the panel off if the lid is closed (mainly for Dells...) */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_OFF, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel off after lid close: %s", -+ error->message); -+ g_error_free (error); -+ } -+ - /* refresh RANDR so we get an accurate view of what monitors are plugged in when the lid is closed */ - gnome_rr_screen_refresh (manager->priv->x11_screen, NULL); /* NULL-GError */ - -- /* perform policy action */ -- if (g_settings_get_boolean (manager->priv->settings, "lid-close-suspend-with-external-monitor") -- || non_laptop_outputs_are_all_off (manager->priv->x11_screen)) { -- g_debug ("lid is closed; suspending or hibernating"); -- suspend_with_lid_closed (manager); -- } else { -- g_debug ("lid is closed; not suspending nor hibernating since some external monitor outputs are still active"); -- setup_lid_close_safety_timer (manager); -- } -+ restart_inhibit_lid_switch_timer (manager); - } - -- - static void - up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - { -@@ -2343,6 +2331,7 @@ up_client_changed_cb (UpClient *client, GsdPowerManager *manager) - if (manager->priv->lid_is_closed == tmp) - return; - manager->priv->lid_is_closed = tmp; -+ g_debug ("up changed: lid is now %s", tmp ? "closed" : "open"); - - /* fake a keypress */ - if (tmp) -@@ -3294,30 +3283,6 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass) - } - - static void --sleep_cb_screensaver_proxy_ready_cb (GObject *source_object, -- GAsyncResult *res, -- gpointer user_data) --{ -- GError *error = NULL; -- GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -- -- manager->priv->screensaver_proxy = g_dbus_proxy_new_for_bus_finish (res, &error); -- if (manager->priv->screensaver_proxy == NULL) { -- g_warning ("Could not connect to gnome-screensaver: %s", -- error->message); -- g_error_free (error); -- return; -- } -- -- /* Finish the upower_notify_sleep_cb() call by locking the screen */ -- g_debug ("gnome-screensaver activated, doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); --} -- --static void - idle_dbus_signal_cb (GDBusProxy *proxy, - const gchar *sender_name, - const gchar *signal_name, -@@ -3469,75 +3434,38 @@ out: - } - - static void --lock_screensaver (GsdPowerManager *manager) -+lock_screensaver (GsdPowerManager *manager, -+ GSourceFunc done_cb) - { - gboolean do_lock; - - do_lock = g_settings_get_boolean (manager->priv->settings_screensaver, - "lock-enabled"); -- if (!do_lock) -+ if (!do_lock && done_cb) { -+ done_cb (manager); - return; -- -- if (manager->priv->screensaver_proxy != NULL) { -- g_debug ("doing gnome-screensaver lock"); -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "Lock", -- NULL, G_DBUS_CALL_FLAGS_NONE, -1, -- NULL, NULL, NULL); -- } else { -- /* connect to the screensaver first */ -- g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION, -- G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES, -- NULL, -- GS_DBUS_NAME, -- GS_DBUS_PATH, -- GS_DBUS_INTERFACE, -- NULL, -- sleep_cb_screensaver_proxy_ready_cb, -- manager); - } --} -- --static void --upower_notify_sleep_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- lock_screensaver (manager); --} -- --static void --upower_notify_resume_cb (UpClient *client, -- UpSleepKind sleep_kind, -- GsdPowerManager *manager) --{ -- gboolean ret; -- GError *error = NULL; -- -- /* this displays the unlock dialogue so the user doesn't have -- * to move the mouse or press any key before the window comes up */ -- if (manager->priv->screensaver_proxy != NULL) { -- g_dbus_proxy_call (manager->priv->screensaver_proxy, -- "SimulateUserActivity", -- NULL, -- G_DBUS_CALL_FLAGS_NONE, -- -1, NULL, NULL, NULL); -- } -- -- /* close existing notifications on resume, the system power -- * state is probably different now */ -- notify_close_if_showing (manager->priv->notification_low); -- notify_close_if_showing (manager->priv->notification_discharging); - -- /* ensure we turn the panel back on after resume */ -- ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -- GNOME_RR_DPMS_ON, -- &error); -- if (!ret) { -- g_warning ("failed to turn the panel on after resume: %s", -- error->message); -- g_error_free (error); -- } -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "Lock", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* Wait until gnome-shell shield animation is done -+ * -+ * FIXME: the shell should mark the lock as active -+ * when the shield is down, then we could wait for -+ * that. This would also fix the problem that we wait -+ * needlessly when the shell has already locked the -+ * screen because it is initiating the suspend. -+ * -+ * https://bugzilla.gnome.org/show_bug.cgi?id=685053 -+ */ -+ g_timeout_add (500, done_cb, manager); - } - - static void -@@ -3696,6 +3624,287 @@ disable_builtin_screensaver (gpointer unused) - return TRUE; - } - -+static void -+inhibit_lid_switch_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit lid switch: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_lid_switch_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_lid_switch_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+static void -+inhibit_lid_switch (GsdPowerManager *manager) -+{ -+ GVariant *params; -+ -+ if (manager->priv->inhibit_lid_switch_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding lid switch system inhibitor"); -+ manager->priv->inhibit_lid_switch_taken = TRUE; -+ -+ params = g_variant_new ("(ssss)", -+ "handle-lid-switch", -+ g_get_user_name (), -+ "Multiple displays attached", -+ "block"); -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ params, -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_lid_switch_done, -+ manager); -+} -+ -+static void -+uninhibit_lid_switch (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_lid_switch_fd == -1) { -+ g_debug ("no lid-switch inhibitor"); -+ return; -+ } -+ g_debug ("Removing lid switch system inhibitor"); -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+} -+ -+static void -+inhibit_suspend_done (GObject *source, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ GDBusProxy *proxy = G_DBUS_PROXY (source); -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ GError *error = NULL; -+ GVariant *res; -+ GUnixFDList *fd_list = NULL; -+ gint idx; -+ -+ res = g_dbus_proxy_call_with_unix_fd_list_finish (proxy, &fd_list, result, &error); -+ if (res == NULL) { -+ g_warning ("Unable to inhibit suspend: %s", error->message); -+ g_error_free (error); -+ } else { -+ g_variant_get (res, "(h)", &idx); -+ manager->priv->inhibit_suspend_fd = g_unix_fd_list_get (fd_list, idx, &error); -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_warning ("Failed to receive system inhibitor fd: %s", error->message); -+ g_error_free (error); -+ } -+ g_debug ("System inhibitor fd is %d", manager->priv->inhibit_suspend_fd); -+ g_object_unref (fd_list); -+ g_variant_unref (res); -+ } -+} -+ -+/* We take a delay inhibitor here, which causes logind to send a -+ * PrepareToSleep signal, which gives us a chance to lock the screen -+ * and do some other preparations. -+ */ -+static void -+inhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_taken) { -+ g_debug ("already inhibited lid-switch"); -+ return; -+ } -+ g_debug ("Adding suspend delay inhibitor"); -+ manager->priv->inhibit_suspend_taken = TRUE; -+ g_dbus_proxy_call_with_unix_fd_list (manager->priv->logind_proxy, -+ "Inhibit", -+ g_variant_new ("(ssss)", -+ "sleep", -+ g_get_user_name (), -+ "GNOME needs to lock the screen", -+ "delay"), -+ 0, -+ G_MAXINT, -+ NULL, -+ NULL, -+ inhibit_suspend_done, -+ manager); -+} -+ -+static void -+uninhibit_suspend (GsdPowerManager *manager) -+{ -+ if (manager->priv->inhibit_suspend_fd == -1) { -+ g_debug ("no suspend delay inhibitor"); -+ return; -+ } -+ g_debug ("Removing suspend delay inhibitor"); -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = TRUE; -+} -+ -+static gboolean -+randr_output_is_on (GnomeRROutput *output) -+{ -+ GnomeRRCrtc *crtc; -+ -+ crtc = gnome_rr_output_get_crtc (output); -+ if (!crtc) -+ return FALSE; -+ return gnome_rr_crtc_get_current_mode (crtc) != NULL; -+} -+ -+static gboolean -+external_monitor_is_connected (GnomeRRScreen *screen) -+{ -+ GnomeRROutput **outputs; -+ guint i; -+ -+ if (g_file_test ("/tmp/external_connected", G_FILE_TEST_EXISTS)) -+ return TRUE; -+ -+ /* see if we have more than one screen plugged in */ -+ outputs = gnome_rr_screen_list_outputs (screen); -+ for (i = 0; outputs[i] != NULL; i++) { -+ if (randr_output_is_on (outputs[i]) && -+ !gnome_rr_output_is_laptop (outputs[i])) -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ -+static void -+on_randr_event (GnomeRRScreen *screen, gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ -+ /* when a second monitor is plugged in, we take the -+ * handle-lid-switch inhibitor lock of logind to prevent -+ * it from suspending. -+ * -+ * Uninhibiting is done in the inhibit_lid_switch_timer, -+ * since we want to give users a few seconds when unplugging -+ * and replugging an external monitor, not suspend right away. -+ */ -+ if (external_monitor_is_connected (screen) && -+ !g_settings_get_boolean (manager->priv->settings, -+ "lid-close-suspend-with-external-monitor")) { -+ inhibit_lid_switch (manager); -+ setup_inhibit_lid_switch_timer (manager); -+ } -+ else { -+ restart_inhibit_lid_switch_timer (manager); -+ } -+} -+ -+static gboolean -+screen_lock_done_cb (gpointer data) -+{ -+ GsdPowerManager *manager = data; -+ -+ /* lift the delay inhibit, so logind can proceed */ -+ uninhibit_suspend (manager); -+ -+ return FALSE; -+} -+ -+static void -+handle_suspend_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ lock_screensaver (manager, screen_lock_done_cb); -+} -+ -+static void -+handle_resume_actions (GsdPowerManager *manager) -+{ -+ gboolean ret; -+ GError *error = NULL; -+ -+ /* this displays the unlock dialogue so the user doesn't have -+ * to move the mouse or press any key before the window comes up */ -+ g_dbus_connection_call (manager->priv->connection, -+ GS_DBUS_NAME, -+ GS_DBUS_PATH, -+ GS_DBUS_INTERFACE, -+ "SimulateUserActivity", -+ NULL, NULL, -+ G_DBUS_CALL_FLAGS_NONE, -1, -+ NULL, NULL, NULL); -+ -+ /* close existing notifications on resume, the system power -+ * state is probably different now */ -+ notify_close_if_showing (manager->priv->notification_low); -+ notify_close_if_showing (manager->priv->notification_discharging); -+ -+ /* ensure we turn the panel back on after resume */ -+ ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -+ GNOME_RR_DPMS_ON, -+ &error); -+ if (!ret) { -+ g_warning ("failed to turn the panel on after resume: %s", -+ error->message); -+ g_error_free (error); -+ } -+ -+ /* set up the delay again */ -+ inhibit_suspend (manager); -+} -+ -+static void -+logind_proxy_signal_cb (GDBusProxy *proxy, -+ const gchar *sender_name, -+ const gchar *signal_name, -+ GVariant *parameters, -+ gpointer user_data) -+{ -+ GsdPowerManager *manager = GSD_POWER_MANAGER (user_data); -+ gboolean is_about_to_suspend; -+ -+ if (g_strcmp0 (signal_name, "PrepareForSleep") != 0) -+ return; -+ g_variant_get (parameters, "(b)", &is_about_to_suspend); -+ if (is_about_to_suspend) { -+ handle_suspend_actions (manager); -+ } else { -+ handle_resume_actions (manager); -+ } -+} -+ - gboolean - gsd_power_manager_start (GsdPowerManager *manager, - GError **error) -@@ -3705,6 +3914,25 @@ gsd_power_manager_start (GsdPowerManager *manager, - g_debug ("Starting power manager"); - gnome_settings_profile_start (NULL); - -+ manager->priv->logind_proxy = -+ g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, -+ 0, -+ NULL, -+ SYSTEMD_DBUS_NAME, -+ SYSTEMD_DBUS_PATH, -+ SYSTEMD_DBUS_INTERFACE, -+ NULL, -+ error); -+ if (manager->priv->logind_proxy == NULL) { -+ g_warning ("no systemd support"); -+ return FALSE; -+ } -+ g_signal_connect (manager->priv->logind_proxy, "g-signal", -+ G_CALLBACK (logind_proxy_signal_cb), -+ manager); -+ /* Set up a delay inhibitor to be informed about suspend attempts */ -+ inhibit_suspend (manager); -+ - /* track the active session */ - manager->priv->session = gnome_settings_session_new (); - g_signal_connect (manager->priv->session, "notify::state", -@@ -3719,10 +3947,6 @@ gsd_power_manager_start (GsdPowerManager *manager, - G_CALLBACK (engine_settings_key_changed_cb), manager); - manager->priv->settings_screensaver = g_settings_new ("org.gnome.desktop.screensaver"); - manager->priv->up_client = up_client_new (); -- g_signal_connect (manager->priv->up_client, "notify-sleep", -- G_CALLBACK (upower_notify_sleep_cb), manager); -- g_signal_connect (manager->priv->up_client, "notify-resume", -- G_CALLBACK (upower_notify_resume_cb), manager); - manager->priv->lid_is_closed = up_client_get_lid_is_closed (manager->priv->up_client); - g_signal_connect (manager->priv->up_client, "device-added", - G_CALLBACK (engine_device_added_cb), manager); -@@ -3836,6 +4060,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - manager->priv->x11_screen = gnome_rr_screen_new (gdk_screen_get_default (), error); - if (manager->priv->x11_screen == NULL) - return FALSE; -+ g_signal_connect (manager->priv->x11_screen, "changed", G_CALLBACK (on_randr_event), manager); -+ /* set up initial state */ -+ on_randr_event (manager->priv->x11_screen, manager); - - /* ensure the default dpms timeouts are cleared */ - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, -@@ -3865,6 +4092,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) - { - g_debug ("Stopping power manager"); - -+ if (manager->priv->inhibit_lid_switch_timer_id != 0) { -+ g_source_remove (manager->priv->inhibit_lid_switch_timer_id); -+ manager->priv->inhibit_lid_switch_timer_id = 0; -+ } -+ - if (manager->priv->bus_cancellable != NULL) { - g_cancellable_cancel (manager->priv->bus_cancellable); - g_object_unref (manager->priv->bus_cancellable); -@@ -3876,8 +4108,6 @@ gsd_power_manager_stop (GsdPowerManager *manager) - manager->priv->introspection_data = NULL; - } - -- kill_lid_close_safety_timer (manager); -- - g_signal_handlers_disconnect_by_data (manager->priv->up_client, manager); - - g_clear_object (&manager->priv->connection); -@@ -3885,6 +4115,19 @@ gsd_power_manager_stop (GsdPowerManager *manager) - g_clear_object (&manager->priv->settings); - g_clear_object (&manager->priv->settings_screensaver); - g_clear_object (&manager->priv->up_client); -+ -+ if (manager->priv->inhibit_lid_switch_fd != -1) { -+ close (manager->priv->inhibit_lid_switch_fd); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_lid_switch_taken = FALSE; -+ } -+ if (manager->priv->inhibit_suspend_fd != -1) { -+ close (manager->priv->inhibit_suspend_fd); -+ manager->priv->inhibit_suspend_fd = -1; -+ manager->priv->inhibit_suspend_taken = FALSE; -+ } -+ -+ g_clear_object (&manager->priv->logind_proxy); - g_clear_object (&manager->priv->x11_screen); - - g_ptr_array_unref (manager->priv->devices_array); -@@ -3918,6 +4161,8 @@ static void - gsd_power_manager_init (GsdPowerManager *manager) - { - manager->priv = GSD_POWER_MANAGER_GET_PRIVATE (manager); -+ manager->priv->inhibit_lid_switch_fd = -1; -+ manager->priv->inhibit_suspend_fd = -1; - } - - static void --- -1.7.12.2 - diff --git a/community-testing/gnome-settings-daemon-updates/PKGBUILD b/community-testing/gnome-settings-daemon-updates/PKGBUILD deleted file mode 100644 index ad446e3f6..000000000 --- a/community-testing/gnome-settings-daemon-updates/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 78516 2012-10-20 07:29:43Z jconder $ -# Maintainer: Jonathan Conder <jonno.conder@gmail.com> - -_pkgname=gnome-settings-daemon -pkgname=$_pkgname-updates -pkgver=3.6.1 -pkgrel=1 -pkgdesc="Updates plugin for the GNOME Settings daemon" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gnome-packagekit' "$_pkgname") -makedepends=('intltool' 'gtk-doc' 'gnome-desktop' 'gnome-common' 'xf86-input-wacom') -options=('!emptydirs' '!libtool') -install=$_pkgname.install -url="http://www.gnome.org" -source=("http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz" - 'screensaver.patch' - '0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch' - 'arch.patch') -sha256sums=('1fe96e0709d7c618d90cc1bfcddc46eede3c2cdb305f5e7f4cb388d43dd5526a' - 'd2c32fa0262e4d0e97fc07fb631ad2627b4f2ae273e2cb3028236d9725711880' - 'f23db348593f58da755889928d7fa75817479d9ad5be67cc7a2f8cbc5db23632' - '32f18a02698bb24aa8ae293eb7bf74a8261e3ce2c5149d259a87bd14500089ea') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - - patch -Np1 -i "$srcdir/screensaver.patch" - patch -Np1 -i "$srcdir/0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch" - patch -Np1 -i "$srcdir/arch.patch" - - aclocal - automake - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnome-settings-daemon \ - --disable-static \ - --enable-systemd - - #https://bugzilla.gnome.org/show_bug.cgi?id=656231 - sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool - make -s -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make -C 'plugins/updates' DESTDIR="${pkgdir}" install - - _schema='org.gnome.settings-daemon.plugins.updates.gschema.xml' - install -D -m644 "data/$_schema" "$pkgdir/usr/share/glib-2.0/schemas/$_schema" -} diff --git a/community-testing/gnome-settings-daemon-updates/arch.patch b/community-testing/gnome-settings-daemon-updates/arch.patch deleted file mode 100644 index df70cd9f8..000000000 --- a/community-testing/gnome-settings-daemon-updates/arch.patch +++ /dev/null @@ -1,325 +0,0 @@ -diff --git a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in -index 9af2718..bb45e48 100644 ---- a/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in -+++ b/data/org.gnome.settings-daemon.plugins.updates.gschema.xml.in.in -@@ -16,7 +16,7 @@ - <_description>Use mobile broadband connections such as GSM and CDMA to check for updates.</_description> - </key> - <key name="auto-download-updates" type="b"> -- <default>true</default> -+ <default>false</default> - <_summary>Automatically download updates in the background without confirmation</_summary> - <_description>Automatically download updates in the background without confirmation. Updates will be auto-downloaded when using wired network connnections, and mobile broadband if 'connection-use-mobile' is enabled.</_description> - </key> -@@ -36,7 +36,7 @@ - <_description>The last time we notified the user about non-critical updates. Value is in seconds since the epoch, or zero for never.</_description> - </key> - <key name="frequency-get-upgrades" type="i"> -- <default>604800</default> -+ <default>0</default> - <_summary>How often to check for distribution upgrades</_summary> - <_description>How often to check for distribution upgrades. Value is in seconds.</_description> - </key> -diff --git a/plugins/updates/Makefile.am b/plugins/updates/Makefile.am -index 81c7179..6fd3534 100644 ---- a/plugins/updates/Makefile.am -+++ b/plugins/updates/Makefile.am -@@ -15,7 +15,9 @@ libupdates_la_SOURCES = \ - gsd-updates-firmware.h \ - gsd-updates-firmware.c \ - gsd-updates-manager.h \ -- gsd-updates-manager.c -+ gsd-updates-manager.c \ -+ gsd-updates-watch.h \ -+ gsd-updates-watch.c - - libupdates_la_CPPFLAGS = \ - -I$(top_srcdir)/gnome-settings-daemon \ -diff --git a/plugins/updates/gsd-updates-manager.c b/plugins/updates/gsd-updates-manager.c -index 95ee1c4..7b26c06 100644 ---- a/plugins/updates/gsd-updates-manager.c -+++ b/plugins/updates/gsd-updates-manager.c -@@ -33,6 +33,7 @@ - #include "gsd-updates-manager.h" - #include "gsd-updates-firmware.h" - #include "gsd-updates-refresh.h" -+#include "gsd-updates-watch.h" - #include "gsd-updates-common.h" - #include "gnome-settings-profile.h" - -@@ -47,6 +48,7 @@ struct GsdUpdatesManagerPrivate - GCancellable *cancellable; - GsdUpdatesRefresh *refresh; - GsdUpdatesFirmware *firmware; -+ GsdUpdatesWatch *watch; - GSettings *settings_proxy; - GSettings *settings_ftp; - GSettings *settings_gsd; -@@ -1360,6 +1362,9 @@ gsd_updates_manager_start (GsdUpdatesManager *manager, - g_signal_connect (manager->priv->refresh, "get-updates", - G_CALLBACK (due_get_updates_cb), manager); - -+ /* watch transaction progress */ -+ manager->priv->watch = gsd_updates_watch_new (); -+ - /* get proxy settings */ - manager->priv->settings_proxy = g_settings_new ("org.gnome.system.proxy"); - g_signal_connect (manager->priv->settings_proxy, "changed", -@@ -1455,6 +1460,7 @@ gsd_updates_manager_stop (GsdUpdatesManager *manager) - g_clear_object (&manager->priv->task); - g_clear_object (&manager->priv->refresh); - g_clear_object (&manager->priv->firmware); -+ g_clear_object (&manager->priv->watch); - g_clear_object (&manager->priv->proxy_session); - g_clear_object (&manager->priv->volume_monitor); - g_clear_object (&manager->priv->cancellable); -diff --git a/plugins/updates/gsd-updates-watch.c b/plugins/updates/gsd-updates-watch.c -new file mode 100644 -index 0000000..d3a0202 ---- /dev/null -+++ b/plugins/updates/gsd-updates-watch.c -@@ -0,0 +1,186 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com> -+ * -+ * Licensed under the GNU General Public License Version 2 -+ * -+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#include "config.h" -+ -+#include <unistd.h> -+#include <glib/gi18n.h> -+#include <packagekit-glib2/packagekit.h> -+#include <libnotify/notify.h> -+ -+#include "gsd-updates-watch.h" -+ -+#define GSD_UPDATES_WATCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchPrivate)) -+ -+struct GsdUpdatesWatchPrivate -+{ -+ PkTransactionList *tlist; -+ PkClient *client; -+}; -+ -+G_DEFINE_TYPE (GsdUpdatesWatch, gsd_updates_watch, G_TYPE_OBJECT) -+ -+static void -+on_notification_closed (NotifyNotification *notification, gpointer data) -+{ -+ g_object_unref (notification); -+} -+ -+static void -+gsd_updates_watch_message_cb (PkMessage *item, GsdUpdatesWatch *watch) -+{ -+ NotifyNotification *notification; -+ gchar *details = NULL; -+ const gchar *title, *message; -+ GError *error = NULL; -+ -+ g_return_if_fail (PK_IS_MESSAGE (item)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); -+ -+ g_object_get (item, "details", &details, NULL); -+ title = _("More information"); -+ message = details; -+ -+ /* use a better title if available */ -+ if (g_str_has_prefix (details, "<b>")) { -+ gchar *end = g_strstr_len (details, -1, "</b>\n"); -+ if (end != NULL && g_strstr_len (details, end - details, "\n") == NULL) { -+ title = details + 3; -+ *end = '\0'; -+ message = end + 5; -+ } -+ } -+ -+ /* display a notification */ -+ notification = notify_notification_new (title, message, NULL); -+ notify_notification_set_app_name (notification, _("Software Updates")); -+ notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER); -+ notify_notification_set_urgency (notification, NOTIFY_URGENCY_NORMAL); -+ -+ g_signal_connect (notification, "closed", G_CALLBACK (on_notification_closed), NULL); -+ if (!notify_notification_show (notification, &error)) { -+ g_warning ("error: %s", error->message); -+ g_error_free (error); -+ } -+ -+ g_free (details); -+} -+ -+static void -+gsd_updates_watch_adopt_cb (PkClient *client, GAsyncResult *res, GsdUpdatesWatch *watch) -+{ -+ PkResults *results; -+ PkProgress *progress = NULL; -+ guint uid; -+ GPtrArray *array; -+ GError *error = NULL; -+ -+ g_return_if_fail (PK_IS_CLIENT (client)); -+ g_return_if_fail (G_IS_ASYNC_RESULT (res)); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); -+ -+ results = pk_client_generic_finish (client, res, &error); -+ if (results == NULL) { -+ g_warning ("failed to adopt: %s", error->message); -+ g_error_free (error); -+ goto out; -+ } -+ -+ g_object_get (results, "progress", &progress, NULL); -+ g_object_get (progress, "uid", &uid, NULL); -+ -+ /* only display messages from the same user */ -+ if (uid != getuid ()) { -+ g_printerr ("ignoring messages\n"); -+ goto out; -+ } -+ -+ array = pk_results_get_message_array (results); -+ g_ptr_array_foreach (array, (GFunc) gsd_updates_watch_message_cb, watch); -+ g_ptr_array_unref (array); -+ -+out: -+ if (progress != NULL) { -+ g_object_unref (progress); -+ } -+ if (results != NULL) { -+ g_object_unref (results); -+ } -+} -+ -+static void -+gsd_updates_watch_tlist_added_cb (PkTransactionList *tlist, const gchar *tid, GsdUpdatesWatch *watch) -+{ -+ g_return_if_fail (PK_IS_TRANSACTION_LIST (tlist)); -+ g_return_if_fail (tid != NULL); -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); -+ -+ /* listen for messages */ -+ pk_client_adopt_async (watch->priv->client, tid, NULL, NULL, NULL, -+ (GAsyncReadyCallback) gsd_updates_watch_adopt_cb, watch); -+} -+ -+static void -+gsd_updates_watch_init (GsdUpdatesWatch *watch) -+{ -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (watch)); -+ -+ watch->priv = GSD_UPDATES_WATCH_GET_PRIVATE (watch); -+ watch->priv->tlist = pk_transaction_list_new (); -+ watch->priv->client = pk_client_new (); -+ -+ g_signal_connect (watch->priv->tlist, "added", -+ G_CALLBACK (gsd_updates_watch_tlist_added_cb), watch); -+} -+ -+static void -+gsd_updates_watch_finalize (GObject *object) -+{ -+ GsdUpdatesWatch *watch; -+ -+ g_return_if_fail (GSD_IS_UPDATES_WATCH (object)); -+ -+ watch = GSD_UPDATES_WATCH (object); -+ g_return_if_fail (watch->priv != NULL); -+ -+ if (watch->priv->tlist != NULL) { -+ g_object_unref (watch->priv->tlist); -+ } -+ if (watch->priv->client != NULL) { -+ g_object_unref (watch->priv->client); -+ } -+ -+ G_OBJECT_CLASS (gsd_updates_watch_parent_class)->finalize (object); -+} -+ -+GsdUpdatesWatch * -+gsd_updates_watch_new (void) -+{ -+ return GSD_UPDATES_WATCH (g_object_new (GSD_TYPE_UPDATES_WATCH, NULL)); -+} -+ -+static void -+gsd_updates_watch_class_init (GsdUpdatesWatchClass *klass) -+{ -+ GObjectClass *object_class = G_OBJECT_CLASS (klass); -+ object_class->finalize = gsd_updates_watch_finalize; -+ g_type_class_add_private (klass, sizeof (GsdUpdatesWatchPrivate)); -+} -diff --git a/plugins/updates/gsd-updates-watch.h b/plugins/updates/gsd-updates-watch.h -new file mode 100644 -index 0000000..439464f ---- /dev/null -+++ b/plugins/updates/gsd-updates-watch.h -@@ -0,0 +1,52 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- -+ * -+ * Copyright (C) 2011-2012 Jonathan Conder <jonno.conder@gmail.com> -+ * -+ * Licensed under the GNU General Public License Version 2 -+ * -+ * 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -+ */ -+ -+#ifndef __GSD_UPDATES_WATCH_H -+#define __GSD_UPDATES_WATCH_H -+ -+#include <glib-object.h> -+ -+G_BEGIN_DECLS -+ -+#define GSD_TYPE_UPDATES_WATCH (gsd_updates_watch_get_type ()) -+#define GSD_UPDATES_WATCH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatch)) -+#define GSD_UPDATES_WATCH_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_UPDATES_WATCH, GsdUpdatesWatchClass)) -+#define GSD_IS_UPDATES_WATCH(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_UPDATES_WATCH)) -+ -+typedef struct GsdUpdatesWatchPrivate GsdUpdatesWatchPrivate; -+ -+typedef struct -+{ -+ GObject parent; -+ GsdUpdatesWatchPrivate *priv; -+} GsdUpdatesWatch; -+ -+typedef struct -+{ -+ GObjectClass parent_class; -+} GsdUpdatesWatchClass; -+ -+GType gsd_updates_watch_get_type (void); -+GsdUpdatesWatch *gsd_updates_watch_new (void); -+ -+G_END_DECLS -+ -+#endif /* __GSD_UPDATES_WATCH_H */ diff --git a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install b/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install deleted file mode 100644 index f7e8c46ac..000000000 --- a/community-testing/gnome-settings-daemon-updates/gnome-settings-daemon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - glib-compile-schemas /usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/gnome-settings-daemon-updates/screensaver.patch b/community-testing/gnome-settings-daemon-updates/screensaver.patch deleted file mode 100644 index bbcfe3430..000000000 --- a/community-testing/gnome-settings-daemon-updates/screensaver.patch +++ /dev/null @@ -1,145 +0,0 @@ -From b47e4019a12ac84fba31e1c631d878ce03fa3808 Mon Sep 17 00:00:00 2001 -From: Rui Matos <tiagomatos@gmail.com> -Date: Wed, 17 Oct 2012 22:44:54 +0000 -Subject: power: Add a watchdog to keep X's builtin screen saver disabled - -X's builtin screen saver may activate DPMS. Since we want to activate -DPMS ourselves according to our own policy we must make sure that X's -screen saver remains disabled. - -This code is a copy of the original found in gs-watcher-x11.c from -gnome-screensaver which stopped being used in GNOME 3.6. - -https://bugzilla.gnome.org/show_bug.cgi?id=686339 ---- -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 0e06495..070cf32 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -27,6 +27,7 @@ - #include <stdio.h> - #include <sys/wait.h> - #include <glib/gi18n.h> -+#include <gdk/gdkx.h> - #include <gtk/gtk.h> - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> -@@ -80,6 +81,8 @@ - /* Keep this in sync with gnome-shell */ - #define SCREENSAVER_FADE_TIME 10 /* seconds */ - -+#define XSCREENSAVER_WATCHDOG_TIMEOUT 120 /* seconds */ -+ - enum { - GSD_POWER_IDLETIME_NULL_ID, - GSD_POWER_IDLETIME_DIM_ID, -@@ -197,6 +200,7 @@ struct GsdPowerManagerPrivate - GsdPowerIdleMode current_idle_mode; - guint lid_close_safety_timer_id; - GtkStatusIcon *status_icon; -+ guint xscreensaver_watchdog_timer_id; - }; - - enum { -@@ -3621,6 +3625,77 @@ engine_session_active_changed_cb (GnomeSettingsSession *session, - idle_set_mode (manager, GSD_POWER_IDLE_MODE_NORMAL); - } - -+/* This timer goes off every few minutes, whether the user is idle or not, -+ to try and clean up anything that has gone wrong. -+ -+ It calls disable_builtin_screensaver() so that if xset has been used, -+ or some other program (like xlock) has messed with the XSetScreenSaver() -+ settings, they will be set back to sensible values (if a server extension -+ is in use, messing with xlock can cause the screensaver to never get a wakeup -+ event, and could cause monitor power-saving to occur, and all manner of -+ heinousness.) -+ -+ This code was originally part of gnome-screensaver, see -+ http://git.gnome.org/browse/gnome-screensaver/tree/src/gs-watcher-x11.c?id=fec00b12ec46c86334cfd36b37771cc4632f0d4d#n530 -+ */ -+static gboolean -+disable_builtin_screensaver (gpointer unused) -+{ -+ int current_server_timeout, current_server_interval; -+ int current_prefer_blank, current_allow_exp; -+ int desired_server_timeout, desired_server_interval; -+ int desired_prefer_blank, desired_allow_exp; -+ -+ XGetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -+ ¤t_server_timeout, -+ ¤t_server_interval, -+ ¤t_prefer_blank, -+ ¤t_allow_exp); -+ -+ desired_server_timeout = current_server_timeout; -+ desired_server_interval = current_server_interval; -+ desired_prefer_blank = current_prefer_blank; -+ desired_allow_exp = current_allow_exp; -+ -+ desired_server_interval = 0; -+ -+ /* I suspect (but am not sure) that DontAllowExposures might have -+ something to do with powering off the monitor as well, at least -+ on some systems that don't support XDPMS? Who know... */ -+ desired_allow_exp = AllowExposures; -+ -+ /* When we're not using an extension, set the server-side timeout to 0, -+ so that the server never gets involved with screen blanking, and we -+ do it all ourselves. (However, when we *are* using an extension, -+ we tell the server when to notify us, and rather than blanking the -+ screen, the server will send us an X event telling us to blank.) -+ */ -+ desired_server_timeout = 0; -+ -+ if (desired_server_timeout != current_server_timeout -+ || desired_server_interval != current_server_interval -+ || desired_prefer_blank != current_prefer_blank -+ || desired_allow_exp != current_allow_exp) { -+ -+ g_debug ("disabling server builtin screensaver:" -+ " (xset s %d %d; xset s %s; xset s %s)", -+ desired_server_timeout, -+ desired_server_interval, -+ (desired_prefer_blank ? "blank" : "noblank"), -+ (desired_allow_exp ? "expose" : "noexpose")); -+ -+ XSetScreenSaver (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), -+ desired_server_timeout, -+ desired_server_interval, -+ desired_prefer_blank, -+ desired_allow_exp); -+ -+ XSync (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), FALSE); -+ } -+ -+ return TRUE; -+} -+ - gboolean - gsd_power_manager_start (GsdPowerManager *manager, - GError **error) -@@ -3778,6 +3853,9 @@ gsd_power_manager_start (GsdPowerManager *manager, - /* set the initial dim time that can adapt for the user */ - refresh_idle_dim_settings (manager); - -+ manager->priv->xscreensaver_watchdog_timer_id = g_timeout_add_seconds (XSCREENSAVER_WATCHDOG_TIMEOUT, -+ disable_builtin_screensaver, -+ NULL); - gnome_settings_profile_end (NULL); - return TRUE; - } -@@ -3829,6 +3907,11 @@ gsd_power_manager_stop (GsdPowerManager *manager) - - g_clear_object (&manager->priv->idletime); - g_clear_object (&manager->priv->status_icon); -+ -+ if (manager->priv->xscreensaver_watchdog_timer_id > 0) { -+ g_source_remove (manager->priv->xscreensaver_watchdog_timer_id); -+ manager->priv->xscreensaver_watchdog_timer_id = 0; -+ } - } - - static void --- -cgit v0.9.0.2 diff --git a/community-testing/gnote/PKGBUILD b/community-testing/gnote/PKGBUILD deleted file mode 100644 index 10875eac1..000000000 --- a/community-testing/gnote/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 78578 2012-10-21 10:46:20Z ibiru $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Contributor: uastasi <uastasi@archlinux.us> -pkgname=gnote -pkgver=3.6.0 -pkgrel=1 -pkgdesc="A note taking application." -arch=('i686' 'x86_64') -url="http://live.gnome.org/Gnote" -license=('GPL3') -depends=('gtkmm3' 'libxslt' 'hicolor-icon-theme' 'desktop-file-utils' 'dconf' 'libsecret') -makedepends=('intltool' 'itstool' 'boost') -options=('!libtool') -install=gnote.install -source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('ac61c84a4fe8eeae613af76bb11cb481f2f44c8bc64ef4b7aac90b8e68e94957') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib/gnote \ - --disable-scrollkeeper \ - --disable-schemas-compile \ - --disable-static - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/gnote/gnote.install b/community-testing/gnote/gnote.install deleted file mode 100644 index 0f8eb1012..000000000 --- a/community-testing/gnote/gnote.install +++ /dev/null @@ -1,21 +0,0 @@ -pkgname=gnote - -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -pre_upgrade() { - if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then - usr/sbin/gconfpkg --uninstall ${pkgname} - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/gogglesmm/PKGBUILD b/community-testing/gogglesmm/PKGBUILD deleted file mode 100644 index 6a70860cf..000000000 --- a/community-testing/gogglesmm/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 77293 2012-10-08 15:04:42Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Sander Jansen <sander@knology.net> - -pkgname=gogglesmm -pkgver=0.12.6 -pkgrel=2 -pkgdesc="Music Manager and Player" -arch=('i686' 'x86_64') -url="http://code.google.com/p/gogglesmm/" -license=('GPL3') -install=gogglesmm.install -depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt') -makedepends=('pkgconfig' 'glproto' 'dri2proto' 'glu') -replaces=('musicmanager') -conflicts=('musicmanager') -source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2) -md5sums=('19505ee514690fe3372621685666db4c') - -build() { - cd $srcdir/gogglesmm-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/gogglesmm-$pkgver - mkdir -p $pkgdir/usr/bin - make DESTDIR=$pkgdir install -} diff --git a/community-testing/gogglesmm/gogglesmm.install b/community-testing/gogglesmm/gogglesmm.install deleted file mode 100644 index 04c026840..000000000 --- a/community-testing/gogglesmm/gogglesmm.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/gource/PKGBUILD b/community-testing/gource/PKGBUILD deleted file mode 100644 index e3886bcba..000000000 --- a/community-testing/gource/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 77282 2012-10-08 14:35:47Z 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=4 -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-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD deleted file mode 100644 index 24230e603..000000000 --- a/community-testing/gpac/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 77246 2012-10-07 22:54:58Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=gpac -pkgver=4065 -pkgrel=2 -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' 'glu') -makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad' 'mesa') -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/gpsdrive/PKGBUILD b/community-testing/gpsdrive/PKGBUILD deleted file mode 100644 index 655913c6e..000000000 --- a/community-testing/gpsdrive/PKGBUILD +++ /dev/null @@ -1,64 +0,0 @@ -# $Id: PKGBUILD 73759 2012-07-15 13:18:57Z ibiru $ -# 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-testing/gpsdrive/gpsdrive.install b/community-testing/gpsdrive/gpsdrive.install deleted file mode 100644 index 8ea63912e..000000000 --- a/community-testing/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-testing/gtk-engine-unico/PKGBUILD b/community-testing/gtk-engine-unico/PKGBUILD deleted file mode 100644 index 998232ba9..000000000 --- a/community-testing/gtk-engine-unico/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 78483 2012-10-19 15:13:25Z bpiotrowski $ -# Maintainer: Bartlomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Hilinus <itahilinus[at]hotmail[dot]it> - -pkgname=gtk-engine-unico -pkgver=1.0.2 -pkgrel=2 -pkgdesc="Unico GTK3 theme engine" -arch=('i686' 'x86_64') -url="https://launchpad.net/unico" -license=('GPL') -depends=("gtk3") -options=(!libtool) -source=("http://launchpad.net/unico/1.0/$pkgver/+download/${pkgname#gtk-engine-}-$pkgver.tar.gz") -md5sums=('19fb3ecc36d4d13b4a76e26a4ebd6412') - - -build() { - cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver - - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname#gtk-engine-}-$pkgver - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch b/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch deleted file mode 100644 index 1c6a7dd65..000000000 --- a/community-testing/gtk2hs-buildtools/0001-fix-for-ghc-7.6.1-changes.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 7d94bcd36eb1d5a2feae182fcb74f9d6ca439a80 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Wed, 12 Sep 2012 03:29:46 -0700 -Subject: [PATCH] fix for ghc 7.6.1 changes - ---- - c2hs/base/general/FileOps.hs | 3 ++- - c2hs/base/state/StateTrans.hs | 3 ++- - c2hs/toplevel/C2HSConfig.hs | 2 +- - 3 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/c2hs/base/general/FileOps.hs b/c2hs/base/general/FileOps.hs -index 83ac70c..4914c4b 100644 ---- a/c2hs/base/general/FileOps.hs -+++ b/c2hs/base/general/FileOps.hs -@@ -39,6 +39,7 @@ import Control.Monad (liftM) - import System.Random (newStdGen, randomRs) - - import FNameOps (dirname, stripDirname, addPath) -+import System.IO.Error (catchIOError) - - - -- search for the given file in the given list of directories (EXPORTED) -@@ -89,7 +90,7 @@ mktemp pre post = - in do - h <- openFile fname ReadWriteMode - return (h, fname) -- `catch` \_ -> createLoop (attempts - 1) rs' -+ `catchIOError` \_ -> createLoop (attempts - 1) rs' - -- - sixChars :: [Int] -> ([Int], String) - sixChars is = -diff --git a/c2hs/base/state/StateTrans.hs b/c2hs/base/state/StateTrans.hs -index ada62f4..2ab0ad1 100644 ---- a/c2hs/base/state/StateTrans.hs -+++ b/c2hs/base/state/StateTrans.hs -@@ -84,6 +84,7 @@ import System.IO (fixIO) - import Data.IORef (IORef, newIORef, readIORef, writeIORef) - - import Errors (interr) -+import System.IO.Error (catchIOError) - - infixr 1 +>=, +> - -@@ -337,7 +338,7 @@ fatalsHandledBy m handler = - ioError err - Right a -> return state - ) -- `catch` (\err -> let -+ `catchIOError` (\err -> let - STB handler' = handler err - in - handler' bs gs) -diff --git a/c2hs/toplevel/C2HSConfig.hs b/c2hs/toplevel/C2HSConfig.hs -index e8deddf..af32886 100644 ---- a/c2hs/toplevel/C2HSConfig.hs -+++ b/c2hs/toplevel/C2HSConfig.hs -@@ -46,7 +46,7 @@ import Data.Array (Array, array) - - import Foreign (Ptr, FunPtr) - import Foreign (Storable(sizeOf, alignment), toBool) --import Foreign.C (CInt) -+import Foreign.C (CInt(..)) - import System.Info (os) - - -- program settings --- -1.7.12 - diff --git a/community-testing/gtk2hs-buildtools/PKGBUILD b/community-testing/gtk2hs-buildtools/PKGBUILD deleted file mode 100644 index ada8cb54f..000000000 --- a/community-testing/gtk2hs-buildtools/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 77006 2012-10-03 15:23:27Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=gtk2hs-buildtools -pkgver=0.12.3.1 -pkgrel=2 -pkgdesc="Tools to build the Gtk2Hs suite of User Interface libraries." -url="http://hackage.haskell.org/package/gtk2hs-buildtools" -license=('GPL2') -arch=('i686' 'x86_64') -makedepends=('ghc=7.6.1-1' 'alex=3.0.2-2' 'happy=1.18.9-6' 'haskell-random=1.0.1.1-3') -depends=('gmp') -options=('strip') -provides=('haskell-gtk2hs-buildtools') -source=(http://hackage.haskell.org/packages/archive/gtk2hs-buildtools/$pkgver/gtk2hs-buildtools-$pkgver.tar.gz - '0001-fix-for-ghc-7.6.1-changes.patch') -md5sums=('612611d831635024c953d2817b124e29' - 'b6551d8085c97bc2c6600ab397833101') - -build() { - cd ${srcdir}/gtk2hs-buildtools-$pkgver - - patch -Np1 -i ${srcdir}/0001-fix-for-ghc-7.6.1-changes.patch - - runhaskell Setup configure --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build -} - -package() { - cd ${srcdir}/gtk2hs-buildtools-$pkgver - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/guake/PKGBUILD b/community-testing/guake/PKGBUILD deleted file mode 100644 index eda3e0c4d..000000000 --- a/community-testing/guake/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 78050 2012-10-16 11:50:47Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Wilson Pinto Júnior (N3RD3X) <n3rd3x@linuxmail.org> - -pkgname=guake -pkgver=0.4.4 -pkgrel=2 -pkgdesc='Drop-down terminal for GNOME' -arch=('i686' 'x86_64') -url="http://guake.org/" -license=('GPL') -depends=('python2-notify' 'vte' 'python2-gconf' 'python2-dbus' 'python2-xdg' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool') -options=('!libtool') -install=$pkgname.install -source=(http://guake.org/files/$pkgname-$pkgver.tar.gz - guake-fix-notification.patch) -md5sums=('532adada29b8f0bb79dc15904aa6b70c' - '0b57227e6869dd84dd4fb0794ed0d082') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's|schemadir = $(sysconfdir)/gconf/schemas|schemadir = $(GCONF_SCHEMA_FILE_DIR)|' data/Makefile.in - sed -i 's|/usr/bin/env python|/usr/bin/python2|' src/{guake{,-prefs},prefs.py} - - # http://guake.org/ticket/416 - patch -Np1 -i "$srcdir/guake-fix-notification.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/guake/guake-fix-notification.patch b/community-testing/guake/guake-fix-notification.patch deleted file mode 100644 index 847dac10e..000000000 --- a/community-testing/guake/guake-fix-notification.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/src/guake 2011-02-09 20:00:35.000000000 +0100 -+++ b/src/guake 2012-02-25 00:55:28.513075769 +0100 -@@ -46,7 +46,10 @@ - TERMINAL_MATCH_EXPRS, TERMINAL_MATCH_TAGS, \ - ALIGN_LEFT, ALIGN_RIGHT, ALIGN_CENTER - --pynotify.init('Guake!') -+popup_works = True -+if not pynotify.init('Guake!') or pynotify.get_server_info() == None : -+ popup_works = False -+ print "WARNING: could not use popup notification" - - GNOME_FONT_PATH = '/desktop/gnome/interface/monospace_font_name' - -@@ -637,7 +640,12 @@ - 'Please use Guake Preferences dialog to choose another ' - 'key (The trayicon was enabled)') % label, filename) - self.client.set_bool(KEY('/general/use_trayicon'), True) -- notification.show() -+ if popup_works : -+ notification.show() -+ else : -+ print _('A problem happened when binding <b>%s</b> key.\n' -+ 'Please use Guake Preferences dialog to choose another ' -+ 'key (The trayicon was enabled)') % label - - elif self.client.get_bool(KEY('/general/use_popup')): - # Pop-up that shows that guake is working properly (if not -@@ -646,7 +654,11 @@ - _('Guake!'), - _('Guake is now running,\n' - 'press <b>%s</b> to use it.') % label, filename) -- notification.show() -+ if popup_works : -+ notification.show() -+ else : -+ print _('Guake is now running,\n' -+ 'press <b>%s</b> to use it.') % label - - def execute_command(self, command, tab=None): - """Execute the `command' in the `tab'. If tab is None, the - diff --git a/community-testing/guake/guake.install b/community-testing/guake/guake.install deleted file mode 100644 index 8084333b1..000000000 --- a/community-testing/guake/guake.install +++ /dev/null @@ -1,22 +0,0 @@ -pkgname=guake - -post_install() { - usr/sbin/gconfpkg --install ${pkgname} - xdg-icon-resource forceupdate -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - usr/sbin/gconfpkg --uninstall ${pkgname} -} - -post_remove() { - xdg-icon-resource forceupdate -} diff --git a/community-testing/gwibber/PKGBUILD b/community-testing/gwibber/PKGBUILD deleted file mode 100644 index d6c663411..000000000 --- a/community-testing/gwibber/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 78051 2012-10-16 11:50:52Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=gwibber -pkgver=3.4.2 -pkgrel=2 -pkgdesc="Microblogging client for GNOME, which supports Twitter, Identi.ca, StatusNet, Facebook, Flickr, Digg, FriendFeed and Qaiku" -arch=('i686' 'x86_64') -url="http://gwibber.com/" -license=('GPL') -depends=('libgee' 'libnotify' 'dee>=1.0.0' 'json-glib' 'gtkspell3' 'python2-gobject' 'libwnck3' 'libwebkit3' 'libgnome-keyring>=3.3' 'python2-dbus' 'python2-httplib2' 'python2-egenix-mx-base' 'python2-oauth' 'python2-imaging' 'python2-xdg' 'dconf' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'vala>=0.15.0') -options=('!libtool') -install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('0ac544f8e626547312b9d0da0b57358e') - -build() { - cd "$srcdir/$pkgname-$pkgver" - find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@' - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-static --disable-schemas-compile --disable-unity - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/gwibber/gwibber.install b/community-testing/gwibber/gwibber.install deleted file mode 100644 index d973d53f7..000000000 --- a/community-testing/gwibber/gwibber.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch deleted file mode 100644 index 2e687db21..000000000 --- a/community-testing/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c60f2ab90f6e39fdb515cc0305467e534f718a7d Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 11 Sep 2012 07:43:41 -0700 -Subject: [PATCH] fix incorrect types in documentation/haddock - ---- - src/Documentation/Haddock.hs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs -index 60bb314..8fd9674 100644 ---- a/src/Documentation/Haddock.hs -+++ b/src/Documentation/Haddock.hs -@@ -59,6 +59,7 @@ import Haddock.Types - import Haddock.Options - import Haddock.Utils - import Main -+import GHC (Ghc) - - - -- | Create 'Interface' structures from a given list of Haddock command-line -@@ -68,7 +69,7 @@ import Main - createInterfaces - :: [Flag] -- ^ A list of command-line flags - -> [String] -- ^ File or module names -- -> IO [Interface] -- ^ Resulting list of interfaces -+ -> Ghc [Interface] -- ^ Resulting list of interfaces - createInterfaces flags modules = do - (_, ifaces, _) <- readPackagesAndProcessModules flags modules - return ifaces --- -1.7.12 - diff --git a/community-testing/haddock/PKGBUILD b/community-testing/haddock/PKGBUILD deleted file mode 100644 index 274cc7851..000000000 --- a/community-testing/haddock/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haddock -pkgver=2.12.0 -pkgrel=1 -pkgdesc="Tool for generating documentation for Haskell libraries" -url="http://hackage.haskell.org/package/haddock" -license=('custom:BSD3') -arch=('x86_64' 'i686') -makedepends=('alex=3.0.2-2' 'happy=1.18.9-6') -depends=('ghc=7.6.1-1' 'haskell-xhtml=3000.2.1-2' 'haskell-ghc-paths=0.1.0.8-9') -install=$pkgname.install -source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" - '0001-fix-incorrect-types-in-documentation-haddock.patch') -sha256sums=('b6c53c3c2dcfc7604941f81acd8954c7deb101b1341003d2e9c6c26dd4ad6d02' - 'a260b828ddf6e56440209d9631efcd6e1530b8996859528feee37638cc26e92a') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - patch -Np1 -i ${srcdir}/0001-fix-incorrect-types-in-documentation-haddock.patch - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/"$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm744 register.sh "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/$pkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" - mv "$pkgdir/usr/bin/haddock" "$pkgdir/usr/bin/haddock-cabal" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haddock/haddock.install b/community-testing/haddock/haddock.install deleted file mode 100644 index 24e27a074..000000000 --- a/community-testing/haddock/haddock.install +++ /dev/null @@ -1,25 +0,0 @@ -pkgname=haddock -HS_DIR=usr/share/haskell/haddock - -post_upgrade() { - ${HS_DIR}/register.sh &> /dev/null - post_remove -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) &> /dev/null -} - -pre_remove() { - ${HS_DIR}/unregister.sh &> /dev/null -} - -post_install() { - post_upgrade -} - -pre_upgrade() { - pre_remove -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/happy/PKGBUILD b/community-testing/happy/PKGBUILD deleted file mode 100644 index 583471724..000000000 --- a/community-testing/happy/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 77008 2012-10-03 15:23:39Z tdziedzic $ -# Maintainer: Thomas Dziedzic <gostrc@gmail.com> -# Contributor: simo <simo@archlinux.org> -# Contributor: Vesa Kaihlavirta <vegai@iki.fi> - -pkgname=happy -pkgver=1.18.10 -pkgrel=1 -pkgdesc="The Parser Generator for Haskell" -url="http://hackage.haskell.org/package/happy" -arch=('i686' 'x86_64') -license=("custom:BSD3") -depends=('gmp') -makedepends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1') -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz) -md5sums=('a1638e89434427e57f68ef311761dc30') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # try was deprecated and removed into control.exception - # we really want tryIOError - #sed 's/try/&IOError/' -i Setup.lhs - - runhaskell Setup.lhs configure -O --prefix=/usr - runhaskell Setup.lhs build -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - runhaskell Setup.lhs copy --destdir="${pkgdir}" - install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community-testing/haskell-binary/PKGBUILD b/community-testing/haskell-binary/PKGBUILD deleted file mode 100644 index 3b786ccf4..000000000 --- a/community-testing/haskell-binary/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 72296 2012-06-11 17:24:49Z tdziedzic $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-binary -pkgver=0.5.1.0 -pkgrel=2 -pkgdesc="Binary serialisation for Haskell values using lazy ByteStrings" -url="http://hackage.haskell.org/package/binary" -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.4.2-1' sh) -options=('strip') -source=("http://hackage.haskell.org/packages/archive/binary/$pkgver/binary-$pkgver.tar.gz") -install=haskell-binary.install -sha256sums=('2ad477b47e9158d61517689f5f0c7b0240ff891059418d6758879020800351a3') - -build() { - cd "$srcdir/binary-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/binary-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/binary" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haskell-binary/haskell-binary.install b/community-testing/haskell-binary/haskell-binary.install deleted file mode 100644 index 844b8a67c..000000000 --- a/community-testing/haskell-binary/haskell-binary.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-binary - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -post_upgrade() { - ${HS_DIR}/register.sh - post_remove -} - -post_install() { - post_upgrade -} - -pre_remove() { - pre_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haskell-bytestring-show/PKGBUILD b/community-testing/haskell-bytestring-show/PKGBUILD deleted file mode 100644 index 27175c739..000000000 --- a/community-testing/haskell-bytestring-show/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 77009 2012-10-03 15:23:44Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-bytestring-show -pkgver=0.3.5.3 -pkgrel=1 -pkgdesc="Efficient conversion of values into readable byte strings." -url="http://hackage.haskell.org/package/bytestring-show" -license=("BSD3") -arch=('i686' 'x86_64') -depends=("ghc=7.6.1-1") -install="${pkgname}.install" -source=("http://hackage.haskell.org/packages/archive/bytestring-show/${pkgver}/bytestring-show-${pkgver}.tar.gz") -md5sums=('cbcc94f57fc754685f428aba003ba058') - -build() { - cd ${srcdir}/bytestring-show-${pkgver} - - # update outdated dependency - sed 's/build-depends: integer-gmp >= 0.2 && < 0.5/build-depends: integer-gmp >= 0.2 \&\& < 0.6/' -i bytestring-show.cabal - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/bytestring-show-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/bytestring-show - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-bytestring-show/haskell-bytestring-show.install b/community-testing/haskell-bytestring-show/haskell-bytestring-show.install deleted file mode 100644 index 335fc37cd..000000000 --- a/community-testing/haskell-bytestring-show/haskell-bytestring-show.install +++ /dev/null @@ -1,24 +0,0 @@ -pkgname=haskell-bytestring-show -HS_DIR=usr/share/haskell/${pkgname} - -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-cairo/PKGBUILD b/community-testing/haskell-cairo/PKGBUILD deleted file mode 100644 index 8544d0018..000000000 --- a/community-testing/haskell-cairo/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 77010 2012-10-03 15:23:49Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-cairo -pkgver=0.12.3.1 -pkgrel=2 -pkgdesc="Binding to the cairo library for Gtk2Hs." -url="http://hackage.haskell.org/package/cairo" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'cairo' 'haskell-mtl=2.1.2-1') -makedepends=("gtk2hs-buildtools") -options=('strip') -conflicts=('gtk2hs-cairo') -provides=('gtk2hs-cairo') -replaces=('gtk2hs-cairo') -install=gtk2hs-cairo.install -source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('9d489fbb6cadb3d109543fe25c50195e') - -build() { - cd ${srcdir}/cairo-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-cairo \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/cairo-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-cairo/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-cairo/html ${pkgdir}/usr/share/doc/ghc/html/libraries/cairo - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/haskell-cairo/gtk2hs-cairo.install b/community-testing/haskell-cairo/gtk2hs-cairo.install deleted file mode 100644 index 4ec5096b6..000000000 --- a/community-testing/haskell-cairo/gtk2hs-cairo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-cairo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch b/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch deleted file mode 100644 index 9f544bb27..000000000 --- a/community-testing/haskell-dataenc/0001-update-build-deps-for-ghc-7.6.1.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 961892779b5f5a2f46d6baa44c31d06c39e56470 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 11 Sep 2012 05:06:59 -0700 -Subject: [PATCH] update build deps for ghc 7.6.1 - ---- - dataenc.cabal | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dataenc.cabal b/dataenc.cabal -index 1ad42ca..3a4f5bb 100644 ---- a/dataenc.cabal -+++ b/dataenc.cabal -@@ -21,7 +21,7 @@ flag BuildTests - - library - hs-source-dirs: src -- build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.6, containers >= 0.1.0 && < 0.5 -+ build-depends: array >= 0.1.0 && < 0.5, base >= 3.0.0 && < 4.7, containers >= 0.1.0 && < 0.6 - exposed-modules: - Codec.Binary.Base16 - Codec.Binary.Base32 --- -1.7.12 - diff --git a/community-testing/haskell-dataenc/PKGBUILD b/community-testing/haskell-dataenc/PKGBUILD deleted file mode 100644 index 0b57ab46c..000000000 --- a/community-testing/haskell-dataenc/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 77011 2012-10-03 15:23:56Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 - -_hkgname=dataenc -pkgname=haskell-dataenc -pkgver=0.14.0.3 -pkgrel=3 -pkgdesc="Data encoding library" -url="http://hackage.haskell.org/package/dataenc" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz - '0001-update-build-deps-for-ghc-7.6.1.patch') -install=${pkgname}.install -md5sums=('643a8c022b9c840f801faf9a661fe637' - '662056adcb79efe8898298c271b49600') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - # update build deps for ghc 7.6.1 - patch -Np1 -i ${srcdir}/0001-update-build-deps-for-ghc-7.6.1.patch - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-dataenc/haskell-dataenc.install b/community-testing/haskell-dataenc/haskell-dataenc.install deleted file mode 100644 index 9c1bbff01..000000000 --- a/community-testing/haskell-dataenc/haskell-dataenc.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-dataenc -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-extensible-exceptions/PKGBUILD b/community-testing/haskell-extensible-exceptions/PKGBUILD deleted file mode 100644 index a97e33964..000000000 --- a/community-testing/haskell-extensible-exceptions/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 77072 2012-10-04 10:49:53Z jelle $ -# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> - -_hkgname=extensible-exceptions -pkgname=haskell-${_hkgname} -pkgver=0.1.1.4 -pkgrel=3 -pkgdesc="extensible exceptions for both new and old versions of GHC" -url="http://hackage.haskell.org/package/extensible-exceptions" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=$pkgname.install -md5sums=('fa1cadd15c1c7aa362618d41c6e17d8b') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install b/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install deleted file mode 100644 index 20c7dce30..000000000 --- a/community-testing/haskell-extensible-exceptions/haskell-extensible-exceptions.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-extensible-exceptions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - diff --git a/community-testing/haskell-ghc-paths/PKGBUILD b/community-testing/haskell-ghc-paths/PKGBUILD deleted file mode 100644 index 1e23d3c10..000000000 --- a/community-testing/haskell-ghc-paths/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# Maintainer: -# Contributor: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-ghc-paths -pkgver=0.1.0.8 -pkgrel=9 -pkgdesc="Knowledge of GHC's installation directories" -url="http://hackage.haskell.org/package/ghc-paths" -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.6.1-1') -source=("http://hackage.haskell.org/packages/archive/ghc-paths/$pkgver/ghc-paths-$pkgver.tar.gz") -install=haskell-ghc-paths.install -md5sums=('d2b23dc563888e380588501d2ce1d82b') - -build() { - cd "$srcdir/ghc-paths-$pkgver" - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/ghc-paths-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/ghc-paths" - runhaskell Setup copy --destdir="$pkgdir" - install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install b/community-testing/haskell-ghc-paths/haskell-ghc-paths.install deleted file mode 100644 index 4fd2c6c56..000000000 --- a/community-testing/haskell-ghc-paths/haskell-ghc-paths.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-ghc-paths -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch deleted file mode 100644 index 845beb2bd..000000000 --- a/community-testing/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Thu, 27 Sep 2012 04:48:10 -0700 -Subject: [PATCH] compatibility with ghc 7.6.1 - ---- - System/Glib/GObject.chs | 4 +--- - System/Glib/MainLoop.chs | 4 ++-- - 2 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs -index 5f0fe5c..9925d2c 100644 ---- a/System/Glib/GObject.chs -+++ b/System/Glib/GObject.chs -@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do - - {#pointer GDestroyNotify as DestroyNotify#} - --foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify -- - -- | This function wraps any newly created objects that derives from - -- GInitiallyUnowned also known as objects with - -- \"floating-references\". The object will be refSink (for glib -@@ -225,4 +223,4 @@ isA obj gType = - -- at this point we would normally implement the notify signal handler; - -- I've moved this definition into the Object class of the gtk package - -- since there's a quite a bit of machinery missing here (generated signal ---- register functions and the problem of recursive modules) -\ No newline at end of file -+-- register functions and the problem of recursive modules) -diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs -index 72fecb6..feb4c77 100644 ---- a/System/Glib/MainLoop.chs -+++ b/System/Glib/MainLoop.chs -@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr) - - {#pointer SourceFunc#} - --foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc -+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc - - type HandlerId = {#type guint#} - -@@ -79,7 +79,7 @@ type HandlerId = {#type guint#} - -- - makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify) - makeCallback fun = do -- funPtr <- mkSourceFunc fun -+ funPtr <- mkSourceFunc (const fun) - return (funPtr, destroyFunPtr) - - -- | Sets a function to be called at regular intervals, with the default --- -1.7.12.1 - diff --git a/community-testing/haskell-glib/PKGBUILD b/community-testing/haskell-glib/PKGBUILD deleted file mode 100644 index 29871ceb0..000000000 --- a/community-testing/haskell-glib/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 77013 2012-10-03 15:24:08Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-glib -pkgver=0.12.3.1 -pkgrel=2 -pkgdesc="Binding to the GLIB library for Gtk2Hs." -url="http://hackage.haskell.org/package/glib" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'glib2') -makedepends=("gtk2hs-buildtools") -options=('strip') -install=gtk2hs-glib.install -provides=('gtk2hs-glib') -replaces=('gtk2hs-glib') -conflicts=('gtk2hs-glib') -source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz - '0001-compatibility-with-ghc-7.6.1.patch') -md5sums=('f2899bd2a2850fe95479ddb63490eb04' - 'b00660b7102542942b0b9d84b59d1f3c') - -build() { - cd glib-$pkgver - - patch -Np1 -i ${srcdir}/0001-compatibility-with-ghc-7.6.1.patch - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-glib \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "glib2") - - cd ${srcdir}/glib-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-glib/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-glib/html ${pkgdir}/usr/share/doc/ghc/html/libraries/glib - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/haskell-glib/gtk2hs-glib.install b/community-testing/haskell-glib/gtk2hs-glib.install deleted file mode 100644 index 24025f5d8..000000000 --- a/community-testing/haskell-glib/gtk2hs-glib.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-glib -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-gtk/PKGBUILD b/community-testing/haskell-gtk/PKGBUILD deleted file mode 100644 index ab4be6139..000000000 --- a/community-testing/haskell-gtk/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 77014 2012-10-03 15:24:17Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-gtk -pkgver=0.12.3.1 -pkgrel=2 -pkgdesc="Binding to the gtk library for Gtk2Hs." -url="http://hackage.haskell.org/package/gtk" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl') -makedepends=("gtk2hs-buildtools") -provides=('gtk2hs-gtk') -replaces=('gtk2hs-gtk') -conflicts=('gtk2hs-gtk') -options=('strip') -install=gtk2hs-gtk.install -source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz - ghc-7.6.1.patch) -md5sums=('b10dfe92d2e4dfe3c0c92dd349489727' - '5fb93f37fe3f494b30ee682a36b8f1b6') - -build() { - cd ${srcdir}/gtk-${pkgver} - patch -p1 <$srcdir/ghc-7.6.1.patch - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ - --libsubdir=\$compiler/site-local/\$pkgid - sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` - _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}") - - cd ${srcdir}/gtk-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/haskell-gtk/ghc-7.6.1.patch b/community-testing/haskell-gtk/ghc-7.6.1.patch deleted file mode 100644 index 5e259a38f..000000000 --- a/community-testing/haskell-gtk/ghc-7.6.1.patch +++ /dev/null @@ -1,574 +0,0 @@ -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -126,7 +126,8 @@ - - {#pointer GWeakNotify#} - --foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify -+foreign import ccall "wrapper" mkDestructor -+ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify - - -- | Attach a callback that will be called after the - -- destroy hooks have been called -@@ -134,7 +135,7 @@ - objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify - objectWeakref obj uFun = do - funPtrContainer <- newIORef nullFunPtr -- uFunPtr <- mkDestructor $ do -+ uFunPtr <- mkDestructor $ \_ _ -> do - uFun - funPtr <- readIORef funPtrContainer - freeHaskellFunPtr funPtr -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400 -@@ -78,6 +78,10 @@ - entrySetCompletion, - entryGetCompletion, - #endif -+#if GTK_CHECK_VERSION (2,18,0) -+ entryGetBuffer, -+ entrySetBuffer, -+#endif - #if GTK_CHECK_VERSION(2,20,0) - entryGetIconWindow, - entryGetTextWindow, -@@ -104,6 +108,9 @@ - entryAlignment, - entryCompletion, - #endif -+#if GTK_CHECK_VERSION (2,18,0) -+ entryBuffer, -+#endif - - -- * Signals - entryActivate, -@@ -157,6 +164,9 @@ - import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey) - import Control.Monad.Reader ( ask ) - import Control.Monad.Trans ( liftIO ) -+#if GTK_CHECK_VERSION (2,18,0) -+import Graphics.UI.Gtk.Entry.EntryBuffer -+#endif - {#import Graphics.UI.Gtk.Types#} - {#import Graphics.UI.Gtk.Signals#} - -@@ -429,6 +439,23 @@ - (toEntry self) - #endif - -+#if GTK_CHECK_VERSION(2,18,0) -+-- | Get the 'EntryBuffer' object which holds the text for this widget. -+entryGetBuffer :: EntryClass self => self -+ -> IO EntryBuffer -+entryGetBuffer self = -+ makeNewGObject mkEntryBuffer $ -+ {# call gtk_entry_get_buffer #} -+ (toEntry self) -+ -+-- | Set the 'EntryBuffer' object which holds the text for this widget. -+entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self -+ -> buffer -> IO () -+entrySetBuffer self = -+ {# call gtk_entry_set_buffer #} -+ (toEntry self) . toEntryBuffer -+#endif -+ - #if GTK_CHECK_VERSION(2,20,0) - -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when - -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to -@@ -623,6 +650,15 @@ - entrySetCompletion - #endif - -+#if GTK_CHECK_VERSION(2,18,0) -+entryBuffer :: (EntryClass self, EntryBufferClass buffer) => -+ ReadWriteAttr self EntryBuffer buffer -+entryBuffer = newAttr -+ entryGetBuffer -+ entrySetBuffer -+#endif -+ -+ - -------------------- - -- Signals - -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400 -@@ -639,14 +639,16 @@ - - - -- | Execute an event handler and assume it handled the event unless it ---- threw a pattern match exception. -+-- threw a pattern match exception or calls mzero (e.g. via guard). - tryEvent :: EventM any () -> EventM any Bool - tryEvent act = do - ptr <- ask - liftIO $ (runReaderT (act >> return True) ptr) - #if __GLASGOW_HASKELL__ >= 610 - `catches` [ Handler (\ (PatternMatchFail _) -> return False) -- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e -+ , Handler (\ e -> if isUserError e && -+ ("Pattern" `isPrefixOf` ioeGetErrorString e || -+ "mzero" == ioeGetErrorString e) - then return False - else throw e) ] - #else -@@ -654,6 +656,8 @@ - IOException e - | "user error (Pattern" `isPrefixOf` show e -> - return False -+ | "user error (mzero" `isPrefixOf` show e -> -+ return False - PatternMatchFail _ -> return False - _ -> throw e) - #endif -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400 -@@ -69,6 +69,7 @@ - - -- * Constructors - pixbufNew, -+ pixbufNewFromData, - pixbufNewFromFile, - #if GTK_CHECK_VERSION(2,4,0) - pixbufNewFromFileAtSize, -@@ -402,6 +403,19 @@ - (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width) - (fromIntegral height) - -+pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf -+pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride -+ = wrapNewGObject mkPixbuf $ -+ {#call pixbuf_new_from_data #} -+ imData -+ (fromIntegral . fromEnum $ cSpace) -+ (fromBool hasAlpha) -+ (fromIntegral bitsPerSample) -+ (fromIntegral width) -+ (fromIntegral height) -+ (fromIntegral rowStride) -+ nullFunPtr nullPtr -+ - -- | Create a new image from a String. - -- - -- * Creates a new pixbuf from a string description. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -260,7 +260,7 @@ - -- data succeeded. - clipboardSetWithData self targets getFunc clearFunc = do - gFunPtr <- mkClipboardGetFunc -- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) -+ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) - cFunPtr <- mkClipboardClearFunc - (\_ _ -> clearFunc) - res <- withTargetEntries targets $ \nTargets targets -> -@@ -282,7 +282,7 @@ - {#pointer ClipboardClearFunc#} - - foreign import ccall "wrapper" mkClipboardGetFunc :: -- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc -+ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc - - foreign import ccall "wrapper" mkClipboardClearFunc :: - (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc -@@ -313,7 +313,7 @@ - -- ignored. - clipboardSetWithOwner self targets getFunc clearFunc owner = do - gFunPtr <- mkClipboardGetFunc -- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) -+ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) - cFunPtr <- mkClipboardClearFunc - (\_ _ -> clearFunc) - res <- withTargetEntries targets $ \nTargets targets -> -@@ -404,7 +404,7 @@ - clipboardRequestContents self (Atom target) callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardReceivedFunc -- (\_ sPtr -> do -+ (\_ sPtr _ -> do - freeHaskellFunPtr =<< readIORef cbRef - runReaderT callback sPtr - return ()) -@@ -418,7 +418,7 @@ - {#pointer ClipboardReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardReceivedFunc :: -- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc -+ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc - - -- %hash c:7bb1 d:4ef1 - -- | Requests the contents of the clipboard as text. When the text is later -@@ -439,7 +439,7 @@ - clipboardRequestText self callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardTextReceivedFunc -- (\_ sPtr -> do -+ (\_ sPtr _ -> do - freeHaskellFunPtr =<< readIORef cbRef - mStr <- if sPtr==nullPtr then return Nothing else - liftM Just $ peekUTFString sPtr -@@ -453,7 +453,7 @@ - {#pointer ClipboardTextReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardTextReceivedFunc :: -- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc -+ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc - - - #if GTK_CHECK_VERSION(2,6,0) -@@ -477,7 +477,7 @@ - clipboardRequestImage self callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardImageReceivedFunc -- (\_ sPtr -> do -+ (\_ sPtr _ -> do - freeHaskellFunPtr =<< readIORef cbRef - mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr) - callback mPixbuf) -@@ -490,7 +490,7 @@ - {#pointer ClipboardImageReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardImageReceivedFunc :: -- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc -+ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc - - #endif - -@@ -513,7 +513,7 @@ - clipboardRequestTargets self callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardTargetsReceivedFunc -- (\_ tPtr len -> do -+ (\_ tPtr len _ -> do - -- We must free Haskell pointer *in* the callback to avoid segfault. - freeHaskellFunPtr =<< readIORef cbRef - mTargets <- if tPtr==nullPtr then return Nothing else -@@ -528,7 +528,7 @@ - {#pointer ClipboardTargetsReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc :: -- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc -+ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc - - #if GTK_CHECK_VERSION(2,10,0) - -- %hash c:5601 d:d6a6 -@@ -552,10 +552,10 @@ - clipboardRequestRichText self buffer callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardRichTextReceivedFunc -- (\_ tPtr sPtr len -> do -+ (\_ tPtr sPtr len _ -> do - freeHaskellFunPtr =<< readIORef cbRef - mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do -- str <- peekUTFStringLen (sPtr,fromIntegral len) -+ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len) - return (Atom tPtr, str) - callback mRes) - writeIORef cbRef cbPtr -@@ -568,7 +568,7 @@ - {#pointer ClipboardRichTextReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc :: -- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) -> -+ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) -> - IO ClipboardRichTextReceivedFunc - #endif - #endif -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400 -@@ -202,7 +202,7 @@ - -- their arguments from the main loop, that is, from the OS thread of Gtk, - -- thereby ensuring that any Gtk and OS function can be called. - -- --{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #} -+{#fun gdk_threads_enter as threadsEnter {} -> `()' #} - - -- | Release the global Gtk lock. - -- -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -493,17 +493,17 @@ - {# call gtk_combo_box_set_row_separator_func #} - (toComboBox self) nullFunPtr nullPtr nullFunPtr - comboBoxSetRowSeparatorSource self (Just (model, extract)) = do -- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do -+ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do - iter <- peek iterPtr - value <- customStoreGetRow model iter -- return (extract value) -+ return (fromBool $ extract value) - {# call gtk_combo_box_set_row_separator_func #} - (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr - - {#pointer TreeViewRowSeparatorFunc#} - - foreign import ccall "wrapper" mkRowSeparatorFunc :: -- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc -+ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc - - -- %hash c:5bf8 - -- | Sets whether the popup menu should have a tearoff menu item. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400 -@@ -76,6 +76,12 @@ - menuItemNewWithMnemonic, - - -- * Methods -+#if GTK_CHECK_VERSION(2,16,0) -+ menuItemSetLabel, -+ menuItemGetLabel, -+ menuItemSetUseUnderline, -+ menuItemGetUseUnderline, -+#endif - menuItemSetSubmenu, - menuItemGetSubmenu, - menuItemRemoveSubmenu, -@@ -89,6 +95,10 @@ - -- * Attributes - menuItemSubmenu, - menuItemRightJustified, -+#if GTK_CHECK_VERSION(2,16,0) -+ menuItemLabel, -+ menuItemUseUnderline, -+#endif - - -- * Signals - menuItemActivateItem, -@@ -163,7 +173,36 @@ - - -------------------- - -- Methods -+#if GTK_CHECK_VERSION(2,16,0) -+-- | Sets text on the MenuItem label -+ -+menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO () -+menuItemSetLabel self label = -+ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self) -+ -+-- | Gets text on the MenuItem label -+menuItemGetLabel :: (MenuItemClass self) => self -> IO String -+menuItemGetLabel self = -+ {# call gtk_menu_item_get_label #} -+ (toMenuItem self) -+ >>= \strPtr -> if strPtr == nullPtr -+ then return "" -+ else peekUTFString strPtr -+ -+-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key. -+-- -+menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO () -+menuItemSetUseUnderline self = -+ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool - -+-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key. -+-- -+menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool -+menuItemGetUseUnderline self = -+ liftM toBool $ {# call gtk_menu_item_get_use_underline #} -+ (toMenuItem self) -+ -+#endif - -- | Sets the item's submenu, or changes it. - -- - menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO () -@@ -278,6 +317,22 @@ - menuItemGetRightJustified - menuItemSetRightJustified - -+#if GTK_CHECK_VERSION(2,16,0) -+-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel' -+-- -+menuItemLabel :: MenuItemClass self => Attr self String -+menuItemLabel = newAttr -+ menuItemGetLabel -+ menuItemSetLabel -+ -+-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and -+-- 'menuItemGetUseEUnderline' -+-- -+menuItemUseUnderline :: MenuItemClass self => Attr self Bool -+menuItemUseUnderline = newAttr -+ menuItemGetUseUnderline -+ menuItemSetUseUnderline -+#endif - -------------------- - -- Signals - -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400 -@@ -239,7 +239,7 @@ - customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource, - customTreeDragDestIface = fromMaybe dummyDragDest mDragDest } - privPtr <- newStablePtr priv -- liftM con $ makeNewGObject (CustomStore, objectUnref) $ -+ liftM con $ wrapNewGObject (CustomStore, objectUnref) $ - gtk2hs_store_new implPtr privPtr - - foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new" -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -427,7 +427,7 @@ - {#pointer TreeModelForeachFunc#} - - foreign import ccall "wrapper" mkTreeModelForeachFunc :: -- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> -+ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) -> - IO TreeModelForeachFunc - - #if GTK_CHECK_VERSION(2,2,0) -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -160,7 +160,7 @@ - {#pointer TreeModelFilterVisibleFunc #} - - foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc :: -- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> -+ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> - IO TreeModelFilterVisibleFunc - - -- %hash c:a56d d:b42e -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -151,7 +151,7 @@ - treeSelectionSetSelectFunction :: TreeSelectionClass self => self - -> TreeSelectionCB -> IO () - treeSelectionSetSelectFunction ts fun = do -- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do -+ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do - path <- peekTreePath (castPtr tp) - liftM fromBool $ fun path - ) -@@ -168,7 +168,7 @@ - {#pointer TreeSelectionFunc#} - - foreign import ccall "wrapper" mkTreeSelectionFunc :: -- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> -+ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)-> - IO TreeSelectionFunc - - -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on. -@@ -199,7 +199,7 @@ - -> TreeSelectionForeachCB - -> IO () - treeSelectionSelectedForeach self fun = do -- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do -+ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do - -- make a deep copy of the iterator. This makes it possible to store this - -- iterator in Haskell land somewhere. The TreeModel parameter is not - -- passed to the function due to performance reasons. But since it is -@@ -219,7 +219,7 @@ - {#pointer TreeSelectionForeachFunc#} - - foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: -- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc -+ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc - - #if GTK_CHECK_VERSION(2,2,0) - -- | Creates a list of paths of all selected rows. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -582,7 +582,7 @@ - {#pointer TreeViewColumnDropFunc#} - - foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: -- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> -+ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> - Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc - - -- | Scroll to a coordinate. -@@ -798,7 +798,7 @@ - {#pointer TreeViewMappingFunc#} - - foreign import ccall "wrapper" mkTreeViewMappingFunc :: -- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) -> -+ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) -> - IO TreeViewMappingFunc - - -- | Check if row is expanded. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400 -@@ -1251,16 +1251,26 @@ - - -- | A 'Pixbuf' is inserted into the buffer. - -- -+-- * See note in 'bufferInsertText'. -+-- - insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ()) - insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy) - - -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. - -- Insertion actually occurs in the default handler. - -- -+-- * See note in 'bufferInsertText'. -+-- - insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ()) - insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy) - ---- | Some text was inserted. -+-- | Some text is inserted. Insertion actually occurs in the default handler. -+-- -+-- * The function connected to this handler may not modify the buffer since -+-- this would invalidate the iterator. If this function replaces the -+-- default handler, it needs to stop the emission of this signal in order -+-- to prevent the default handler from running. If additional text should -+-- be inserted, this can be done using the 'after' function to connect. - -- - bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ()) - bufferInsertText = Signal $ \after obj handler -> -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -797,7 +797,7 @@ - {#pointer TextCharPredicate#} - - foreign import ccall "wrapper" mkTextCharPredicate :: -- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate -+ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate - - -- | Move 'TextIter' forward until a - -- predicate function returns True. -@@ -810,7 +810,7 @@ - textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> - IO Bool - textIterForwardFindChar ti pred limit = do -- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) -+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) - res <- liftM toBool $ {#call text_iter_forward_find_char#} - ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) - freeHaskellFunPtr fPtr -@@ -827,7 +827,7 @@ - textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> - IO Bool - textIterBackwardFindChar ti pred limit = do -- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) -+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) - res <- liftM toBool $ {#call text_iter_backward_find_char#} - ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) - freeHaskellFunPtr fPtr -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -274,7 +274,7 @@ - {#pointer AssistantPageFunc#} - - foreign import ccall "wrapper" mkAssistantPageFunc :: -- ({#type glong#} -> Ptr () -> IO {#type glong#}) -+ ({#type gint#} -> Ptr () -> IO {#type gint#}) - -> IO AssistantPageFunc - - -- | Sets the page type for @page@. The page type determines the page behavior diff --git a/community-testing/haskell-gtk/gtk-gthread.h-include.patch b/community-testing/haskell-gtk/gtk-gthread.h-include.patch deleted file mode 100644 index fc600d6be..000000000 --- a/community-testing/haskell-gtk/gtk-gthread.h-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c ---- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 -+++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 -@@ -26,7 +26,8 @@ - */ - - #include <glib.h> --#include <glib/gthread.h> -+/* f17 gives Error "Only <glib.h> can be included directly." -+ #include <glib/gthread.h> */ - #include <gdk/gdk.h> - #include "hsgthread.h" - - -Diff finished. Sun Jan 8 14:58:54 2012 diff --git a/community-testing/haskell-gtk/gtk2hs-gtk.install b/community-testing/haskell-gtk/gtk2hs-gtk.install deleted file mode 100644 index 7ed674b78..000000000 --- a/community-testing/haskell-gtk/gtk2hs-gtk.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-gtk -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-haskeline/PKGBUILD b/community-testing/haskell-haskeline/PKGBUILD deleted file mode 100644 index 35cc7dc7e..000000000 --- a/community-testing/haskell-haskeline/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 77015 2012-10-03 15:24:22Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=haskeline -pkgname=haskell-haskeline -pkgver=0.7.0.3 -pkgrel=1 -pkgdesc="A command-line interface for user input, written in Haskell." -url="http://hackage.haskell.org/package/haskeline" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-utf8-string=0.3.7-3' 'haskell-mtl=2.1.2-1' 'haskell-terminfo=0.3.2.5-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('3a78043dc80b5510202e71e77c0a9923') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure \ - -O -p --enable-split-objs --enable-shared -fterminfo --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-haskeline/haskell-haskeline.install b/community-testing/haskell-haskeline/haskell-haskeline.install deleted file mode 100644 index 27cb4a093..000000000 --- a/community-testing/haskell-haskeline/haskell-haskeline.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-haskeline -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-hslogger/PKGBUILD b/community-testing/haskell-hslogger/PKGBUILD deleted file mode 100644 index 49a283786..000000000 --- a/community-testing/haskell-hslogger/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 77016 2012-10-03 15:24:27Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-hslogger -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Versatile logging framework" -url="http://hackage.haskell.org/package/hslogger" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'haskell-mtl=2.1.2-1' 'haskell-network=2.3.1.0-1') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/hslogger/${pkgver}/hslogger-${pkgver}.tar.gz) -md5sums=('e0737887b0df75a3781989c8f6689850') - -build() { - cd ${srcdir}/hslogger-${pkgver} - runhaskell Setup configure -p --prefix=/usr --docdir=/usr/share/doc/${pkgname} -O \ - --enable-split-objs --enable-shared --libsubdir=\$compiler/site-local/\$pkgid \ - --enable-library-profiling - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/hslogger-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/hslogger - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/haskell-hslogger/haskell-hslogger.install b/community-testing/haskell-hslogger/haskell-hslogger.install deleted file mode 100644 index 2a0d98ae7..000000000 --- a/community-testing/haskell-hslogger/haskell-hslogger.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hslogger -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-html/PKGBUILD b/community-testing/haskell-html/PKGBUILD deleted file mode 100644 index 8eb9fc6f4..000000000 --- a/community-testing/haskell-html/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 - -_hkgname=html -pkgname=haskell-html -pkgver=1.0.1.2 -pkgrel=12 -pkgdesc="HTML combinator library" -url="http://hackage.haskell.org/package/html" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' sh) -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('2a7de5a2af9a2f80d39825d6a95ee445') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-html/haskell-html.install b/community-testing/haskell-html/haskell-html.install deleted file mode 100644 index 768297e0a..000000000 --- a/community-testing/haskell-html/haskell-html.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-html -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-pango/PKGBUILD b/community-testing/haskell-pango/PKGBUILD deleted file mode 100644 index b5b3f0f39..000000000 --- a/community-testing/haskell-pango/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 77018 2012-10-03 15:24:37Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=haskell-pango -pkgver=0.12.3 -pkgrel=3 -pkgdesc="Binding to the pango library for Gtk2Hs." -url="http://hackage.haskell.org/package/pango" -license=('LGPL2.1') -arch=('i686' 'x86_64') -depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') -makedepends=("gtk2hs-buildtools") -provides=('gtk2hs-pango') -replaces=('gtk2hs-pango') -conflicts=('gtk2hs-pango') -options=('strip') -install=gtk2hs-pango.install -source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) -md5sums=('1ef3132cb569703d5b1bc262c9d86fe3') - -build() { - cd ${srcdir}/pango-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ - --libsubdir=\$compiler/site-local/\$pkgid - sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` - _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-` - _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-` - depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}") - - cd ${srcdir}/pango-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/community-testing/haskell-pango/gtk2hs-pango.install b/community-testing/haskell-pango/gtk2hs-pango.install deleted file mode 100644 index f2be2100f..000000000 --- a/community-testing/haskell-pango/gtk2hs-pango.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/gtk2hs-pango -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch b/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch deleted file mode 100644 index a25506e67..000000000 --- a/community-testing/haskell-quickcheck/0001-update-code-to-support-extensible-exceptions-no-long.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 554b8dc1439b4dbb5bc9a853fc27efe7b1e111de Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 11 Sep 2012 03:59:50 -0700 -Subject: [PATCH] update code to support extensible exceptions no longer being - a part of ghc >= 7.6.1 - ---- - QuickCheck.cabal | 6 +++++- - Test/QuickCheck/Exception.hs | 6 ++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/QuickCheck.cabal b/QuickCheck.cabal -index 1a9126e..5afd6fb 100644 ---- a/QuickCheck.cabal -+++ b/QuickCheck.cabal -@@ -60,9 +60,13 @@ library - Build-depends: ghc - - -- We want to use extensible-exceptions even if linking against base-3. -- if impl(ghc >= 6.9) -+ if impl(ghc >= 6.9) && impl(ghc < 7.6) - Build-depends: extensible-exceptions - -+ -- GHC >= 7.6.1 no longer provides extensible exceptions -+ if impl(ghc >= 7.6) -+ cpp-options: -DNEW_EXCEPTIONS -+ - -- Modules that are always built. - Exposed-Modules: - Test.QuickCheck, -diff --git a/Test/QuickCheck/Exception.hs b/Test/QuickCheck/Exception.hs -index f895351..d463195 100644 ---- a/Test/QuickCheck/Exception.hs -+++ b/Test/QuickCheck/Exception.hs -@@ -18,6 +18,12 @@ module Test.QuickCheck.Exception where - - #if defined(OLD_EXCEPTIONS) - import Control.Exception(evaluate, try, Exception(..), throw) -+#elif defined(NEW_EXCEPTIONS) -+import Control.Exception(evaluate, try, SomeException(SomeException), ErrorCall(..), throw -+#if defined(GHC_INTERRUPT) -+ , AsyncException(UserInterrupt) -+#endif -+ ) - #else - import Control.Exception.Extensible(evaluate, try, SomeException(SomeException), ErrorCall(..), throw - #if defined(GHC_INTERRUPT) --- -1.7.12 - diff --git a/community-testing/haskell-quickcheck/PKGBUILD b/community-testing/haskell-quickcheck/PKGBUILD deleted file mode 100644 index e96121f81..000000000 --- a/community-testing/haskell-quickcheck/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 - -_hkgname=QuickCheck -pkgname=haskell-quickcheck -pkgver=2.5.1.1 -pkgrel=1 -pkgdesc="Automatic testing of Haskell programs" -url="http://hackage.haskell.org/package/QuickCheck" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'haskell-random=1.0.1.1-3' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('2631b41c8b6e297b52622d1698387f09') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-quickcheck/haskell-quickcheck.install b/community-testing/haskell-quickcheck/haskell-quickcheck.install deleted file mode 100644 index c9e12fadc..000000000 --- a/community-testing/haskell-quickcheck/haskell-quickcheck.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-quickcheck -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-regex-base/PKGBUILD b/community-testing/haskell-regex-base/PKGBUILD deleted file mode 100644 index d4e951cc6..000000000 --- a/community-testing/haskell-regex-base/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-base -pkgname=haskell-regex-base -pkgver=0.93.2 -pkgrel=7 -pkgdesc="Interface API for regex-posix,pcre,parsec,tdfa,dfa" -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/regex-base" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' sh 'haskell-mtl=2.1.2-1') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('e7b93b0b17eff8d3068ecb2f5d5f6ea3') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-regex-base/haskell-regex-base.install b/community-testing/haskell-regex-base/haskell-regex-base.install deleted file mode 100644 index 3ad2fea28..000000000 --- a/community-testing/haskell-regex-base/haskell-regex-base.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-base -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-regex-compat/PKGBUILD b/community-testing/haskell-regex-compat/PKGBUILD deleted file mode 100644 index c546442ec..000000000 --- a/community-testing/haskell-regex-compat/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-compat -pkgname=haskell-regex-compat -pkgver=0.95.1 -pkgrel=3 -pkgdesc="Replaces and enhances Text.Regex" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7' 'haskell-regex-posix=0.95.2-2') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('d0573ab4e2f3de5faa61380b67333320') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-regex-compat/haskell-regex-compat.install b/community-testing/haskell-regex-compat/haskell-regex-compat.install deleted file mode 100644 index 898c0bba1..000000000 --- a/community-testing/haskell-regex-compat/haskell-regex-compat.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-compat -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-regex-posix/PKGBUILD b/community-testing/haskell-regex-posix/PKGBUILD deleted file mode 100644 index 3c570e4d1..000000000 --- a/community-testing/haskell-regex-posix/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=regex-posix -pkgname=haskell-regex-posix -pkgver=0.95.2 -pkgrel=2 -pkgdesc="The posix regex backend for regex-base" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh' 'haskell-regex-base=0.93.2-7') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('1df0f9494aab110c7231f36393285c7c') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-regex-posix/haskell-regex-posix.install b/community-testing/haskell-regex-posix/haskell-regex-posix.install deleted file mode 100644 index 2b89fae7b..000000000 --- a/community-testing/haskell-regex-posix/haskell-regex-posix.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-regex-posix -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-stm/PKGBUILD b/community-testing/haskell-stm/PKGBUILD deleted file mode 100644 index fec52e949..000000000 --- a/community-testing/haskell-stm/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.5 -_hkgname=stm -pkgname=haskell-stm -pkgver=2.4 -pkgrel=1 -pkgdesc="A modular composable concurrency abstraction." -url="http://hackage.haskell.org/package/stm" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/$pkgver/${_hkgname}-$pkgver.tar.gz) -install=${pkgname}.install -md5sums=('fe8ab1a8231202f1748da53454cf55fc') - -build() { - cd ${srcdir}/${_hkgname}-$pkgver - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-$pkgver - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-stm/haskell-stm.install b/community-testing/haskell-stm/haskell-stm.install deleted file mode 100644 index 0283c2fc5..000000000 --- a/community-testing/haskell-stm/haskell-stm.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-stm -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-syb/PKGBUILD b/community-testing/haskell-syb/PKGBUILD deleted file mode 100644 index a2595bf2c..000000000 --- a/community-testing/haskell-syb/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# Maintainer: Rémy Oudompheng <remy@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -_hkgname=syb -pkgname=haskell-syb -pkgver=0.3.7 -pkgrel=1 -pkgdesc="A library for client-side HTTP" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' sh) -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('fa653976a4ee43918cc7546089f94b60') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared --prefix=/usr --docdir=/usr/share/doc/${pkgname} - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} - diff --git a/community-testing/haskell-syb/haskell-syb.install b/community-testing/haskell-syb/haskell-syb.install deleted file mode 100644 index 080055165..000000000 --- a/community-testing/haskell-syb/haskell-syb.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-syb -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch deleted file mode 100644 index b8c2264bc..000000000 --- a/community-testing/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch +++ /dev/null @@ -1,50 +0,0 @@ -From bd14edd6240c72baa22822338fc872e6827af680 Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Tue, 11 Sep 2012 06:24:09 -0700 -Subject: [PATCH] update changed time code for ghc 7.6.1 - ---- - Codec/Archive/Tar/Pack.hs | 9 +++++---- - tar.cabal | 2 +- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs -index 8e43091..0af6103 100644 ---- a/Codec/Archive/Tar/Pack.hs -+++ b/Codec/Archive/Tar/Pack.hs -@@ -28,8 +28,8 @@ import qualified System.FilePath as FilePath.Native - import System.Directory - ( getDirectoryContents, doesDirectoryExist, getModificationTime - , Permissions(..), getPermissions ) --import System.Time -- ( ClockTime(..) ) -+import Data.Time.Clock.POSIX -+ ( utcTimeToPOSIXSeconds ) - import System.IO - ( IOMode(ReadMode), openBinaryFile, hFileSize ) - import System.IO.Unsafe (unsafeInterleaveIO) -@@ -170,5 +170,6 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do - - getModTime :: FilePath -> IO EpochTime - getModTime path = do -- (TOD s _) <- getModificationTime path -- return $! fromIntegral s -+ utcTime <- getModificationTime path -+ let s = truncate . utcTimeToPOSIXSeconds $ utcTime -+ return $! s -diff --git a/tar.cabal b/tar.cabal -index e748b07..d85b0da 100644 ---- a/tar.cabal -+++ b/tar.cabal -@@ -25,7 +25,7 @@ source-repository head - - library - build-depends: base >= 3 && < 5, filepath, -- directory, old-time, bytestring -+ directory, bytestring, time - - exposed-modules: - Codec.Archive.Tar --- -1.7.12 - diff --git a/community-testing/haskell-tar/PKGBUILD b/community-testing/haskell-tar/PKGBUILD deleted file mode 100644 index ab2f5f8f4..000000000 --- a/community-testing/haskell-tar/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 77025 2012-10-03 15:25:16Z tdziedzic $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=haskell-tar -pkgver=0.4.0.0 -pkgrel=3 -pkgdesc="Reading, writing and manipulating \".tar\" archive files." -url="http://hackage.haskell.org/package/tar" -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.6.1-1') -source=("http://hackage.haskell.org/packages/archive/tar/$pkgver/tar-$pkgver.tar.gz" - '0001-update-changed-time-code-for-ghc-7.6.1.patch') -install=haskell-tar.install -sha256sums=('a3d37be1b8666c16c6371d193a0795b8abe7b0216e81870a2666e1e85d931113' - '17b8afc519db5bed5d89807e6e659788f5d9c2f5c569150a9d1c6faac52e98e6') - -build() { - cd "$srcdir/tar-$pkgver" - - # time functions have changed in ghc 7.6.1 - patch -Np1 -i ${srcdir}/0001-update-changed-time-code-for-ghc-7.6.1.patch - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/tar-$pkgver" - - install -Dm 744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m 744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm 755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/tar" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm 644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haskell-tar/haskell-tar.install b/community-testing/haskell-tar/haskell-tar.install deleted file mode 100644 index 7e0383621..000000000 --- a/community-testing/haskell-tar/haskell-tar.install +++ /dev/null @@ -1,24 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-tar - -post_install() { - ${HS_DIR}/register.sh - post_remove -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - post_install -} - -pre_remove() { - pre_upgrade -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haskell-terminfo/PKGBUILD b/community-testing/haskell-terminfo/PKGBUILD deleted file mode 100644 index 5ae271a8c..000000000 --- a/community-testing/haskell-terminfo/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 77026 2012-10-03 15:25:21Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -_hkgname=terminfo -pkgname=haskell-terminfo -pkgver=0.3.2.5 -pkgrel=1 -pkgdesc="Haskell bindings to the terminfo library." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('7ef09acfac9f6fc499ed3bb804ae2ab3') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-terminfo/haskell-terminfo.install b/community-testing/haskell-terminfo/haskell-terminfo.install deleted file mode 100644 index 40d39f42b..000000000 --- a/community-testing/haskell-terminfo/haskell-terminfo.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-terminfo -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-utf8-string/PKGBUILD b/community-testing/haskell-utf8-string/PKGBUILD deleted file mode 100644 index c9bb3acfd..000000000 --- a/community-testing/haskell-utf8-string/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 77027 2012-10-03 15:25:26Z tdziedzic $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Package generated by cabal2arch 0.7.6 -_hkgname=utf8-string -pkgname=haskell-utf8-string -pkgver=0.3.7 -pkgrel=3 -pkgdesc="Support for reading and writing UTF8 Strings" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'sh') -install=${pkgname}.install -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -md5sums=('50e5c395713e716e0e4a56da73f87ccd') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-utf8-string/haskell-utf8-string.install b/community-testing/haskell-utf8-string/haskell-utf8-string.install deleted file mode 100644 index 0f64366b2..000000000 --- a/community-testing/haskell-utf8-string/haskell-utf8-string.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-utf8-string -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-x11-xft/PKGBUILD b/community-testing/haskell-x11-xft/PKGBUILD deleted file mode 100644 index 5f2e744e6..000000000 --- a/community-testing/haskell-x11-xft/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 77029 2012-10-03 15:25:36Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_hkgname=X11-xft -pkgname=haskell-x11-xft -pkgver=0.3.1 -pkgrel=5 -pkgdesc="Bindings to the Xft, X Free Type interface library, and some Xrender parts" -url="http://hackage.haskell.org/package/${_hkgname}" -license=('LGPL') -arch=('i686' 'x86_64') -depends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-utf8-string=0.3.7' 'libxft') -options=('strip') -install=haskell-x11-xft.install -source=(http://hackage.haskell.org/packages/archive/X11-xft/$pkgver/X11-xft-$pkgver.tar.gz) -md5sums=('ad885150a59f63de328e73abe5ffc79e') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-x11-xft/haskell-x11-xft.install b/community-testing/haskell-x11-xft/haskell-x11-xft.install deleted file mode 100644 index a0ff8dac8..000000000 --- a/community-testing/haskell-x11-xft/haskell-x11-xft.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=/usr/share/haskell/haskell-x11-xft -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-x11/PKGBUILD b/community-testing/haskell-x11/PKGBUILD deleted file mode 100644 index 209ccbe86..000000000 --- a/community-testing/haskell-x11/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 77028 2012-10-03 15:25:31Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: shild <sxp@bk.ru> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> - -_hkgname=X11 -pkgname=haskell-x11 -pkgver=1.6.0.2 -pkgrel=1 -pkgdesc="A Haskell binding to the X11 graphics library." -arch=(i686 x86_64) -url="http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11" -license=('custom:BSD3') -options=('strip') -depends=("ghc=7.6.1-1" "haskell-syb=0.3.7" 'libx11' 'libxinerama' 'libxrandr') -conflicts=(haskell-x11-extras) -install=hsmod.install -source=(http://hackage.haskell.org/packages/archive/X11/$pkgver/X11-$pkgver.tar.gz) -md5sums=('0227ba7a8788c3cfd146e952a5fafc82') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/LICENSE -} diff --git a/community-testing/haskell-x11/hsmod.install b/community-testing/haskell-x11/hsmod.install deleted file mode 100644 index 45c23b979..000000000 --- a/community-testing/haskell-x11/hsmod.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-x11 -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/haskell-xhtml/PKGBUILD b/community-testing/haskell-xhtml/PKGBUILD deleted file mode 100644 index 7ccfca159..000000000 --- a/community-testing/haskell-xhtml/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -_hkgname=xhtml -pkgname=haskell-xhtml -pkgver=3000.2.1 -pkgrel=2 -pkgdesc='Combinators for producing XHTML 1.0' -url='http://hackage.haskell.org/package/xhtml' -license=('custom:BSD3') -arch=('x86_64' 'i686') -depends=('ghc=7.6.1-1' 'sh') -source=("http://hackage.haskell.org/packages/archive/$_hkgname/$pkgver/$_hkgname-$pkgver.tar.gz") -install=$pkgname.install -sha256sums=('33020782170c1c083bc59fc3bfcb72cec2db223e02d1181c07ae23b9fa7fdcd8') - -build() { - cd "$srcdir/$_hkgname-$pkgver" - - runhaskell Setup configure -O -p \ - --enable-split-objs \ - --enable-shared \ - --prefix=/usr \ - --docdir="/usr/share/doc/$pkgname" \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd "$srcdir/$_hkgname-$pkgver" - - install -Dm744 register.sh \ - "$pkgdir/usr/share/haskell/$pkgname/register.sh" - install -m744 unregister.sh \ - "$pkgdir/usr/share/haskell/$pkgname/unregister.sh" - install -dm755 "$pkgdir/usr/share/doc/ghc/html/libraries" - ln -s "/usr/share/doc/$pkgname/html" \ - "$pkgdir/usr/share/doc/ghc/html/libraries/$_hkgname" - runhaskell Setup copy --destdir="$pkgdir" - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - rm -f "$pkgdir/usr/share/doc/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/haskell-xhtml/haskell-xhtml.install b/community-testing/haskell-xhtml/haskell-xhtml.install deleted file mode 100644 index d03b8a053..000000000 --- a/community-testing/haskell-xhtml/haskell-xhtml.install +++ /dev/null @@ -1,19 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-xhtml -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh &> /dev/null - exit 0 -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/community-testing/hedgewars/PKGBUILD b/community-testing/hedgewars/PKGBUILD deleted file mode 100644 index 1eeee372a..000000000 --- a/community-testing/hedgewars/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 77031 2012-10-03 15:25:48Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=hedgewars -pkgver=0.9.17 -pkgrel=5 -pkgdesc="Free Worms-like turn based strategy game" -arch=('i686' 'x86_64') -url="http://hedgewars.org" -license=('GPL' 'custom') -depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') -makedepends=('fpc' 'cmake' - # haskell specific - 'ghc' - 'haskell-network' 'haskell-bytestring-show' - 'haskell-utf8-string' 'haskell-dataenc' - 'haskell-hslogger') -source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 - hedgewars.desktop - hedgewars.png) -md5sums=('77c0bc4bc664604adbba67fab606d8f1' - '48c66a3204d4fa0a69e9aa46f7c31e0c' - 'eeb14d50df39063549ac5eca9dbc65d1') - -build() { - cd $pkgname-src-$pkgver - -# sed -i 's|.*misc/liblua.*||' CMakeLists.txt - sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATA_INSTALL_DIR=/usr/share \ - -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \ - -DQT_MOC_EXECUTABLE=/usr/bin/moc \ - -DWITH_SERVER=1 . - - make -} - -package() { - cd $pkgname-src-$pkgver - - make DESTDIR=$pkgdir install - - install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt - install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png - install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop -} diff --git a/community-testing/hedgewars/hedgewars.desktop b/community-testing/hedgewars/hedgewars.desktop deleted file mode 100644 index 9d74ed3f1..000000000 --- a/community-testing/hedgewars/hedgewars.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Hedgewars -GenericName=Platform Game -Comment=Worms style game -Exec=hedgewars -Icon=hedgewars -Categories=Game;ArcadeGame;
\ No newline at end of file diff --git a/community-testing/hedgewars/hedgewars.png b/community-testing/hedgewars/hedgewars.png Binary files differdeleted file mode 100644 index 60ae66199..000000000 --- a/community-testing/hedgewars/hedgewars.png +++ /dev/null diff --git a/community-testing/homebank/PKGBUILD b/community-testing/homebank/PKGBUILD deleted file mode 100644 index 3ddacc089..000000000 --- a/community-testing/homebank/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 74951 2012-08-10 05:04:47Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=homebank -pkgver=4.4 -pkgrel=3 -pkgdesc="Free, easy, personal accounting for everyone" -arch=('i686' 'x86_64') -url="http://homebank.free.fr/" -license=('GPL') -depends=('desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'libofx' 'librsvg' 'perlxml' 'shared-mime-info') -makedepends=('intltool') -install=$pkgname.install -source=(http://homebank.free.fr/public/$pkgname-$pkgver.tar.gz) -sha256sums=('13b89373575e3ac229d2683aa7296778ad7cdae1a7a019c9124a1d5b23dce7d2') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/homebank/homebank.install b/community-testing/homebank/homebank.install deleted file mode 100644 index 3c862f44b..000000000 --- a/community-testing/homebank/homebank.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 -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/ibus/PKGBUILD b/community-testing/ibus/PKGBUILD deleted file mode 100644 index 63dd39df2..000000000 --- a/community-testing/ibus/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 78054 2012-10-16 11:51:03Z allan $ -# Contributor: Rainy <rainylau(at)gmail(dot)com> -# Contributor: Lee.MaRS <leemars at gmail dot com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - -pkgname=ibus -pkgver=1.4.2 -pkgrel=2 -pkgdesc="Next Generation Input Bus for Linux" -arch=('i686' 'x86_64') -url="http://ibus.googlecode.com" -license=('LGPL') -depends=('python2-dbus' 'gconf' 'dconf' 'python2-xdg' \ - 'iso-codes' 'librsvg' 'python2-notify' 'hicolor-icon-theme') -makedepends=('intltool' 'gobject-introspection') -optdepends=('notification-daemon') -options=('!libtool') -install=ibus.install -source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('a2d11d8bb64761691df918e9e50f0b35c711760d') - -build() { - cd ${pkgname}-${pkgver} - export PYTHON=python2 - ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ibus \ - --sysconfdir=/etc \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas \ - --enable-gtk3 - make -} - -package() { - cd ${pkgname}-${pkgver} - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/etc/xdg/autostart" - ln -s /usr/share/applications/ibus.desktop "${pkgdir}/etc/xdg/autostart/ibus.desktop" -} diff --git a/community-testing/ibus/ibus.install b/community-testing/ibus/ibus.install deleted file mode 100644 index f44e3be1d..000000000 --- a/community-testing/ibus/ibus.install +++ /dev/null @@ -1,29 +0,0 @@ -post_install() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - - gconfpkg --install ibus - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - - # update for gkt3 - gtk-query-immodules-3.0 --update-cache -} - -pre_upgrade() { - pre_remove $1 -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - gconfpkg --uninstall ibus -} - -post_remove() { - gtk-query-immodules-2.0 > etc/gtk-2.0/gtk.immodules - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - - # update for gkt3 - gtk-query-immodules-3.0 --update-cache -} diff --git a/community-testing/ifuse/PKGBUILD b/community-testing/ifuse/PKGBUILD deleted file mode 100644 index 7dd5e5bdf..000000000 --- a/community-testing/ifuse/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 74531 2012-07-29 23:18:52Z tomegun $ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Gabriel Martinez < reitaka at gmail dot com > - -pkgname=ifuse -pkgver=1.1.2 -pkgrel=2 -pkgdesc='A fuse filesystem to access the contents of an iPhone or iPod Touch' -url='http://libimobiledevice.org/' -arch=('i686' 'x86_64') -license=('LGPL2.1') -depends=('libimobiledevice' 'fuse') -source=("http://www.libimobiledevice.org/downloads/${pkgname}-${pkgver}.tar.bz2") -md5sums=('4152526b2ac3c505cb41797d997be14d') - -build() { - cd "${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/jack2/40-hpet-permissions.rules b/community-testing/jack2/40-hpet-permissions.rules deleted file mode 100644 index 7af3780f9..000000000 --- a/community-testing/jack2/40-hpet-permissions.rules +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="rtc0", GROUP="audio" -KERNEL=="hpet", GROUP="audio" diff --git a/community-testing/jack2/99-audio.conf b/community-testing/jack2/99-audio.conf deleted file mode 100644 index eb76ef920..000000000 --- a/community-testing/jack2/99-audio.conf +++ /dev/null @@ -1,2 +0,0 @@ -@audio - rtprio 99 -@audio - memlock unlimited diff --git a/community-testing/jack2/PKGBUILD b/community-testing/jack2/PKGBUILD deleted file mode 100644 index dd3ab36e0..000000000 --- a/community-testing/jack2/PKGBUILD +++ /dev/null @@ -1,135 +0,0 @@ -# $Id: PKGBUILD 76735 2012-09-28 16:17:58Z schiv $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Daniele Paolella <danielepaolella@email.it> -# Contributor: Philipp Überbacher <hollunder at gmx dot at> -# Contributor: Thomas Bahn <thomas-bahn at gmx dot net> - -pkgbase=jack2 -pkgname=('jack2' 'jack2-dbus') -#pkgname= # single build (overrides split) -_tarname=jack -pkgver=1.9.8 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://jackaudio.org/" -backup=(etc/security/limits.d/99-audio.conf) -license=('GPL') -makedepends=('python2' 'doxygen' 'libffado' - 'libsamplerate' 'dbus-core' 'celt') -source=("http://www.grame.fr/~letz/$_tarname-$pkgver.tgz" - '99-audio.conf' - '40-hpet-permissions.rules' - 'ffado_setbuffsize-jack2.patch') -md5sums=('1dd2ff054cab79dfc11d134756f27165' - 'ae65b7c9ebe0fff6c918ba9d97ae342d' - '471aad533ff56c5d3cbbf65ce32cadef' - '1502d82fe2276d6f224fff6467a0b6f9') - -_pyfix() { - sed -i 's:bin/env python:bin/env python2:' \ - "$pkgdir/usr/bin/jack_control" -} - -_wafconf() { - python2 waf configure --prefix=/usr \ - --alsa \ - --firewire \ - --doxygen $@ -} - -_isbuild() { - printf "%s\n" ${pkgname[@]} | grep -qx $1 -} - -build() { - cd "$srcdir/$_tarname-$pkgver" - - # backport firewire stuff - # - needed for setbuffsize feature in latest stable ffado - # from https://github.com/jackaudio/jack2/commit/96e0251 - ( - cd $_tarname-$pkgver - patch -Np1 -i "$srcdir/ffado_setbuffsize-jack2.patch" - ) - - # Some optimisation bug exists for current GCC - # see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53663 - export CFLAGS="${CFLAGS/-O[0-9]/-O0}" - export CXXFLAGS="$CFLAGS" - - # fix doxygen building - sed -i 's:build/default/html:html:' $_tarname-$pkgver/wscript - - # we may do 2 different builds - cp -r $_tarname-$pkgver $_tarname-dbus-$pkgver - - # mixed dbus/classic build - if _isbuild jack2; then - cd $_tarname-$pkgver - msg2 "Running Mixed D-Bus/Classic build" - _wafconf --classic --dbus - python2 waf build $MAKEFLAGS - cd .. - fi - - # dbus-ONLY build - if _isbuild jack2-dbus; then - cd $_tarname-dbus-$pkgver - msg2 "Running D-Bus-only build" - _wafconf --dbus - python2 waf build $MAKEFLAGS - cd .. - fi -} - -package_jack2() { - ! _isbuild jack2 && return 0 - - pkgdesc="The next-generation JACK with SMP support" - depends=('libsamplerate' 'celt') - optdepends=('libffado: FireWire support' - 'dbus-core: jackdbus' - 'python2: jack_control') - conflicts=('jack') - provides=('jack' 'jackmp' 'jackdmp' 'jackdbus') - - cd "$srcdir/$_tarname-$pkgver/$_tarname-$pkgver" - - python2 waf install --destdir="$pkgdir" - - # fix for major python transition - _pyfix - - # configure realtime access/scheduling - # see https://bugs.archlinux.org/task/26343 - install -Dm644 "$srcdir/99-audio.conf" \ - "$pkgdir/etc/security/limits.d/99-audio.conf" - - install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" -} - -package_jack2-dbus() { - ! _isbuild jack2-dbus && return 0 - - pkgdesc="The next-generation JACK with SMP support (for D-BUS interaction only)" - depends=('libsamplerate' 'celt' 'dbus-core') - optdepends=('libffado: FireWire support' - 'python2: jack_control') - conflicts=('jack' 'jack2') - provides=('jack' 'jack2' 'jackmp' 'jackdmp' 'jackdbus') - - cd "$srcdir/$_tarname-$pkgver/$_tarname-dbus-$pkgver" - - python2 waf install --destdir="$pkgdir" - - _pyfix - - install -Dm644 "$srcdir/99-audio.conf" \ - "$pkgdir/etc/security/limits.d/99-audio.conf" - - install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/jack2/ffado_setbuffsize-jack2.patch b/community-testing/jack2/ffado_setbuffsize-jack2.patch deleted file mode 100644 index 0c74aad24..000000000 --- a/community-testing/jack2/ffado_setbuffsize-jack2.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 96e0251234a29a1360c05d5d7dc98b83436b8183 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth <adi@drcomp.erfurt.thur.de> -Date: Sat, 17 Mar 2012 22:36:30 +0100 -Subject: [PATCH] [firewire] Allow FFADO backend to change the buffer size - -This is a port of Jonathan Woithe's patch from jackd1. -With sufficiently recent versions of FFADO, it allows to change -the buffersize at runtime. ---- - linux/firewire/JackFFADODriver.cpp | 65 ++++++++++++++++++++++++++++++++---- - linux/firewire/JackFFADODriver.h | 6 ++++ - 2 files changed, 65 insertions(+), 6 deletions(-) - -diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp -index b33e1cd..085b78a 100644 ---- a/linux/firewire/JackFFADODriver.cpp -+++ b/linux/firewire/JackFFADODriver.cpp -@@ -3,6 +3,7 @@ - Copyright (C) 2004 Grame - Copyright (C) 2007 Pieter Palmers - Copyright (C) 2009 Devin Anderson -+Copyright (C) 2012 Jonathan Woithe, Adrian Knoth - - 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 -@@ -48,7 +49,10 @@ - namespace Jack - { - -+// Basic functionality requires API version 8. If version 9 or later -+// is present the buffers can be resized at runtime. - #define FIREWIRE_REQUIRED_FFADO_API_VERSION 8 -+#define FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE 9 - - #define jack_get_microseconds GetMicroSeconds - -@@ -281,19 +285,68 @@ - int - JackFFADODriver::SetBufferSize (jack_nframes_t nframes) - { -- printError("Buffer size change requested but not supported!!!"); -+ ffado_driver_t* driver = (ffado_driver_t*)fDriver; -+ signed int chn; -+ -+ // The speed of this function isn't critical; we can afford the -+ // time to check the FFADO API version. -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION_FOR_SETBUFSIZE || -+ ffado_streaming_set_period_size == NULL) { -+ printError("unsupported on current version of FFADO; please upgrade FFADO"); -+ return -1; -+ } - -- /* - driver->period_size = nframes; - driver->period_usecs = - (jack_time_t) floor ((((float) nframes) / driver->sample_rate) - * 1000000.0f); -- */ -+ -+ -+ // Reallocate the null and scratch buffers. -+ driver->nullbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->nullbuffer == NULL) { -+ printError("could not allocate memory for null buffer"); -+ return -1; -+ } -+ driver->scratchbuffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(ffado_sample_t)); -+ if(driver->scratchbuffer == NULL) { -+ printError("could not allocate memory for scratch buffer"); -+ return -1; -+ } -+ -+ // MIDI buffers need reallocating -+ for (chn = 0; chn < driver->capture_nchannels; chn++) { -+ if(driver->capture_channels[chn].stream_type == ffado_stream_type_midi) { -+ // setup the midi buffer -+ if (driver->capture_channels[chn].midi_buffer != NULL) -+ free(driver->capture_channels[chn].midi_buffer); -+ driver->capture_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ for (chn = 0; chn < driver->playback_nchannels; chn++) { -+ if(driver->playback_channels[chn].stream_type == ffado_stream_type_midi) { -+ if (driver->playback_channels[chn].midi_buffer != NULL) -+ free(driver->playback_channels[chn].midi_buffer); -+ driver->playback_channels[chn].midi_buffer = (ffado_sample_t*) calloc(driver->period_size, sizeof(uint32_t)); -+ } -+ } -+ -+ // Notify FFADO of the period size change -+ if (ffado_streaming_set_period_size(driver->dev, nframes) != 0) { -+ printError("could not alter FFADO device period size"); -+ return -1; -+ } -+ -+ // This is needed to give the shadow variables a chance to -+ // properly update to the changes. -+ sleep(1); - - /* tell the engine to change its buffer size */ -- //driver->engine->set_buffer_size (driver->engine, nframes); -+ JackAudioDriver::SetBufferSize(nframes); // Generic change, never fails - -- return -1; // unsupported -+ UpdateLatencies(); -+ -+ return 0; - } - - typedef void (*JackDriverFinishFunction) (jack_driver_t *); -@@ -306,7 +359,7 @@ - - assert(params); - -- if (ffado_get_api_version() != FIREWIRE_REQUIRED_FFADO_API_VERSION) { -+ if (ffado_get_api_version() < FIREWIRE_REQUIRED_FFADO_API_VERSION) { - printError("Incompatible libffado version! (%s)", ffado_get_version()); - return NULL; - } -diff --git a/linux/firewire/JackFFADODriver.h b/linux/firewire/JackFFADODriver.h -index cb2a45d..790f4dd 100644 ---- a/linux/firewire/JackFFADODriver.h -+++ b/linux/firewire/JackFFADODriver.h -@@ -82,6 +82,12 @@ class JackFFADODriver : public JackAudioDriver - int Read(); - int Write(); - -+ // BufferSize can be changed -+ bool IsFixedBufferSize() -+ { -+ return false; -+ } -+ - int SetBufferSize(jack_nframes_t nframes); - }; - --- -1.7.10 - diff --git a/community-testing/kaudiocreator/PKGBUILD b/community-testing/kaudiocreator/PKGBUILD deleted file mode 100644 index 006ded8ca..000000000 --- a/community-testing/kaudiocreator/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 74662 2012-08-01 16:34:40Z andrea $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Nick B <Shirakawasuna at gmail _dot_com> - -pkgname=kaudiocreator -pkgver=1.3 -pkgrel=3 -pkgdesc="A program for ripping and encoding Audio-CDs, encoding files from disk" -arch=('i686' 'x86_64') -url="http://www.kde-apps.org/content/show.php/KAudioCreator?content=107645" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'taglib' 'libdiscid') -makedepends=('cmake' 'automoc4') -install="${pkgname}.install" -source=("http://www.kde-apps.org/CONTENT/content-files/107645-${pkgname}-${pkgver}.tar.bz2") -md5sums=('6adce848d3cdc9d80a52d35144890c86') - -build() { - cd ${srcdir} - - 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/community-testing/kaudiocreator/kaudiocreator.install b/community-testing/kaudiocreator/kaudiocreator.install deleted file mode 100644 index e70c054ec..000000000 --- a/community-testing/kaudiocreator/kaudiocreator.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/community-testing/kdenlive/PKGBUILD b/community-testing/kdenlive/PKGBUILD deleted file mode 100644 index 4e2c23a93..000000000 --- a/community-testing/kdenlive/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 77295 2012-10-08 15:05:15Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Zuf <kontakt.zuf@gmail.com> -# Contributor: Darwin Bautista <djclue917@gmail.com> - -pkgname=kdenlive -pkgver=0.9.2 -pkgrel=4 -pkgdesc="A non-linear video editor for Linux" -arch=('i686' 'x86_64') -# http://download.kde.org/stable/kdenlive/ -url="http://www.kdenlive.org/" -license=('GPL') -depends=('kdebase-runtime' 'mlt' 'dvgrab' 'qjson' 'qimageblitz' - 'libqzeitgeist') -makedepends=('automoc4' 'cmake' 'gettext' 'mesa' 'glu') -optdepends=('recordmydesktop' - 'dvdauthor' - 'mkisolinux' - 'xine-ui') -install=kdenlive.install -options=('docs') -source=(http://download.kde.org/stable/kdenlive/$pkgver/src/kdenlive-$pkgver.tar.bz2) -md5sums=('40f108f26e2c2e08807a1c183d8764ec') - -build() { - export LDFLAGS="$LDFLAGS -lX11" - cd "${srcdir}" - mkdir -p build - cd build - cmake ../kdenlive-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_INSTALL_DIR=/usr/lib \ - -DLINK_LIBRARIES=-lX11 - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/kdenlive/kdenlive.install b/community-testing/kdenlive/kdenlive.install deleted file mode 100644 index a3489ee9d..000000000 --- a/community-testing/kdenlive/kdenlive.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} 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/kmymoney/PKGBUILD b/community-testing/kmymoney/PKGBUILD deleted file mode 100644 index 537bb2420..000000000 --- a/community-testing/kmymoney/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 74952 2012-08-10 05:04:54Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Vamp898 <vamp898@web.de> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Todd Maynard <arch@toddmaynard.com> - -pkgname=kmymoney -pkgver=4.6.2 -pkgrel=2 -pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken" -arch=('i686' 'x86_64') -url="http://kmymoney2.sourceforge.net/" -license=('GPL') -depends=('kdebase-workspace' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs') -makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost') -replaces=('kmymoney2') -install=$pkgname.install -changelog=$pkgname.changelog -options=('!makeflags') -source=(http://downloads.sourceforge.net/project/kmymoney2/KMyMoney-KDE4/$pkgver/$pkgname-$pkgver.tar.bz2 -qt4.8.patch::https://projects.kde.org/projects/extragear/office/kmymoney/repository/revisions/c736b6f08e77df72d58c5b836b7b04f6098737df/diff/libkdchart/src/KDChartBackgroundAttributes.cpp?format=diff) -sha256sums=('add8acba2f0d4c212ac1c7fbbdad2fd43a24caceed586b13d90dcd2a20a12b75' - '7612b490400dbd4f80ff27bd328f8603a22279c81bb3004e53f48545dbd359ae') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Qt 4.8 fix - fixed upstream - patch -Np1 -i ../qt4.8.patch - - mkdir build - cd build - - cmake ../ \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES - make VERBOSE=1 -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}/build" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/kmymoney/kmymoney.changelog b/community-testing/kmymoney/kmymoney.changelog deleted file mode 100644 index 6943a0716..000000000 --- a/community-testing/kmymoney/kmymoney.changelog +++ /dev/null @@ -1,29 +0,0 @@ -2012-08-09 Eric Belanger <eric@archlinux.org> - * kmymoney 4.6.2-2 - * Rebuild against libofx 0.9.5 - -2011-02-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * kmymoney 4.5.3 - -2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * kmymoney 4.5.2 - -2010-10-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * kmymoney 4.5.1 - * Added aqbanking dependency - -2010-08-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 4.5 - * Package renamed to 'kmymoney' - -2010-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.0.5 - -2010-04-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.0.4 - -2010-04-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * FS#18974 broken OFX imported fixed in 1.0.3-2 - -2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 1.0.3 diff --git a/community-testing/kmymoney/kmymoney.install b/community-testing/kmymoney/kmymoney.install deleted file mode 100644 index f7f5bd0bf..000000000 --- a/community-testing/kmymoney/kmymoney.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/kphotoalbum/PKGBUILD b/community-testing/kphotoalbum/PKGBUILD deleted file mode 100644 index 52fc9551e..000000000 --- a/community-testing/kphotoalbum/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 74736 2012-08-02 15:33:12Z andrea $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com> -# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com> -# Contributor: chfoxli <lg ][ romandie ? com> - -pkgname=kphotoalbum -pkgver=4.2 -pkgrel=4 -pkgdesc="KDE Photo Album, picture collection manager" -url="http://www.kphotoalbum.org/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('kdebase-runtime' 'libkipi' 'libkdcraw') -makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs') -optdepends=('kdeedu-marble: integration with Marble' - 'kipi-plugins: add extra functionality' - 'kdemultimedia-mplayerthumbs: video thumbnails') -install=${pkgname}.install -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('7cb484089477f3633657b67ce59b85f2') - -build() { - cd ${srcdir} - - 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/community-testing/kphotoalbum/kphotoalbum.install b/community-testing/kphotoalbum/kphotoalbum.install deleted file mode 100644 index 6c87527e2..000000000 --- a/community-testing/kphotoalbum/kphotoalbum.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/community-testing/krename/PKGBUILD b/community-testing/krename/PKGBUILD deleted file mode 100644 index 50394605a..000000000 --- a/community-testing/krename/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 74730 2012-08-02 15:23:48Z andrea $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=krename -pkgver=4.0.9 -pkgrel=2 -pkgdesc="A very powerfull batch file renamer for KDE" -arch=('i686' 'x86_64') -url="http://www.krename.net" -license=('GPL') -depends=('kdebase-runtime' 'taglib') -makedepends=('cmake' 'automoc4') -options=('libtool') -install=krename.install -source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('03886a385a16de4c9bc285d25b9816ea97768c9e') - -build() { - cd "${srcdir}" - 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/community-testing/krename/krename.install b/community-testing/krename/krename.install deleted file mode 100644 index 1c0de2e4f..000000000 --- a/community-testing/krename/krename.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/community-testing/ktoblzcheck/PKGBUILD b/community-testing/ktoblzcheck/PKGBUILD deleted file mode 100644 index da749e7bd..000000000 --- a/community-testing/ktoblzcheck/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 78059 2012-10-16 11:51:20Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de> - -pkgname=ktoblzcheck -pkgver=1.39 -pkgrel=3 -pkgdesc="A library to check account numbers and bank codes of German banks" -arch=(i686 x86_64) -url="http://ktoblzcheck.sourceforge.net" -options=('!libtool') -license=("LGPL") -depends=('gcc-libs' 'python') -optdepends=('perl') -source=(http://downloads.sourceforge.net/sourceforge/ktoblzcheck/ktoblzcheck-$pkgver.tar.gz - ktoblzcheck-python3.patch) -md5sums=('ef5efd6e2c31aaf6405060ec477c200c' - 'a81a697bb3aaeffb7fac0ad7d9166e3f') - -build() { - cd "$srcdir/ktoblzcheck-$pkgver" - ./configure --prefix=/usr - patch -p1 <$srcdir/ktoblzcheck-python3.patch - make -} - -package() { - cd "$srcdir/ktoblzcheck-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/ktoblzcheck/ktoblzcheck-python3.patch b/community-testing/ktoblzcheck/ktoblzcheck-python3.patch deleted file mode 100644 index 5bfc53275..000000000 --- a/community-testing/ktoblzcheck/ktoblzcheck-python3.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur ktoblzcheck-1.28/src/python/ktoblzcheck.py ktoblzcheck-1.28.my/src/python/ktoblzcheck.py ---- ktoblzcheck-1.28/src/python/ktoblzcheck.py 2008-08-12 16:48:54.000000000 +0000 -+++ ktoblzcheck-1.28.my/src/python/ktoblzcheck.py 2010-09-20 09:08:36.000000000 +0000 -@@ -197,35 +197,35 @@ - - def test(): - a = AccountNumberCheck() -- print 'Number of Banks:', a.bankCount -- print 'find 20010020:', a.findBank('20010020') -- print 'find 20010033:', a.findBank('20010033') -- print 'check 20070024/9291394:', a.check('20070024','9291394') -- print 'check 20070024/9291394:', a.check('20070024','9291394023') -- print -+ print('Number of Banks:', a.bankCount) -+ print('find 20010020:', a.findBank('20010020')) -+ print('find 20010033:', a.findBank('20010033')) -+ print('check 20070024/9291394:', a.check('20070024','9291394')) -+ print('check 20070024/9291394:', a.check('20070024','9291394023')) -+ print() - ck = IbanCheck() - if not kto.IbanCheck_selftest(ck): # not publicly defined -- print "Self-Test failed!" -+ print("Self-Test failed!") - raise SystemExit - s = " iban fr14 2004 1010 0505 0001 3m02 606" -- print "test for iban :", s -+ print("test for iban :", s) - iban = Iban(s) -- print "transmission form:", iban.transmissionForm() -+ print("transmission form:", iban.transmissionForm()) - res = ck.check(iban) -- print "check result :", res, "("+IbanCheck.resultText(res)+")" -- print "printable form :", iban.printableForm() -- print -- print "expect bad checksum:" -+ print("check result :", res, "("+IbanCheck.resultText(res)+")") -+ print("printable form :", iban.printableForm()) -+ print() -+ print("expect bad checksum:") - s = "FR1420041010050500013X02606" - res = ck.check(s) -- print s + ":", res, "("+IbanCheck.resultText(res)+")" -- print -+ print(s + ":", res, "("+IbanCheck.resultText(res)+")") -+ print() - s = "IBAN DE66 2007 0024 0929 1394 00" -- print s -+ print(s) - s = Iban(s).transmissionForm() - start, end = ck.bic_position(s) -- print "prefix, checksum, BIC, account:" -- print ', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0'))) -+ print("prefix, checksum, BIC, account:") -+ print(', '.join((s[:2], s[2:4], s[start:end], s[end:].lstrip('0')))) - - - if __name__ == '__main__': diff --git a/community-testing/libextractor/PKGBUILD b/community-testing/libextractor/PKGBUILD deleted file mode 100644 index 1e9d064e7..000000000 --- a/community-testing/libextractor/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 78475 2012-10-19 13:29:52Z bluewind $ -# Maintainer: Sergej Pupykin <pupykin.s@gmail.com> -# Contributor: damir <damir@archlinux.org> - -pkgname=libextractor -pkgver=0.6.3 -pkgrel=8 -pkgdesc="A library used to extract meta-data from files of arbitrary type" -arch=("i686" "x86_64") -license=('GPL') -url="http://gnunet.org/libextractor/" -depends=('libltdl') -makedepends=('flac' 'poppler' 'exiv2' 'qt' 'libvorbis' 'gtk2' 'libgsf' 'libmpeg2') -optdepends=('flac: flac support' - 'poppler: pdf support' - 'exiv2: metadata support' - 'qt: the Qt GUI interface/thumbnails' - 'gtk2: gtk2 GUI interface/thumbnails' - 'libgsf: (optional) for ODF support' - 'libmpeg2: mpeg support' - 'libvorbis: ogg/vorbis support') -options=('!libtool' '!makeflags') -install=libextractor.install -source=("http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) -md5sums=('7004ff6be06e400050f0ad7016140981' - '81f95c31831dde62428a98ae32464c51') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-shared --disable-static - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install - rm ${pkgdir}/usr/share/info/dir -} diff --git a/community-testing/libextractor/libextractor.install b/community-testing/libextractor/libextractor.install deleted file mode 100644 index 1cf51e095..000000000 --- a/community-testing/libextractor/libextractor.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(extractor.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community-testing/libgexiv2/PKGBUILD b/community-testing/libgexiv2/PKGBUILD deleted file mode 100644 index 264648b17..000000000 --- a/community-testing/libgexiv2/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 74732 2012-08-02 15:23:56Z andrea $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> - -pkgname=libgexiv2 -pkgver=0.4.1 -pkgrel=3 -pkgdesc="GObject-based wrapper around the Exiv2 library." -arch=('i686' 'x86_64') -url="http://redmine.yorba.org/projects/gexiv2" -license=('GPL2') -depends=('exiv2' 'glib2') -options=('!libtool') -source=(http://yorba.org/download/gexiv2/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('b74cd19a4cf4a4a32a938ecb267974c29e630dc2') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/libnetfilter_cthelper/PKGBUILD b/community-testing/libnetfilter_cthelper/PKGBUILD deleted file mode 100644 index 3a051836e..000000000 --- a/community-testing/libnetfilter_cthelper/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 77374 2012-10-09 09:35:39Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=libnetfilter_cthelper -pkgver=1.0.0 -pkgrel=1 -pkgdesc='Library for the connection tracking helper infrastructure' -arch=('i686' 'x86_64') -url='http://www.netfilter.org/projects/libnetfilter_cthelper/' -license=('GPL2') -depends=('libmnl') -options=('!libtool') -source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('b2efab1a3a198a5add448960ba011acd') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/libnetfilter_cttimeout/PKGBUILD b/community-testing/libnetfilter_cttimeout/PKGBUILD deleted file mode 100644 index 53661d122..000000000 --- a/community-testing/libnetfilter_cttimeout/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 71339 2012-05-27 00:57:37Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgname=libnetfilter_cttimeout -pkgver=1.0.0 -pkgrel=2 -pkgdesc='Library for the connection tracking timeout infrastructure' -arch=('i686' 'x86_64') -url='http://www.netfilter.org/projects/libnetfilter_cttimeout/' -license=('GPL2') -depends=('libmnl' 'linux>=3.4') -options=('!libtool') -source=("http://www.netfilter.org/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2") -md5sums=('7697437fc9ebb6f6b83df56a633db7f9') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/lincity-ng/PKGBUILD b/community-testing/lincity-ng/PKGBUILD deleted file mode 100644 index 8f6d046ef..000000000 --- a/community-testing/lincity-ng/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 75765 2012-08-30 21:20:22Z lcarlier $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=lincity-ng -pkgver=2.0 -pkgrel=5.1 -pkgdesc="A city simulation game" -arch=('i686' 'x86_64') -url="https://fedorahosted.org/LinCity-NG" -license=('GPL' 'custom') -depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'physfs' 'libxml2' 'sdl_gfx' 'gcc-libs' 'libgl') -makedepends=('ftjam' 'mesa') -source=(http://sourceforge.net/projects/${pkgname}.berlios/files/${pkgname}-${pkgver}.tar.bz2) -sha1sums=('2961a3f60f7481b33858d7d5ef7cf9c788d01077') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - jam -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - jam -sprefix="${pkgdir}/usr" install - install -D -m644 COPYING-data.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-data.txt" - install -D -m644 COPYING-fonts.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING-fonts.txt" -} diff --git a/community-testing/luajit/Makefile.patch b/community-testing/luajit/Makefile.patch deleted file mode 100644 index 69e172145..000000000 --- a/community-testing/luajit/Makefile.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.orig 2011-12-14 15:15:00.000000000 +0100 -+++ Makefile 2012-03-04 14:53:43.137778596 +0100 -@@ -41,7 +41,7 @@ - INSTALL_MAN= $(INSTALL_SHARE)/man/man1 - INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig - --INSTALL_TNAME= luajit-$(VERSION) -+INSTALL_TNAME= $(INSTALL_TSYMNAME) - INSTALL_TSYMNAME= luajit - INSTALL_ANAME= libluajit-$(ABIVER).a - INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) diff --git a/community-testing/luajit/PKGBUILD b/community-testing/luajit/PKGBUILD deleted file mode 100644 index bd1906fe0..000000000 --- a/community-testing/luajit/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 67113 2012-03-04 14:27:50Z bpiotrowski $ -# Maintainer: Chris Brannon <chris@the-brannons.com> -# Maintainer: Bartłomiej Piotrowski -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Contributor: Anders Bergh <anders1@gmail.com> - -pkgname=luajit -pkgver=2.0.0b9 -pkgrel=1 -pkgdesc="A Just-In-Time Compiler for Lua" -arch=('i686' 'x86_64') -url="http://luajit.org/" -license=('MIT') -depends=('gcc-libs') -source=("http://luajit.org/download/LuaJIT-${pkgver/b/-beta}.tar.gz" - "http://luajit.org/download/beta${pkgver: -1}_hotfix1.patch" - 'luaconf.patch' - 'Makefile.patch') -md5sums=('e7e03e67e2550817358bc28b44270c6d' - '4920f04fcef1ce486891509faf26b4f1' - 'c8da9c6790e20a12a0e2496f438d9dc3' - '8997c5e5fa4f6e8e0b86cc6b888de631') - -build() { - cd "$srcdir/LuaJIT-${pkgver/b/-beta}" - - patch -Np1 -i "$srcdir/beta${pkgver: -1}_hotfix1.patch" - patch -Np0 -i "$srcdir/luaconf.patch" - patch -Np0 -i "$srcdir/Makefile.patch" - - make -} - -package() { - cd "$srcdir/LuaJIT-${pkgver/b/-beta}" - make install DESTDIR="$pkgdir" PREFIX=/usr - - install -Dm644 "$srcdir/LuaJIT-${pkgver/b/-beta}/COPYRIGHT" \ - "$pkgdir/usr/share/licenses/$pkgname/COPYRIGHT" -} diff --git a/community-testing/luajit/luaconf.patch b/community-testing/luajit/luaconf.patch deleted file mode 100644 index ba9373b52..000000000 --- a/community-testing/luajit/luaconf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/luaconf.h.orig 2010-08-24 15:00:00.000000000 +0200 -+++ src/luaconf.h 2010-09-06 15:52:22.043333530 +0200 -@@ -33,7 +33,7 @@ - #define LUA_CPATH_DEFAULT \ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #ifdef LUA_XROOT diff --git a/community-testing/luajit/luajit-arch.patch b/community-testing/luajit/luajit-arch.patch deleted file mode 100644 index 689a87d4e..000000000 --- a/community-testing/luajit/luajit-arch.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN LuaJIT-1.1.4.orig/src/luaconf.h LuaJIT-1.1.3/src/luaconf.h ---- LuaJIT-1.1.4.orig/src/luaconf.h 2007-05-24 13:30:00.000000000 +0200 -+++ LuaJIT-1.1.4/src/luaconf.h 2007-11-02 06:28:59.000000000 +0100 -@@ -94,7 +94,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD deleted file mode 100644 index 342141efa..000000000 --- a/community-testing/luminancehdr/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 74737 2012-08-02 15:36:57Z andrea $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Dmitry N. Shilov <stormblast@land.ru> - -pkgname=luminancehdr -pkgver=2.3.0 -pkgrel=2 -pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' -arch=('i686' 'x86_64') -url='http://qtpfsgui.sourceforge.net/' -license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit') -makedepends=('cmake') -optdepends=('hugin: align image stack functionality') -install=$pkgname.install -changelog=$pkgname.changelog -options=('!emptydirs') -source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) -sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676') - -build() { - cd ${srcdir}/luminance-hdr-${pkgver} - - cmake -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/luminance-hdr-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog deleted file mode 100644 index c3c1f1197..000000000 --- a/community-testing/luminancehdr/luminancehdr.changelog +++ /dev/null @@ -1,45 +0,0 @@ -2012-07-30 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * luminancehdr 2.3.0-2 exiv2-0.23 rebuild - -2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * luminancehdr 2.3.0-1 - -2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * luminancehdr 2.2.1-1 - -2012-01-27 Eric Belanger <eric@archlinux.org> - * Rebuild against libpng 1.5 and libtiff 4.0 - -2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * luminancehdr 2.1.0-1 - -2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * luminancehdr 2.0.2-1 - -2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * exiv2 0.20 rebuild - -2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.0.1 - -2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package renamed to LuminanceHDR - * Update to major release 2.0.0 - -2010-03-09 Andrea Scarpino <andrea@archlinux.org> - * exiv2 0.19 rebuild - -2009-11-02 Biru Ionut <ionut@archlinux.ro> - * add translation and fix segfault on old i686 procesors - -2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release v1.9.3 - -2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Minor version (v1.9.2-3) update caused by exiv2 upgrade. - -2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Minor version (v1.9.2-2) update caused by openexr upgrade. - -2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Package moved to [community] diff --git a/community-testing/luminancehdr/luminancehdr.install b/community-testing/luminancehdr/luminancehdr.install deleted file mode 100644 index 279762804..000000000 --- a/community-testing/luminancehdr/luminancehdr.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/luxrays/PKGBUILD b/community-testing/luxrays/PKGBUILD deleted file mode 100644 index 6bc26c17c..000000000 --- a/community-testing/luxrays/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 78154 2012-10-16 13:53:31Z allan $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=luxrays -pkgver=1.1 -_pkgver=589aa5dac899 -pkgrel=1 -epoch=0 -pkgdesc="Accelerate the ray intersection process by using GPUs" -arch=('i686' 'x86_64') -url="http://www.luxrender.net/" -license=('GPL') -depends=('freeimage' 'freeglut' 'glew' 'libcl') -makedepends=('cmake' 'boost' 'opencl-headers') -source=(https://bitbucket.org/luxrender/luxrays/get/$_pkgver.tar.bz2) -md5sums=('7513d71148fa14bc1779b816816580b9') - -build() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - . - make -} - -package() { - cd "$srcdir/luxrender-$pkgname-$_pkgver" - - install -d -m755 "$pkgdir"/usr/{bin,include,lib} - install -m755 bin/* "$pkgdir"/usr/bin - install -m644 lib/* "$pkgdir"/usr/lib - cp -a include/luxrays "$pkgdir"/usr/include -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/luxrender/PKGBUILD b/community-testing/luxrender/PKGBUILD deleted file mode 100644 index 01680e4f8..000000000 --- a/community-testing/luxrender/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 78061 2012-10-16 11:51:31Z allan $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Initial contributor: flixie <69one@gmx.net> -# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org> -pkgname=luxrender -pkgver=1.1 -_pkgver=4b4289cda943 -pkgrel=1 -pkgdesc="Rendering system for physically correct, unbiased image synthesis" -arch=('i686' 'x86_64') -url="http://www.luxrender.net/" -license=('GPL') -depends=('boost-libs' 'freeimage' 'openexr' 'libcl') -optdepends=('luxblend25: Blender exporter' 'qt: Qt GUI' \ - 'python: Python interface (pylux)' - 'nvidia-utils: OpenCL support for nVidia GPUs' \ - 'amdstream: OpenCL support for AMD GPUs' \ - 'intel-opencl-sdk: OpenCL support for Intel CPUs') -makedepends=('cmake' 'boost' 'qt' "luxrays=$pkgver" 'python' 'opencl-headers') -source=(https://bitbucket.org/luxrender/lux/get/$_pkgver.tar.bz2) -md5sums=('accca65afdc4cc38db49a6e54f20e0f2') - -build() { - cd "$srcdir"/luxrender-lux-$_pkgver - - # fix the installation - sed -i '/.*wxgui.*/ d' CMakeLists.txt - - export CXXFLAGS="$CXXFLAGS -lpthread" - cmake -DCMAKE_INSTALL_PREFIX=/usr \ - -DLUXRAYS_DISABLE_OPENCL=OFF \ - -DPYTHON_CUSTOM=ON \ - -DPYTHON_LIBRARIES=/usr/lib/libpython3.3m.so \ - -DPYTHON_INCLUDE_PATH=/usr/include/python3.3m/ \ - . - make -} - -package() { - cd "$srcdir"/luxrender-lux-$_pkgver - make DESTDIR="$pkgdir" install - - # fix library path on x86_64 - [ "$CARCH" = "x86_64" ] && mv "$pkgdir"/usr/lib64 "$pkgdir"/usr/lib - - #install pylux - install -D -m644 pylux.so "$pkgdir"/usr/lib/python3.3/pylux.so -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/lxdm/PKGBUILD b/community-testing/lxdm/PKGBUILD deleted file mode 100644 index 36a9ec902..000000000 --- a/community-testing/lxdm/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 78734 2012-10-23 20:39:03Z dwallace $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: AndyRTR <andyrtr@archlinux.org> -# Contributor: kiefer <jorgelmadrid@gmail.com> - -pkgname=lxdm -pkgver=0.4.1 -pkgrel=18 -pkgdesc='Lightweight X11 Display Manager' -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/lxdm/" -license=('GPL') -groups=('lxde') -depends=('gtk2' 'xorg-server') -makedepends=('intltool') -install=${pkgname}.install -backup=('etc/lxdm/lxdm.conf' 'etc/pam.d/lxdm' 'etc/lxdm/Xsession' - 'etc/lxdm/PreLogin' 'etc/lxdm/LoginReady' 'etc/lxdm/PostLogin' - 'etc/lxdm/PostLogout' 'etc/lxdm/PreReboot' 'etc/lxdm/PreShutdown') -source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz - glib2-2.32.0.patch lxdm.patch lxdm.conf.patch Xsession.patch - greeter-session.patch pam-env-vars.patch industrial-greeterui.patch - rc.d lxdm-pam service) - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np1 -i $srcdir/glib2-2.32.0.patch - patch -Np1 -i $srcdir/greeter-session.patch - patch -Np1 -i $srcdir/pam-env-vars.patch - - ./configure --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib/lxdm - make - - patch -Np0 -i $srcdir/lxdm.patch - patch -Np0 -i $srcdir/lxdm.conf.patch - patch -Np0 -i $srcdir/Xsession.patch - patch -Np0 -i $srcdir/industrial-greeterui.patch -} - - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - install -m644 $srcdir/lxdm-pam $pkgdir/etc/pam.d/lxdm - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/lxdm - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/lxdm.service - install -d $pkgdir/var/{lib,run}/lxdm - - # fix the greeter location - sed -i -e 's/local\/libexec/lib\/lxdm/' $pkgdir/etc/lxdm/lxdm.conf - - # avoid conflict with filesystem>=2012.06 - rm -r $pkgdir/var/run -} - -md5sums=('8da1cfc2be6dc9217c85a7cf51e1e821' - 'a1e3c46a8bef691bc544028f5b6cfe22' - 'baed9055e8825a5511712bc095197519' - 'c50dd01b715b0a236407d48066191601' - 'd2e4a4a22ee2aa1a986be154c647b6c6' - '28475239d0c8b4fd778ec49f5ec72962' - '4c1d43e81e9a256e8d1ea7686c24b3d3' - '2c4afdbe3532be4f90d8f6240d352766' - '705f394052fdd0dec22e95321d170de0' - '9cc734228696a3c6f06d91bba61b03c1' - 'e8cc66eb1a2405d2d9d184a727cbd9d8') - diff --git a/community-testing/lxdm/Xsession.patch b/community-testing/lxdm/Xsession.patch deleted file mode 100644 index 035ff0383..000000000 --- a/community-testing/lxdm/Xsession.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/Xsession.orig 2011-07-29 15:42:33.000000000 +0200 -+++ data/Xsession 2011-12-03 09:09:14.592876087 +0100 -@@ -9,6 +9,8 @@ - LXSESSION=/usr/bin/startlxde - fi - -+[ -f /etc/profile ] && . /etc/profile -+[ -f ~/.profile ] && . ~/.profile - [ -f /etc/xprofile ] && . /etc/xprofile - [ -f ~/.xprofile ] && . ~/.xprofile - diff --git a/community-testing/lxdm/glib2-2.32.0.patch b/community-testing/lxdm/glib2-2.32.0.patch deleted file mode 100644 index cebfc6133..000000000 --- a/community-testing/lxdm/glib2-2.32.0.patch +++ /dev/null @@ -1,21 +0,0 @@ -From: dgod <dgod.osa@gmail.com> -Date: Sun, 25 Dec 2011 07:23:19 +0000 (+0800) -Subject: fix event check bug caused cpu 100% -X-Git-Url: http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde%2Flxdm;a=commitdiff_plain;h=d4e41ecb;hp=f0951bdf736026b041001e846d2cb93f7f2852e1 - -fix event check bug caused cpu 100% ---- - -diff --git a/src/lxcom.c b/src/lxcom.c -index 02763eb..18ee12e 100644 ---- a/src/lxcom.c -+++ b/src/lxcom.c -@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout) - - static gboolean lxcom_check(GSource *source) - { -- return TRUE; -+ return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE; - } - - static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data) diff --git a/community-testing/lxdm/greeter-session.patch b/community-testing/lxdm/greeter-session.patch deleted file mode 100644 index f3b94a57a..000000000 --- a/community-testing/lxdm/greeter-session.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/greeter.c b/src/greeter.c -index c0c150d..1f6b88e 100644 ---- a/src/greeter.c -+++ b/src/greeter.c -@@ -114,7 +114,7 @@ static char *get_session_exec(void) - GtkTreeModel* model; - GtkTreeIter it; - gchar *res; -- if(!lang) -+ if(!sessions) - return g_strdup(""); - - if(!gtk_combo_box_get_active_iter(GTK_COMBO_BOX(sessions), &it)) diff --git a/community-testing/lxdm/industrial-greeterui.patch b/community-testing/lxdm/industrial-greeterui.patch deleted file mode 100644 index a2a366809..000000000 --- a/community-testing/lxdm/industrial-greeterui.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- data/themes/Industrial/greeter.ui.orig 2012-05-09 23:54:03.743980613 -0300 -+++ data/themes/Industrial/greeter.ui 2012-05-10 00:26:20.340687396 -0300 -@@ -201,7 +201,9 @@ - </packing> - </child> - <child> -- <object class="GtkComboBoxEntry" id="keyboard"/> -+ <object class="GtkComboBoxEntry" id="keyboard"> -+ <property name="text_column">0</property> -+ </object> - <packing> - <property name="expand">False</property> - <property name="position">3</property> diff --git a/community-testing/lxdm/lxdm-pam b/community-testing/lxdm/lxdm-pam deleted file mode 100644 index 57f33b221..000000000 --- a/community-testing/lxdm/lxdm-pam +++ /dev/null @@ -1,10 +0,0 @@ -#%PAM-1.0 -auth requisite pam_nologin.so -auth required pam_env.so -auth required pam_unix.so -account required pam_unix.so -session required pam_limits.so -session required pam_unix.so -password required pam_unix.so --session optional pam_loginuid.so --session optional pam_systemd.so diff --git a/community-testing/lxdm/lxdm.conf.patch b/community-testing/lxdm/lxdm.conf.patch deleted file mode 100644 index 1744e557e..000000000 --- a/community-testing/lxdm/lxdm.conf.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/lxdm.conf.orig 2011-11-01 17:57:59.208757577 +0100 -+++ data/lxdm.conf 2011-11-01 18:03:55.608741945 +0100 -@@ -27,7 +27,7 @@ - gtk_theme=Clearlooks - - ## background of the greeter --bg=/usr/share/backgrounds/default.png -+# bg=/usr/share/backgrounds/default.png - - ## if show bottom pane - bottom_pane=1 diff --git a/community-testing/lxdm/lxdm.install b/community-testing/lxdm/lxdm.install deleted file mode 100644 index 4d1285dc5..000000000 --- a/community-testing/lxdm/lxdm.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - if ! getent group lxdm > /dev/null ; then - groupadd --system lxdm - chgrp -R lxdm /var/lib/lxdm - chgrp lxdm /etc/lxdm/lxdm.conf - chmod +r /etc/lxdm/lxdm.conf - fi -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - if ! getent group lxdm > /dev/null ; then - groupdel lxdm - fi -} diff --git a/community-testing/lxdm/lxdm.patch b/community-testing/lxdm/lxdm.patch deleted file mode 100644 index a703a386d..000000000 --- a/community-testing/lxdm/lxdm.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- data/lxdm.orig 2010-01-24 16:58:42.262866825 -0200 -+++ data/lxdm 2010-01-19 11:56:34.308668692 -0200 -@@ -1,21 +1,13 @@ - #!/bin/sh - --[ -f /etc/sysconfig/i18n ] && . /etc/sysconfig/i18n -- --if [ -z "$LANG" -a -e /etc/sysconfig/language ]; then -- . /etc/sysconfig/language -- if [ -n "$RC_LANG"]; then -- LANG=$RC_LANG -- fi -+if [ -r /etc/profile.d/locale.sh ]; then -+ . /etc/profile.d/locale.sh - fi - - if [ -n "$LANG" ]; then - export LANG - fi - --[ -f /etc/sysconfig/desktop ] && . /etc/sysconfig/desktop --[ -f /etc/sysconfig/windowmanager ] && . /etc/sysconfig/windowmanager -- - if [ -n "$DEFAULT_WM" ]; then - PREFERRED=$DEFAULT_WM - fi diff --git a/community-testing/lxdm/pam-env-vars.patch b/community-testing/lxdm/pam-env-vars.patch deleted file mode 100644 index ab8605ff1..000000000 --- a/community-testing/lxdm/pam-env-vars.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/src/lxdm.c b/src/lxdm.c -index 369aedf..cd1d486 100644 ---- a/src/lxdm.c -+++ b/src/lxdm.c -@@ -935,16 +935,23 @@ void setup_pam_session(LXSession *s,struct passwd *pw,char *session_name) - g_warning( "pam open session error \"%s\"\n", pam_strerror(s->pamh, err)); - } - --void append_pam_environ(pam_handle_t *pamh,char **env) -+static char **append_pam_environ(pam_handle_t *pamh,char **env) - { -- int i,j,n; -+ int i,j,n,a; - char **penv; -- if(!pamh) return; -+ if(!pamh) return env; - penv=pam_getenvlist(pamh); -- if(!penv) return; -+ if(!penv) return env; -+ a=g_strv_length(penv); -+ if(a==0) -+ { -+ free(penv); -+ return env; -+ } -+ env=g_renew(char *,env,g_strv_length(env)+1+a+10); - for(i=0;penv[i]!=NULL;i++) - { -- //printf("PAM %s\n",penv[i]); -+ fprintf(stderr,"PAM %s\n",penv[i]); - n=strcspn(penv[i],"=")+1; - for(j=0;env[j]!=NULL;j++) - { -@@ -960,6 +967,7 @@ void append_pam_environ(pam_handle_t *pamh,char **env) - free(penv[i]); - } - free(penv); -+ return env; - } - - #endif -@@ -1540,7 +1548,7 @@ void lxdm_do_login(struct passwd *pw, char *session, char *lang, char *option) - if(s->child==0) - { - #if HAVE_LIBPAM -- append_pam_environ(s->pamh,env); -+ env=append_pam_environ(s->pamh,env); - pam_end(s->pamh,0); - #endif - switch_user(pw, session_exec, env); diff --git a/community-testing/lxdm/rc.d b/community-testing/lxdm/rc.d deleted file mode 100644 index 68eb6225d..000000000 --- a/community-testing/lxdm/rc.d +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=$(pidof -o %PPID `which lxdm-binary`) -case "$1" in - start) - stat_busy "Starting LXDM Display Manager" - [ -z "$PID" ] && /usr/sbin/lxdm -d &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lxdm - stat_done - fi - ;; - stop) - stat_busy "Stopping LXDM Display Manager" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lxdm - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/lxdm/service b/community-testing/lxdm/service deleted file mode 100644 index e1840476c..000000000 --- a/community-testing/lxdm/service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=LXDE Display Manager -After=systemd-user-sessions.service - -[Service] -ExecStart=/usr/sbin/lxdm - -[Install] -Alias=display-manager.service diff --git a/community-testing/mailman/PKGBUILD b/community-testing/mailman/PKGBUILD deleted file mode 100644 index 98872285f..000000000 --- a/community-testing/mailman/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 73798 2012-07-15 16:51:10Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Paul Mattal <paul@archlinux.org> - -pkgname=mailman -pkgver=2.1.15 -pkgrel=2 -pkgdesc='The GNU Mailing List Manager' -arch=(i686 x86_64) -license=('GPL') -url='http://www.list.org/' -depends=('glibc' 'python2' 'smtp-server') -# we need to have the mailman user to build mailman -makedepends=('mailman') -# 'Defaults.py' should not be changed by users; 'mm_cfg.py' should instead. -backup=('usr/lib/mailman/Mailman/mm_cfg.py') -install=$pkgname.install -source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tgz" - 'mailman-2.1-build.patch' - "$pkgname.profile.sh" - "$pkgname.profile.csh" - "$pkgname.rc" - "$pkgname.service") -md5sums=('7d207489e8e9de0727cb334d46029833' - 'ed04d062379eb21e39ce1e70e6b1ade2' - 'a9c71ec940c56173415fbd49087d10b0' - '85a8c30ffc444e677b286f54df530482' - '3a4014c15e9923451f5f282860896057' - 'f3ea6ef02ab135274406ce52ea8bbb7b') - -build() { - cd $pkgname-$pkgver - # some files in mailman doesn't use configure parameter - find . -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; - # fix directory permissions to satisfy check_perms - patch -p1 -i "$srcdir/mailman-2.1-build.patch" - # set some sane defaults before the configure script has a chance to screw them up - ./configure \ - --without-permcheck \ - --prefix=/usr/lib/mailman \ - --with-var-prefix=/var/lib/mailman \ - --with-mail-gid=mailman \ - --with-username=mailman \ - --with-groupname=mailman \ - --with-cgi-gid=http \ - --with-python=/usr/bin/python2 \ - --with-mailhost=localhost \ - --with-urlhost=localhost - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - - # let's follow Fedora FHS way; Gentoo does it the other way round - - # Create a link so that the config file mm_cfg.py appears in config - # directory /etc/mailman. We don't put mm_cfg.py in the config directory - # because its executable code (python file) and the security policy wants - # to keep executable code out of /etc and inside of a lib directory instead, - # and because traditionally mm_cfg.py was in the Mailman subdirectory and - # experienced mailman admins will expect to find it there. But having it - # "appear" in the config directory is good practice and heading in the - # right direction for FHS compliance. - install -d -m755 "$pkgdir/etc/$pkgname" - ln -sv /usr/lib/mailman/Mailman/mm_cfg.py "$pkgdir/etc/$pkgname/mm_cfg.py" - # fix some permissions to satisfy check_perms - chown -R mailman:mailman "$pkgdir"/{usr/lib/mailman,var/lib/mailman,etc/mailman/*} - chown http:mailman "$pkgdir"/var/lib/mailman/archives/private - chmod 2770 "$pkgdir"/var/lib/mailman/archives/private - chmod 2755 "$pkgdir"/usr/lib/mailman/cgi-bin/* - chmod 2755 "$pkgdir"/usr/lib/mailman/mail/mailman - cd "$srcdir" - # install initscripts - install -Dm 755 $pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - # install systemd service - install -Dm 644 $pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" - # install profiles - install -Dm 755 $pkgname.profile.sh "$pkgdir/etc/profile.d/$pkgname.sh" - install -Dm 755 $pkgname.profile.csh "$pkgdir/etc/profile.d/$pkgname.csh" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/mailman/mailman-2.1-build.patch b/community-testing/mailman/mailman-2.1-build.patch deleted file mode 100644 index d00613ad7..000000000 --- a/community-testing/mailman/mailman-2.1-build.patch +++ /dev/null @@ -1,694 +0,0 @@ -diff -ruN mailman-2.1.12-a/bin/Makefile.in mailman-2.1.12-b/bin/Makefile.in ---- mailman-2.1.12-a/bin/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/bin/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -56,7 +55,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -72,8 +71,6 @@ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(SCRIPTSDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/cron/Makefile.in mailman-2.1.12-b/cron/Makefile.in ---- mailman-2.1.12-a/cron/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/cron/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -68,8 +67,6 @@ - $(INSTALL) -m $(EXEMODE) $(BUILDDIR)/$$f $(DESTDIR)$(CRONDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Archiver/Makefile.in mailman-2.1.12-b/Mailman/Archiver/Makefile.in ---- mailman-2.1.12-a/Mailman/Archiver/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Archiver/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -47,7 +46,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -63,8 +62,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Bouncers/Makefile.in mailman-2.1.12-b/Mailman/Bouncers/Makefile.in ---- mailman-2.1.12-a/Mailman/Bouncers/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Bouncers/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Cgi/Makefile.in mailman-2.1.12-b/Mailman/Cgi/Makefile.in ---- mailman-2.1.12-a/Mailman/Cgi/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Cgi/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -47,7 +46,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -63,8 +62,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(CGIDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Commands/Makefile.in mailman-2.1.12-b/Mailman/Commands/Makefile.in ---- mailman-2.1.12-a/Mailman/Commands/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Commands/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Gui/Makefile.in mailman-2.1.12-b/Mailman/Gui/Makefile.in ---- mailman-2.1.12-a/Mailman/Gui/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Gui/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Handlers/Makefile.in mailman-2.1.12-b/Mailman/Handlers/Makefile.in ---- mailman-2.1.12-a/Mailman/Handlers/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Handlers/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Logging/Makefile.in mailman-2.1.12-b/Mailman/Logging/Makefile.in ---- mailman-2.1.12-a/Mailman/Logging/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Logging/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Makefile.in mailman-2.1.12-b/Mailman/Makefile.in ---- mailman-2.1.12-a/Mailman/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -20,8 +20,6 @@ - - # Variables set by configure - --VERSION= @VERSION@ -- - VPATH= @srcdir@ - srcdir= @srcdir@ - bindir= @bindir@ -@@ -30,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -48,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -79,12 +76,6 @@ - (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ - done - --finish: -- @for d in $(SUBDIRS); \ -- do \ -- (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) finish); \ -- done -- - clean: - for d in $(SUBDIRS); \ - do \ -diff -ruN mailman-2.1.12-a/Mailman/MTA/Makefile.in mailman-2.1.12-b/Mailman/MTA/Makefile.in ---- mailman-2.1.12-a/Mailman/MTA/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/MTA/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Mailman/Queue/Makefile.in mailman-2.1.12-b/Mailman/Queue/Makefile.in ---- mailman-2.1.12-a/Mailman/Queue/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Mailman/Queue/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -45,7 +44,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,8 +60,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/$$f $(DESTDIR)$(PACKAGEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/Makefile.in mailman-2.1.12-b/Makefile.in ---- mailman-2.1.12-a/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -61,11 +61,10 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) --DIRSETGID= chmod g+s - - DATE = $(shell python -c 'import time; print time.strftime("%d-%b-%Y"),') - LANGPACK = README-I18N.en templates messages -@@ -85,14 +84,24 @@ - - doinstall: $(SUBDIRS) - @echo "Creating architecture independent directories..." -+ dir=$(DESTDIR)$(prefix); \ -+ if test ! -d $$dir; then \ -+ echo "Creating directory hierarchy $$dir"; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ -+ else true; \ -+ fi; -+ dir=$(DESTDIR)$(var_prefix); \ -+ if test ! -d $$dir; then \ -+ echo "Creating directory hierarchy $$dir"; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ -+ else true; \ -+ fi; - @for d in $(VAR_DIRS); \ - do \ - dir=$(DESTDIR)$(var_prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ -- $(srcdir)/mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - else true; \ - fi; \ - done -@@ -102,9 +111,7 @@ - dir=$(DESTDIR)$(prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ -- $(srcdir)/mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - else true; \ - fi; \ - done -@@ -114,9 +121,7 @@ - dir=$(DESTDIR)$(exec_prefix)/$$d; \ - if test ! -d $$dir; then \ - echo "Creating directory hierarchy $$dir"; \ -- $(srcdir)/mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - else true; \ - fi; \ - done -diff -ruN mailman-2.1.12-a/messages/Makefile.in mailman-2.1.12-b/messages/Makefile.in ---- mailman-2.1.12-a/messages/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/messages/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -32,7 +32,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -43,7 +42,6 @@ - CFLAGS= $(OPT) $(DEFS) - PACKAGEDIR= $(prefix)/messages - SHELL= /bin/sh --DIRSETGID= chmod g+s - MSGFMT= @PYTHON@ ../build/bin/msgfmt.py - MSGMERGE= msgmerge - -@@ -60,7 +58,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -90,9 +88,8 @@ - do \ - dir=$(DESTDIR)$(prefix)/$$d; \ - echo "Creating language directory $$dir"; \ -- $(srcdir)/../mkinstalldirs $$dir; \ -- chmod $(DIRMODE) $$dir; \ -- $(DIRSETGID) $$dir; \ -+ $(INSTALL) -d -m $(DIRMODE) `dirname $$dir`; \ -+ $(INSTALL) -d -m $(DIRMODE) $$dir; \ - done - @for d in $(LANGUAGES); \ - do \ -@@ -113,8 +110,6 @@ - - mofiles: $(MOFILES) - --finish: -- - clean: - -rm -f */LC_MESSAGES/mailman.mo - -diff -ruN mailman-2.1.12-a/misc/Makefile.in mailman-2.1.12-b/misc/Makefile.in ---- mailman-2.1.12-a/misc/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/misc/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -30,7 +30,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - PYTHON= @PYTHON@ - -@@ -62,7 +61,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - DATAMODE= 664 -@@ -101,8 +100,6 @@ - (cd $(PKGDIR)/$$p ; umask 02 ; PYTHONPATH=$(PYTHONLIBDIR) $(PYTHON) $(SETUPCMD)); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/scripts/Makefile.in mailman-2.1.12-b/scripts/Makefile.in ---- mailman-2.1.12-a/scripts/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/scripts/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -49,7 +48,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -68,8 +67,6 @@ - $(INSTALL) -m $(FILEMODE) $(srcdir)/join $(DESTDIR)$(SCRIPTSDIR)/subscribe - $(INSTALL) -m $(FILEMODE) $(srcdir)/leave $(DESTDIR)$(SCRIPTSDIR)/unsubscribe - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/src/Makefile.in mailman-2.1.12-b/src/Makefile.in ---- mailman-2.1.12-a/src/Makefile.in 2009-07-28 12:19:47.000000000 +0200 -+++ mailman-2.1.12-b/src/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - PYTHON= @PYTHON@ - -@@ -63,10 +62,9 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 --EXEMODE= 755 -+DIRMODE= 2775 -+EXEMODE= 2755 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) --DIRSETGID= chmod g+s - - # Fixed definitions - -@@ -110,20 +108,10 @@ - do \ - exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ - $(INSTALL_PROGRAM) $$f $$exe; \ -- $(DIRSETGID) $$exe; \ - done - for f in $(MAIL_PROGS); \ - do \ - $(INSTALL_PROGRAM) $$f $(DESTDIR)$(MAILDIR); \ -- $(DIRSETGID) $(DESTDIR)$(MAILDIR)/$$f; \ -- done -- --finish: -- -for f in $(SUID_CGI_PROGS); \ -- do \ -- exe=$(DESTDIR)$(CGIDIR)/$$f$(CGIEXT); \ -- chown $(MAILMAN_USER) $$exe; \ -- chmod u+s $$exe; \ - done - - clean: -diff -ruN mailman-2.1.12-a/templates/Makefile.in mailman-2.1.12-b/templates/Makefile.in ---- mailman-2.1.12-a/templates/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/templates/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - TRUE= @TRUE@ - -@@ -48,7 +47,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -61,15 +60,13 @@ - install: - for d in $(LANGUAGES); \ - do \ -- $(srcdir)/../mkinstalldirs $(DESTDIR)$(TEMPLATEDIR)/$$d; \ -+ $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(TEMPLATEDIR)/$$d; \ - for f in $(srcdir)/$$d/*.html $(srcdir)/$$d/*.txt; \ - do \ - $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(TEMPLATEDIR)/$$d; \ - done; \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/tests/bounces/Makefile.in mailman-2.1.12-b/tests/bounces/Makefile.in ---- mailman-2.1.12-a/tests/bounces/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/tests/bounces/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -46,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -60,8 +59,6 @@ - $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(BOUNCEDIR); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/tests/Makefile.in mailman-2.1.12-b/tests/Makefile.in ---- mailman-2.1.12-a/tests/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/tests/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -46,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -71,8 +70,6 @@ - (cd $$d; $(MAKE) DESTDIR=$(DESTDIR) install); \ - done - --finish: -- - clean: - - distclean: -diff -ruN mailman-2.1.12-a/tests/msgs/Makefile.in mailman-2.1.12-b/tests/msgs/Makefile.in ---- mailman-2.1.12-a/tests/msgs/Makefile.in 2009-02-23 22:23:35.000000000 +0100 -+++ mailman-2.1.12-b/tests/msgs/Makefile.in 2009-07-28 12:19:48.000000000 +0200 -@@ -28,7 +28,6 @@ - DESTDIR= - - CC= @CC@ --CHMOD= @CHMOD@ - INSTALL= @INSTALL@ - - DEFS= @DEFS@ -@@ -46,7 +45,7 @@ - # Modes for directories and executables created by the install - # process. Default to group-writable directories but - # user-only-writable for executables. --DIRMODE= 775 -+DIRMODE= 2775 - EXEMODE= 755 - FILEMODE= 644 - INSTALL_PROGRAM=$(INSTALL) -m $(EXEMODE) -@@ -60,8 +59,6 @@ - $(INSTALL) -m $(FILEMODE) $$f $(DESTDIR)$(MSGSDIR); \ - done - --finish: -- - clean: - - distclean: diff --git a/community-testing/mailman/mailman.install b/community-testing/mailman/mailman.install deleted file mode 100644 index 62a364e1a..000000000 --- a/community-testing/mailman/mailman.install +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -## arg 1: the new package version -post_install() { - if ! getent group mailman >/dev/null; then - groupadd -g 80 mailman >/dev/null - fi - - if ! getent passwd mailman >/dev/null; then - useradd -s /sbin/nologin -c "GNU Mailing List Manager" -d /usr/lib/mailman \ - -u 80 -g mailman -M -r mailman >/dev/null - fi - # check file permissions - cd /usr/lib/mailman && bin/check_perms > /dev/null -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - post_install "$1" -} - -## arg 1: the old package version -pre_remove() { - userdel mailman >/dev/null || true - groupdel mailman >/dev/null || true -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/mailman/mailman.profile.csh b/community-testing/mailman/mailman.profile.csh deleted file mode 100644 index c0a39edee..000000000 --- a/community-testing/mailman/mailman.profile.csh +++ /dev/null @@ -1 +0,0 @@ -[ -d /usr/lib/mailman/bin ] && setenv PATH ${PATH}:/usr/lib/mailman/bin diff --git a/community-testing/mailman/mailman.profile.sh b/community-testing/mailman/mailman.profile.sh deleted file mode 100644 index 51b69ebfb..000000000 --- a/community-testing/mailman/mailman.profile.sh +++ /dev/null @@ -1,3 +0,0 @@ -[ -d /usr/lib/mailman/bin ] && PATH=$PATH:/usr/lib/mailman/bin - -export PATH diff --git a/community-testing/mailman/mailman.rc b/community-testing/mailman/mailman.rc deleted file mode 100644 index 79c1cd661..000000000 --- a/community-testing/mailman/mailman.rc +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -MAILMANCTL=/usr/lib/mailman/bin/mailmanctl - -case "$1" in - start) - status 'Starting GNU Mailing List Manager' $MAILMANCTL -q start && - add_daemon ${0##*/} || exit 1 - ;; - stop) - status 'Stoping GNU Mailing List Manager' $MAILMANCTL -q stop && - rm_daemon ${0##*/} || exit 1 - ;; - reload) - status 'Reloading GNU Mailing List Manager' $MAILMANCTL -q restart - ;; - restart) - $0 stop && $0 start - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|reload}" >&2 - ;; -esac - -: -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/mailman/mailman.service b/community-testing/mailman/mailman.service deleted file mode 100644 index 633412dbc..000000000 --- a/community-testing/mailman/mailman.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=GNU Mailing List Manager -After=network.target - -[Service] -ExecStart=/usr/lib/mailman/bin/mailmanctl -s start -ExecReload=/usr/lib/mailman/bin/mailmanctl restart -ExecStop=/usr/lib/mailman/bin/mailmanctl stop -StandardError=syslog -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/mapnik/PKGBUILD b/community-testing/mapnik/PKGBUILD deleted file mode 100644 index df8d5dd90..000000000 --- a/community-testing/mapnik/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 73762 2012-07-15 13:19:10Z ibiru $ -# 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-testing/mapnik/mapnik.install b/community-testing/mapnik/mapnik.install deleted file mode 100644 index 46f265d5b..000000000 --- a/community-testing/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-testing/mashup/PKGBUILD b/community-testing/mashup/PKGBUILD deleted file mode 100644 index d1d1bacd0..000000000 --- a/community-testing/mashup/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Maintainer: Stefan Husmann <stefan-husmann@t-online.de> - -pkgname=mashup -pkgver=3.5 -pkgrel=3 -pkgdesc="Adjusting images on a sheet of paper for printing" -url="http://kornelix.squarespace.com/$pkgname" -arch=('i686' 'x86_64') -license=('GPL3') -depends=('gtk3') -replaces=('printoxx') -source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz") -md5sums=('454b08e5589f93b3bdd4577c2578ae36') - -build() { - cd $srcdir/$pkgname-$pkgver - sed -i 's+xdg-deskto+#xdg-deskto+' Makefile - sed -i 's/--libs gtk+-3.0/--libs gtk+-3.0 gthread-2.0/' Makefile - make PREFIX=/usr -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -Dm644 desktop $pkgdir/usr/share/applications/$pkgname.desktop - make DESTDIR=$pkgdir install - rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop - rm $pkgdir/usr/share/doc/$pkgname/$pkgname.man -} - diff --git a/community-testing/megaglest/PKGBUILD b/community-testing/megaglest/PKGBUILD deleted file mode 100644 index d05435549..000000000 --- a/community-testing/megaglest/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 77508 2012-10-11 12:20:33Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com> - -pkgname=megaglest -pkgver=3.6.0.3 -pkgrel=4 -pkgdesc="Fork of Glest, a 3D real-time strategy game in a fantastic world." -arch=('i686' 'x86_64') -url="http://sourceforge.net/projects/megaglest/" -license=('GPL3') -depends=('curl' 'megaglest-data' 'xerces-c' 'sdl' 'libvorbis' 'openal' 'libgl' 'lua' 'icu' 'ftgl' 'glew' -'libircclient' 'miniupnpc' 'wxgtk' 'glu') -makedepends=('ftjam' 'cmake' 'mesa') -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.tar.xz" - lol.patch) -md5sums=('5a4a2429435031d9f9cc5d9535a9de9d' - '68fd326b73ed1c75981004fbdef6b73a') - -build() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - patch -Np1 < $srcdir/lol.patch - - [[ -d build ]] && rm -r build - mkdir build && cd build - cmake .. \ - -DWANT_SVN_STAMP=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version - make -} - -package() { - cd "${srcdir}"/"${pkgname}"-"${pkgver}"/ - - cd build - make DESTDIR="$pkgdir" install -} - -# vim: sw=2:ts=2 et: diff --git a/community-testing/megaglest/lol.patch b/community-testing/megaglest/lol.patch deleted file mode 100644 index 56f94c852..000000000 --- a/community-testing/megaglest/lol.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/source/shared_lib/include/graphics/math_util.h b/source/shared_lib/include/graphics/math_util.h -index 8fcfb27..3cb7a41 100644 ---- a/source/shared_lib/include/graphics/math_util.h -+++ b/source/shared_lib/include/graphics/math_util.h -@@ -184,10 +184,10 @@ public: - - Rect2<T> computeBoundingRect() const{ - return Rect2i( -- min(p[0].x, p[1].x), -- min(p[0].y, p[2].y), -- max(p[2].x, p[3].x), -- max(p[1].y, p[3].y)); -+ std::min(p[0].x, p[1].x), -+ std::min(p[0].y, p[2].y), -+ std::max(p[2].x, p[3].x), -+ std::max(p[1].y, p[3].y)); - } - - bool isInside(const Vec2<T> &pt) const{ -diff --git a/source/shared_lib/sources/platform/posix/ircclient.cpp b/source/shared_lib/sources/platform/posix/ircclient.cpp -index b09c972..ddebd03 100644 ---- a/source/shared_lib/sources/platform/posix/ircclient.cpp -+++ b/source/shared_lib/sources/platform/posix/ircclient.cpp -@@ -13,6 +13,7 @@ - #include "ircclient.h" - #include "util.h" - #include "platform_common.h" -+#include "libirc_rfcnumeric.h" - #include "libircclient.h" - - #include <stdio.h> -diff --git a/source/shared_lib/sources/util/util.cpp b/source/shared_lib/sources/util/util.cpp -index 05478fc..c27aa62 100644 ---- a/source/shared_lib/sources/util/util.cpp -+++ b/source/shared_lib/sources/util/util.cpp -@@ -19,6 +19,7 @@ - #include <stdarg.h> - #include <time.h> - #include <fcntl.h> // for open() -+#include <unistd.h> - - #ifdef WIN32 - #include <io.h> // for open() diff --git a/community-testing/mezogis/ChangeLog b/community-testing/mezogis/ChangeLog deleted file mode 100644 index dba4cf7ec..000000000 --- a/community-testing/mezogis/ChangeLog +++ /dev/null @@ -1,3 +0,0 @@ -2007-06-27 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community-testing/mezogis/PKGBUILD b/community-testing/mezogis/PKGBUILD deleted file mode 100644 index 4e0f09c6c..000000000 --- a/community-testing/mezogis/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 78132 2012-10-16 12:09:28Z allan $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=mezogis -pkgver=0.1.5 -pkgrel=6 -pkgdesc="A GIS application to query and analyse spatial data" -arch=('i686' 'x86_64') -url="http://www.mezogis.org" -license=('GPL') -depends=('pygtk' 'python2-geotypes' 'postgis') -source=("http://www.mezogis.org/files/mezogis-$pkgver.tar.gz") -md5sums=('1f886b849109a1a1bd3e165353b82368') - -package() { - cd $srcdir/mezogis-$pkgver - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i 's_#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - python2 setup.py install --root=$pkgdir -} diff --git a/community-testing/mingw32-gcc/PKGBUILD b/community-testing/mingw32-gcc/PKGBUILD deleted file mode 100644 index f20bf03b5..000000000 --- a/community-testing/mingw32-gcc/PKGBUILD +++ /dev/null @@ -1,78 +0,0 @@ -# $Id: PKGBUILD 75113 2012-08-14 08:28:16Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Ondrej Jirman <megous@megous.com> - -pkgname=mingw32-gcc -pkgver=4.7.0 -pkgrel=2 -_uprel=1 -arch=(i686 x86_64) -pkgdesc="A C and C++ cross-compilers for building Windows executables on Linux" -depends=('mingw32-pthreads' 'mingw32-runtime' 'mingw32-binutils' 'mingw32-w32api' - 'libmpc' 'elfutils' 'gmp') -replaces=('mingw32-gcc-base') -provides=('mingw32-gcc-base') -options=(!strip) -url="http://sourceforge.net/projects/mingw/files/MinGW/Base/gcc/Version4/" -license=(GPL LGPL) -source=(gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma::http://downloads.sourceforge.net/project/mingw/MinGW/Base/gcc/Version4/gcc-$pkgver-${_uprel}/gcc-$pkgver-${_uprel}-mingw32-src.tar.lzma - gcc-1-mingw-float.patch) -md5sums=('9a4ecdacdc6dc83a4a43ef0693e2295d' - '2407123c35c0aa92ee5ffc27decca9a7') - -build() -{ - [ $NOEXTRACT -eq 1 ] || tar xjf gcc-$pkgver-${_uprel}-mingw32-src/gcc-$pkgver.tar.bz2 - - patch -d $srcdir/gcc-$pkgver -Np1 < $srcdir/gcc-1-mingw-float.patch - - mkdir -p $srcdir/build - cd $srcdir/build - - unset CFLAGS CXXFLAGS - - chmod ugo+x $srcdir/gcc-$pkgver/configure - chmod ugo+x $srcdir/gcc-$pkgver/move-if-change - - msg "gcc" - [ -f Makefile ] || $srcdir/gcc-$pkgver/configure \ - --target=i486-mingw32 \ - --host=$CHOST \ - --build=$CHOST \ - --prefix=/usr \ - --libexecdir=/usr/lib \ - --with-bugurl=https://bugs.archlinux.org/ \ - --enable-languages=c,c++ \ - --enable-shared \ - --enable-sjlj-exceptions \ - --enable-hash-synchronization \ - --disable-nls \ - --disable-libssp \ - --enable-libgomp - - make - make install DESTDIR=$pkgdir - - msg "libgcc" - make -j1 -C i486-mingw32/libgcc DESTDIR=${pkgdir} libgcc_eh.a install - - msg "libstdc++" - make -j1 -C i486-mingw32/libstdc++-v3 DESTDIR=${pkgdir} install - - msg "fixes" - cd $pkgdir/usr/i486-mingw32/lib - mkdir -p $pkgdir/usr/i486-mingw32/bin/ - for i in `ls -1 *.dll`; do - ln -s ../lib/$i $pkgdir/usr/i486-mingw32/bin/$i - done - - cd $pkgdir - rm -rf usr/bin/i486-mingw32-{gcov,gccbug,gcc-*} \ - usr/{include,lib/libiberty.a} \ - usr/share/{info,man} \ - usr/share/gcc-$pkgver/python - - strip usr/bin/* - strip usr/lib/gcc/i486-mingw32/$pkgver/{cc1*,collect2} - i486-mingw32-strip -g usr/lib/gcc/i486-mingw32/$pkgver/*.a -} diff --git a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch b/community-testing/mingw32-gcc/gcc-1-mingw-float.patch deleted file mode 100644 index 365949ad7..000000000 --- a/community-testing/mingw32-gcc/gcc-1-mingw-float.patch +++ /dev/null @@ -1,18 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -This patch has been taken from: -http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html -http://sourceforge.net/tracker/?func=detail&atid=302435&aid=3011968&group_id=2435 - -diff -urN a/gcc/ginclude/float.h b/gcc/ginclude/float.h ---- a/gcc/ginclude/float.h 2009-04-09 17:00:19.000000000 +0200 -+++ b/gcc/ginclude/float.h 2010-06-05 12:03:41.887724045 +0200 -@@ -275,3 +275,7 @@ - #endif /* __STDC_WANT_DEC_FP__ */ - - #endif /* _FLOAT_H___ */ -+ -+#ifdef __MINGW32__ -+#include_next<float.h> -+#endif diff --git a/community-testing/miredo/PKGBUILD b/community-testing/miredo/PKGBUILD deleted file mode 100644 index 4825572df..000000000 --- a/community-testing/miredo/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 72555 2012-06-16 17:09:54Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=miredo -pkgver=1.2.5 -pkgrel=2 -pkgdesc="Teredo client and server." -arch=('i686' 'x86_64') -url="http://www.remlab.net/miredo/" -license=('GPL') -depends=('judy' 'iproute2' 'libcap') -backup=('etc/miredo/miredo.conf' - 'etc/miredo/client-hook') -options=('!libtool') -source=(http://www.remlab.net/files/${pkgname}/${pkgname}-${pkgver}.tar.xz - isatapd.rc.d - miredo.install - miredo.rc.d - miredo-server.rc.d - miredo.service) -md5sums=('5114debbf9fcab5d292176e4548f8cd1' - '51ab6d091192605ee9206944869cb2ab' - 'd1b655d7a851cdb46c91c3418ed1962f' - 'c5a9be5c3175fecec387f1710bfd2788' - '319aba1ae06349b76cb25fda0dba60a9' - '3216d47d5aa979706b17b72d8b6e19b0') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --libexecdir=/usr/lib \ - --with-Judy - make - make DESTDIR="$pkgdir" install - - install -D -m755 $srcdir/miredo.rc.d $pkgdir/etc/rc.d/miredo - install -D -m755 $srcdir/miredo-server.rc.d $pkgdir/etc/rc.d/miredo-server - install -D -m755 $srcdir/isatapd.rc.d $pkgdir/etc/rc.d/isatapd - sed -i 's#/sbin/ip#/usr/sbin/ip#' $pkgdir/etc/miredo/client-hook - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" "$pkgdir/var" - - install -Dm644 "$srcdir/miredo.service" "$pkgdir/usr/lib/systemd/system/miredo.service" -} diff --git a/community-testing/miredo/isatapd.rc.d b/community-testing/miredo/isatapd.rc.d deleted file mode 100644 index fa7bbd708..000000000 --- a/community-testing/miredo/isatapd.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/isatapd` -case "$1" in - start) - stat_busy "Starting userspace ISATAP client" - if [ -z "$PID" ]; then - /usr/sbin/isatapd - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon isatapd - stat_done - fi - ;; - stop) - stat_busy "Stopping userspace ISATAP client" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon isatapd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/miredo/miredo-server.rc.d b/community-testing/miredo/miredo-server.rc.d deleted file mode 100644 index d05513b23..000000000 --- a/community-testing/miredo/miredo-server.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/miredo-server` -case "$1" in - start) - stat_busy "Starting teredo protocol server" - if [ -z "$PID" ]; then - /usr/sbin/miredo-server - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon miredo-server - stat_done - fi - ;; - stop) - stat_busy "Stopping teredo protocol server" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon miredo-server - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/miredo/miredo.install b/community-testing/miredo/miredo.install deleted file mode 100644 index 338459fb3..000000000 --- a/community-testing/miredo/miredo.install +++ /dev/null @@ -1,8 +0,0 @@ -post_remove() { - - # clean up just in case - rm -f /var/run/miredo.pid - rm -f /var/run/miredo-server.pid - rm -f /var/run/isatapd.pid -} - diff --git a/community-testing/miredo/miredo.rc.d b/community-testing/miredo/miredo.rc.d deleted file mode 100644 index 500374b12..000000000 --- a/community-testing/miredo/miredo.rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/miredo` -case "$1" in - start) - stat_busy "Starting teredo protocol client" - if [ -z "$PID" ]; then - /usr/sbin/miredo - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon miredo - stat_done - fi - ;; - stop) - stat_busy "Stopping teredo protocol client" - [ ! -z "$PID" ] && kill $PID &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon miredo - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/miredo/miredo.service b/community-testing/miredo/miredo.service deleted file mode 100644 index 299a887de..000000000 --- a/community-testing/miredo/miredo.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Teredo IPv6 Tunneling Daemon -After=network.target - -[Service] -ExecStartPre=/usr/sbin/miredo-checkconf /etc/miredo/miredo.conf -ExecStart=/usr/sbin/miredo -f -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target
\ No newline at end of file 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/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community-testing/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch deleted file mode 100644 index 40dd48b42..000000000 --- a/community-testing/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-testing/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community-testing/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch deleted file mode 100644 index aff066450..000000000 --- a/community-testing/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-testing/mongodb/PKGBUILD b/community-testing/mongodb/PKGBUILD deleted file mode 100644 index f62cb4beb..000000000 --- a/community-testing/mongodb/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 73763 2012-07-15 13:19:25Z ibiru $ -# 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-testing/mongodb/boost-1.50.patch b/community-testing/mongodb/boost-1.50.patch deleted file mode 100644 index 4ccb898ec..000000000 --- a/community-testing/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-testing/mongodb/mongodb.conf b/community-testing/mongodb/mongodb.conf deleted file mode 100644 index c5272b7f2..000000000 --- a/community-testing/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-testing/mongodb/mongodb.install b/community-testing/mongodb/mongodb.install deleted file mode 100644 index 2ea94553c..000000000 --- a/community-testing/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-testing/mongodb/mongodb.rc b/community-testing/mongodb/mongodb.rc deleted file mode 100644 index 30f2bbf79..000000000 --- a/community-testing/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-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/neatx/PKGBUILD b/community-testing/neatx/PKGBUILD deleted file mode 100644 index 3146452f5..000000000 --- a/community-testing/neatx/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 78062 2012-10-16 11:51:38Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Nicolas Doualot <packages@slubman.info> - -pkgname=neatx -pkgver=0.3.1 -pkgrel=13 -pkgdesc="A free NX server by google" -arch=('i686' 'x86_64') -url="http://code.google.com/p/neatx/" -license=('GPL') -depends=('nxserver' 'python2-pexpect' 'python2-simplejson' 'netcat' 'pygtk') -makedepends=('docutils') -optdepends=('xorg-xdm: if you want to use KDE or GNOME session' - 'xorg-fonts-misc: to use default font' - 'xterm: if you want console session') -install=neatx.install -source=(http://neatx.googlecode.com/files/$pkgname-$pkgver.tar.gz - constants.archlinux.patch) -md5sums=('5748656738d5f04fef1af01b9fe5ef20' - 'a5ca4aa399cc25fa8435280e8b03c5a3') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -i "$srcdir/constants.archlinux.patch" -p2 - - ./configure --prefix=/usr --localstatedir=/var RST2HTML=/usr/bin/rst2html2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - chmod 777 "$pkgdir/var/lib/neatx/sessions" - - install -d -m755 ${pkgdir}/etc/ld.so.conf.d/ - echo -e '/usr/lib\n/opt/NX/lib' > ${pkgdir}/etc/ld.so.conf.d/neatx.conf -} diff --git a/community-testing/neatx/constants.archlinux.patch b/community-testing/neatx/constants.archlinux.patch deleted file mode 100644 index dff5e2415..000000000 --- a/community-testing/neatx/constants.archlinux.patch +++ /dev/null @@ -1,42 +0,0 @@ ---- a/neatx-0.3.1/lib/constants.py 2009-06-24 21:19:55.000000000 +0200 -+++ b/neatx-0.3.1/lib/constants.py 2009-07-08 10:50:30.000000000 +0200 -@@ -25,19 +25,19 @@ - from neatx import _autoconf - - --NXDIR = "/usr/lib/nx" -+NXDIR = "/opt/NX/bin" - - SYSLOG_ADDRESS = "/dev/log" - BASH = "/bin/bash" --NETCAT = "/bin/netcat" -+NETCAT = "/usr/bin/netcat" - XRDB = "/usr/bin/xrdb" - SU = "/bin/su" - SSH = "/usr/bin/ssh" - XAUTH = "/usr/bin/xauth" --XSESSION = "/etc/X11/Xsession" -+XSESSION = "/etc/X11/xdm/Xsession" - - START_CONSOLE_COMMAND = "/usr/bin/xterm" --START_KDE_COMMAND = XSESSION + " startkde" -+START_KDE_COMMAND = " startkde" - START_GNOME_COMMAND = XSESSION + " gnome-session" - - NXUSER = "nx" -@@ -47,12 +47,13 @@ - NXNC = _autoconf.PKGLIBDIR + "/nxnc" - NXDIALOG = _autoconf.PKGLIBDIR + "/nxdialog" - NXAGENT = NXDIR + "/nxagent" --NXAGENT_PKGNAME = "nxagent" -+#NXAGENT_PKGNAME = "nxagent" -+NXAGENT_PKGNAME = "nxserver" - FDCOPY = _autoconf.PKGLIBDIR + "/fdcopy" - TTYSETUP = _autoconf.PKGLIBDIR + "/ttysetup" - - # Extract nxagent version using the following command. --NXAGENT_VERSION_COMMAND = ("dpkg-query -W --showformat='${Version}' %s" % -+NXAGENT_VERSION_COMMAND = ("pacman -Qi %s | grep Version | awk '{print $3}'" % - NXAGENT_PKGNAME) - NXAGENT_VERSION_SEP = ".-~" - diff --git a/community-testing/neatx/neatx.install b/community-testing/neatx/neatx.install deleted file mode 100644 index 89356878c..000000000 --- a/community-testing/neatx/neatx.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - useradd -d /opt/NX/home/nx -s /usr/lib/neatx/nxserver-login-wrapper nx &> /dev/null - mkdir -p ~nx/.ssh - cp /usr/share/neatx/authorized_keys.nomachine ~nx/.ssh/authorized_keys - chmod 600 ~nx/.ssh/authorized_keys - chown -R nx ~nx - post_remove -} - -pre_remove() { - userdel nx > /dev/null 2>&1 - rm -rf ~nx -} - -post_remove() { - sed -e '/\/opt\/NX\/lib/d' -i etc/ld.so.conf - ldconfig -} diff --git a/community-testing/nestopia/ChangeLog b/community-testing/nestopia/ChangeLog deleted file mode 100644 index 5077d00b2..000000000 --- a/community-testing/nestopia/ChangeLog +++ /dev/null @@ -1,12 +0,0 @@ -2008-12-16 Tiago Pierezan Camargo <tcamargo@gmail.com> - - * PKGBUILD: Minor corrections. - -2008-12-04 Tiago Pierezan Camargo <tcamargo@gmail.com> - - * PKGBUILD (source): Package adopted. - Variable/version cleanup. - Patch to remove bogus error messages on program exit. - New dependency: mesa. - Renamed executable to nestopia. - diff --git a/community-testing/nestopia/PKGBUILD b/community-testing/nestopia/PKGBUILD deleted file mode 100644 index 7ef2d4b96..000000000 --- a/community-testing/nestopia/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 77297 2012-10-08 15:06:02Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tiago Pierezan Camargo <tcamargo@gmail.com> -# Contributor: robb_force <robb_force@holybuffalo.net> - -pkgname=nestopia -pkgver=1.42 -pkgrel=3 -pkgdesc='An NES emulator featuring cycle exact emulation, a ridiculous number of mappers, and lots of custom sound chips.' -url='http://0ldsk00l.ca/nestopia.html' -license=('GPL') -arch=('i686' 'x86_64') -depends=('sdl' 'alsa-lib' 'gtk3' 'mesa' 'glu') -makedepends=('unzip') -source=("$pkgname-$pkgver.tar.gz::https://github.com/rdanbrook/nestopia/tarball/$pkgver" - "build-fix.patch") -md5sums=('ce7ffba59f19c764f08546e015777172' - '49dc5a51243a023b47f25ff3d6aabd89') - -build() { - cd ${srcdir}/rdanbrook-nestopia-* - patch -p1 <$srcdir/build-fix.patch - make PREFIX=/usr -j1 -} - -package() { - cd ${srcdir}/rdanbrook-nestopia-* - mkdir -p $pkgdir/usr/{bin,share/nestopia} - make install PREFIX=$pkgdir/usr -} diff --git a/community-testing/nestopia/build-fix.patch b/community-testing/nestopia/build-fix.patch deleted file mode 100644 index 7b8609f8d..000000000 --- a/community-testing/nestopia/build-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -wbBur rdanbrook-nestopia-53aa38a/Makefile rdanbrook-nestopia-53aa38a.my/Makefile ---- rdanbrook-nestopia-53aa38a/Makefile 2012-09-26 04:21:32.000000000 +0400 -+++ rdanbrook-nestopia-53aa38a.my/Makefile 2012-10-01 21:12:08.000000000 +0400 -@@ -186,12 +186,12 @@ - install -m 0644 NstDatabase.xml $(DATADIR) - install -m 0644 source/linux/icons/*.png $(DATADIR)/icons - install -m 0644 source/linux/icons/*.svg $(DATADIR)/icons -- install -m 0644 source/linux/icons/nestopia.svg /usr/share/pixmaps -- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop -+ install -Dm0644 source/linux/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg -+ install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop - - uninstall: - xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop -- rm /usr/share/pixmaps/nestopia.svg -+ rm $(PREFIX)/share/pixmaps/nestopia.svg - rm $(BINDIR)/$(EXE) - rm -rf $(DATADIR) - diff --git a/community-testing/nginx/PKGBUILD b/community-testing/nginx/PKGBUILD deleted file mode 100644 index 508861959..000000000 --- a/community-testing/nginx/PKGBUILD +++ /dev/null @@ -1,103 +0,0 @@ -# $Id: PKGBUILD 72828 2012-06-23 06:49:26Z bpiotrowski $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <barthalion@gmal.com> -# Contributor: Miroslaw Szot <mss@czlug.icis.pcz.pl> - -pkgname=nginx -pkgver=1.2.1 -pkgrel=6 -pkgdesc="lightweight HTTP server and IMAP/POP3 proxy server" -arch=('i686' 'x86_64') -depends=('pcre' 'zlib' 'openssl') -makedepends=('passenger') -optdepends=('passenger') -url="http://nginx.org" -license=('custom') -install=nginx.install -backup=('etc/nginx/fastcgi.conf' - 'etc/nginx/fastcgi_params' - 'etc/nginx/koi-win' - 'etc/nginx/koi-utf' - 'etc/nginx/mime.types' - 'etc/nginx/nginx.conf' - 'etc/nginx/scgi_params' - 'etc/nginx/uwsgi_params' - 'etc/nginx/win-utf' - 'etc/logrotate.d/nginx') -source=(http://nginx.org/download/nginx-$pkgver.tar.gz - rc.d service - nginx.logrotate) -md5sums=('ceacae12d66d1f021bf3737a0269b6f4' - 'f62c7c9b5a53471d4666a4c49ad363fb' - '16c6b4cbe24001a3f4f58b9d5f4e3d4c' - 'b38744739022876554a0444d92e6603b') - -_cfgdir=/etc/nginx -_tmpdir=/var/tmp/nginx - -build() { - cd "$srcdir"/$pkgname-$pkgver - - ./configure \ - --prefix=$_cfgdir \ - --conf-path=$_cfgdir/nginx.conf \ - --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/lock/nginx.lock \ - --user=http --group=http \ - --http-log-path=/var/log/nginx/access.log \ - --error-log-path=/var/log/nginx/error.log \ - --http-client-body-temp-path=$_tmpdir/client-body \ - --http-proxy-temp-path=$_tmpdir/proxy \ - --http-fastcgi-temp-path=$_tmpdir/fastcgi \ - --http-scgi-temp-path=$_tmpdir/scgi \ - --http-uwsgi-temp-path=$_tmpdir/uwsgi \ - --with-imap --with-imap_ssl_module \ - --with-ipv6 --with-pcre-jit \ - --with-file-aio \ - --with-http_dav_module \ - --with-http_gzip_static_module \ - --with-http_realip_module \ - --with-http_ssl_module \ - --with-http_stub_status_module \ - --add-module=/usr/lib/passenger/ext/nginx \ - #--with-http_mp4_module \ - #--with-http_realip_module \ - #--with-http_addition_module \ - #--with-http_xslt_module \ - #--with-http_image_filter_module \ - #--with-http_geoip_module \ - #--with-http_sub_module \ - #--with-http_flv_module \ - #--with-http_random_index_module \ - #--with-http_secure_link_module \ - #--with-http_degradation_module \ - #--with-http_perl_module \ - - make -} - -package() { - cd "$srcdir/nginx-${pkgver}" - make DESTDIR="$pkgdir" install - - install -d "$pkgdir"/etc/logrotate.d - install -m644 $srcdir/nginx.logrotate $pkgdir/etc/logrotate.d/nginx - - sed -e 's|\<user\s\+\w\+;|user html;|g' \ - -e '44s|html|/usr/share/nginx/html|' \ - -e '54s|html|/usr/share/nginx/html|' \ - -i $pkgdir/etc/nginx/nginx.conf - rm $pkgdir/etc/nginx/*.default - - install -dm1777 $pkgdir/var/tmp - install -d $pkgdir/$_tmpdir - - install -d $pkgdir/usr/share/nginx - mv $pkgdir/etc/nginx/html/ $pkgdir/usr/share/nginx - - install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/nginx - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/nginx.service - install -D -m644 LICENSE $pkgdir/usr/share/licenses/nginx/LICENSE - rm -rf $pkgdir/var/run -} diff --git a/community-testing/nginx/nginx b/community-testing/nginx/nginx deleted file mode 100644 index eb9031e81..000000000 --- a/community-testing/nginx/nginx +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -function check_config { - stat_busy "Checking nginx configuration" - /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf - if [ $? -ne 0 ]; then - stat_die - else - stat_done - fi -} - -case "$1" in - start) - check_config - $0 careless_start - ;; - careless_start) - stat_busy "Starting nginx" - if [ -s /var/run/nginx.pid ]; then - stat_fail - # probably ;) - stat_busy "Nginx is already running" - stat_die - fi - /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon nginx - stat_done - fi - ;; - stop) - stat_busy "Stopping nginx" - PID=$(cat /var/run/nginx.pid) - kill -QUIT $PID &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - for i in {1..10}; do - [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - check_config - $0 stop - sleep 1 - $0 careless_start - ;; - reload) - check_config - if [ -s /var/run/nginx.pid ]; then - status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid) - fi - ;; - check) - check_config - ;; - *) - echo "usage: $0 {start|stop|restart|reload|check|careless_start}" -esac diff --git a/community-testing/nginx/nginx.install b/community-testing/nginx/nginx.install deleted file mode 100644 index b31ee41d7..000000000 --- a/community-testing/nginx/nginx.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - if [[ $(vercmp $2 1.2.1-2) -le 0 ]]; then - echo " >>> Since 1.2.1-2 several changes has been made in package:" - echo " - *.conf files have been moved to /etc/nginx" - echo " - /etc/conf.d/nginx has been removed" - echo " Main configuration file is set to /etc/nginx/nginx.conf" - echo " - access.log and error.log can be found in /var/log/nginx by default" - echo " - bundled *.html files have been moved to /usr/share/nginx/html" - echo " - /etc/nginx/{html,logs} symbolic links and *.default files have been removed" - fi -} diff --git a/community-testing/nginx/nginx.logrotate b/community-testing/nginx/nginx.logrotate deleted file mode 100644 index d490d5d9b..000000000 --- a/community-testing/nginx/nginx.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/nginx/*.log { - missingok - sharedscripts - compress - postrotate - test -r /var/run/nginx.pid && kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/community-testing/nginx/rc.d b/community-testing/nginx/rc.d deleted file mode 100644 index eb9031e81..000000000 --- a/community-testing/nginx/rc.d +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -function check_config { - stat_busy "Checking nginx configuration" - /usr/sbin/nginx -t -q -c /etc/nginx/nginx.conf - if [ $? -ne 0 ]; then - stat_die - else - stat_done - fi -} - -case "$1" in - start) - check_config - $0 careless_start - ;; - careless_start) - stat_busy "Starting nginx" - if [ -s /var/run/nginx.pid ]; then - stat_fail - # probably ;) - stat_busy "Nginx is already running" - stat_die - fi - /usr/sbin/nginx -c /etc/nginx/nginx.conf &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon nginx - stat_done - fi - ;; - stop) - stat_busy "Stopping nginx" - PID=$(cat /var/run/nginx.pid) - kill -QUIT $PID &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - for i in {1..10}; do - [ -d /proc/$PID ] || { stat_done; rm_daemon nginx; exit 0; } - sleep 1 - done - stat_fail - fi - ;; - restart) - check_config - $0 stop - sleep 1 - $0 careless_start - ;; - reload) - check_config - if [ -s /var/run/nginx.pid ]; then - status "Reloading nginx configuration" kill -HUP $(cat /var/run/nginx.pid) - fi - ;; - check) - check_config - ;; - *) - echo "usage: $0 {start|stop|restart|reload|check|careless_start}" -esac diff --git a/community-testing/nginx/service b/community-testing/nginx/service deleted file mode 100644 index 78d0a492c..000000000 --- a/community-testing/nginx/service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=A high performance web server and a reverse proxy server - -[Service] -Type=forking -PIDFile=/run/nginx.pid -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /run/nginx.pid;' -s quit - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/oidentd/PKGBUILD b/community-testing/oidentd/PKGBUILD deleted file mode 100644 index 0de9d33c6..000000000 --- a/community-testing/oidentd/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 72556 2012-06-16 17:10:05Z dreisner $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: simo <simo@archlinux.org> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=oidentd -pkgver=2.0.8 -pkgrel=6 -pkgdesc='An RFC1413 compliant ident daemon' -arch=('i686' 'x86_64') -url="http://dev.ojnk.net/" -license=('GPL') -depends=('glibc' 'bash') -source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz - rc.d conf.d service socket) -md5sums=('c3d9a56255819ef8904b867284386911' - '93cbf742cdd0b053f67482273d715f25' - '603307525771724b0f55a2c34fbc3f3e' - 'b215bee5764cdecb0939f44d5d2dccbe' - '651c2ef45d1d345d95056ef0787e29e6') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr mandir=$pkgdir/usr/share/man install - - install -D -m644 $srcdir/conf.d $pkgdir/etc/conf.d/oidentd - install -D -m755 $srcdir/rc.d $pkgdir/etc/rc.d/oidentd - install -D -m644 $srcdir/service $pkgdir/usr/lib/systemd/system/oidentd@.service - install -D -m644 $srcdir/socket $pkgdir/usr/lib/systemd/system/oidentd.socket -} - diff --git a/community-testing/oidentd/conf.d b/community-testing/oidentd/conf.d deleted file mode 100644 index 5eefa80e2..000000000 --- a/community-testing/oidentd/conf.d +++ /dev/null @@ -1,5 +0,0 @@ -USER=nobody -GROUP=nobody -OPTS="" -# You will need this, when you want oidentd listen both on IPv4 and IPv6 -# OPTS="-a ::" diff --git a/community-testing/oidentd/rc.d b/community-testing/oidentd/rc.d deleted file mode 100644 index 8b3c04c45..000000000 --- a/community-testing/oidentd/rc.d +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/oidentd - -# no daemon check needed for oidentd, and no pid nesecary. -case "$1" in - start) - stat_busy "Starting oidentd Daemon..." - # oidentd is smart enough to only run one copy of - # itsself, no check nesecary, and no pidfile - /usr/sbin/oidentd -u ${USER} -g ${GROUP} ${OPTS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon oidentd - stat_done - fi - ;; - stop) - stat_busy "Stopping oidentd Daemon..." - # kill the process by it's full name, or the init script - # will terminate as well, wreaking havok. - killall /usr/sbin/oidentd - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon oidentd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/oidentd/service b/community-testing/oidentd/service deleted file mode 100644 index 3688298c1..000000000 --- a/community-testing/oidentd/service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Ident (RFC 1413) per-connection server - -[Service] -ExecStart=/usr/sbin/oidentd -I -u nobody -g nobody -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -StandardError=syslog diff --git a/community-testing/oidentd/socket b/community-testing/oidentd/socket deleted file mode 100644 index 63df7036e..000000000 --- a/community-testing/oidentd/socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Ident (RFC 1413) socket -Conflicts=oidentd.service - -[Socket] -ListenStream=113 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/community-testing/onboard/PKGBUILD b/community-testing/onboard/PKGBUILD deleted file mode 100644 index 0b4510956..000000000 --- a/community-testing/onboard/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 78064 2012-10-16 11:51:46Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=onboard -pkgver=0.98.1 -pkgrel=1 -pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" -arch=('i686' 'x86_64') -url="https://launchpad.net/onboard" -license=('GPL') -depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('python-distutils-extra') -optdepends=('at-spi2-atk: auto-show when editing text' - 'mousetweaks: hover click with mouse') -options=('!emptydirs') -install=$pkgname.install -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('107e031b429329b71deb67c9b90195d6') - -package() { - cd "$srcdir/$pkgname-$pkgver" - - # Do not set getpreferredencoding, because it breaks getstatusoutput() in the setup script - sed -i '/getpreferredencoding =/ d' setup.py - - python3 setup.py install --root=$pkgdir/ --optimize=1 -} diff --git a/community-testing/onboard/onboard.install b/community-testing/onboard/onboard.install deleted file mode 100644 index aa4c3e059..000000000 --- a/community-testing/onboard/onboard.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - glib-compile-schemas usr/share/glib-2.0/schemas - update-desktop-database -q - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/openimageio/PKGBUILD b/community-testing/openimageio/PKGBUILD deleted file mode 100644 index b62f5f71f..000000000 --- a/community-testing/openimageio/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 77494 2012-10-11 11:31:19Z svenstaro $ -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=openimageio -pkgver=1.0.9 -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=('4b98a057515cc95fc954743c987f19ba') - -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-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/oss/PKGBUILD b/community-testing/oss/PKGBUILD deleted file mode 100644 index 9ec64590e..000000000 --- a/community-testing/oss/PKGBUILD +++ /dev/null @@ -1,112 +0,0 @@ -# $Id: PKGBUILD 73269 2012-07-04 21:23:35Z dreisner $ -# Maintainer: Florian Pritz <bluewind@xinu.at> -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgbase=oss -pkgname=(oss libflashsupport-oss) -pkgver=4.2_2006 -pkgrel=4 -arch=('i686' 'x86_64') -url="http://developer.opensound.com/" -license=('GPL2') -makedepends=('gtk2') -source=("http://www.4front-tech.com/developer/sources/stable/gpl/oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl.tar.bz2" - "rm-init-scripts.patch" - "rc-script" - "soundon.patch" - "remove-hal.patch" - "oss.service" - ) -md5sums=('ca25c06bb7d0c6495e1b6f55d1bad96c' - 'b9a380a0ac8896390d71ac13676f27e1' - 'cbcbce5c03b127df5eafa8faa091492c' - '65f07fe241bfbf912f76d8b6d8f276b5' - 'cd7f1dc6166bba8c94d96f3a28e948a5' - '8db0255b380dc6672993e627d1cd8ca6') -_dir=oss-v${pkgver/_*}-build${pkgver/*_}-src-gpl - -build() { - cd "${srcdir}/${_dir}" - - # Avoid these flags conflicting with OSS build system. - unset CFLAGS - unset LDFLAGS - unset OSFLAGS - unset LIBRARIES - export NO_WARNING_CHECKS=yes - - # Compile libflashsupport.so only in packaging time, so we avoid - # conflicts with other packages and ease package management. - msg "Building libflashsupport.so." - cd oss/lib - gcc -shared -fPIC -O2 -Wall -Werror flashsupport.c -o libflashsupport.so - - msg "Preparing the build environment." - cd "${srcdir}" - - # Create build directory and configure - rm -rf build - mkdir build && cd build - "${srcdir}/${_dir}/configure" --enable-libsalsa=NO --regparm - - # ossvermagic hardcodes /lib/modules *grumble* - sed -i 's|/lib/modules|/usr&|' \ - os_cmd/Linux/ossvermagic/ossvermagic.c - - msg "Building OSS." - make build - - msg "Patching init scripts." - cd "${srcdir}/build/prototype" - rm usr/lib/oss/etc/S89oss - patch -p0 -i "${srcdir}/rm-init-scripts.patch" - patch -p0 -i "${srcdir}/soundon.patch" - # remove hal dependency - patch -p0 -i "${srcdir}/remove-hal.patch" - rm -rf usr/lib/oss/scripts/oss_usb-create-devices usr/lib/oss/scripts/90-oss_usb-create-device.fdi - - # fix kernel module directories - sed -i 's#/lib/modules/$KERNEL_VERSION/kernel/#/usr/lib/modules/$KERNEL_VERSION/extramodules/kernel/#g' usr/sbin/soundon - sed -i 's#/lib/modules/$UNAME/kernel/#/usr/lib/modules/$UNAME/extramodules/kernel/#g' usr/lib/oss/build/install.sh - sed -i 's#mkdir /lib/modules#mkdir -p /usr/lib/modules#' usr/lib/oss/build/install.sh - sed -i 's#mkdir \(/usr/lib/modules/$UNAME/extramodules/kernel/oss\)#mkdir -p \1#' usr/lib/oss/build/install.sh - sed -i 's#\([= ]\)/lib/modules#\1/usr/lib/modules#g' \ - usr/lib/oss/build/install.sh \ - usr/lib/oss/scripts/restore_drv.sh \ - usr/lib/oss/scripts/setup-alsa.sh \ - usr/lib/oss/scripts/remove_drv.sh \ - usr/lib/oss/build/Makefile.tmpl \ - usr/lib/oss/build/Makefile.osscore \ - usr/lib/oss/cuckoo/Makefile -} - -package_oss() { - pkgdesc="Open Sound System UNIX audio architecture" - depends=('gcc' 'make' 'linux-headers' 'libtool' 'sed') - optdepends=('gtk2: for graphical mixer (ossxmix)' - 'libflashsupport-oss: Adobe flash plugin support') - conflicts=('oss-linux' 'oss-linux-free' 'oss-testing') - backup=('usr/lib/oss/soundon.user') - install=oss.install - - cd "${srcdir}/build/prototype" - cp -a * "${pkgdir}" - - chmod -R a+r "${pkgdir}" # All files can have read permission (FS#13815) - find "${pkgdir}" -type d -exec chmod a+x '{}' \; # Make namcap happy - install -Dm755 "${srcdir}/rc-script" "${pkgdir}/etc/rc.d/oss" - install -Dm644 "$srcdir/oss.service" "$pkgdir/usr/lib/systemd/system/oss.service" -} - -package_libflashsupport-oss() { - pkgdesc="Adobe flash plugin support lib (OSSv4)" - conflicts=('libflashsupport' 'libflashsupport-pulse' 'libflashsupport-oss') - depends=('oss') - - cd "${srcdir}/${_dir}" - - install -dm755 "$pkgdir/usr/lib" - ln -s oss/lib/libflashsupport.so "$pkgdir/usr/lib/libflashsupport.so" -} - diff --git a/community-testing/oss/oss.install b/community-testing/oss/oss.install deleted file mode 100644 index 672d63644..000000000 --- a/community-testing/oss/oss.install +++ /dev/null @@ -1,30 +0,0 @@ -post_install() { - echo "Running OSS install script..." - sh /usr/lib/oss/build/install.sh &>/dev/null - echo - echo " Note that OSS can't currently work together with kernel" - echo " ALSA modules, so they were moved out by the OSS install" - echo " scripts. If you want the ALSA kernel modules back, you can" - echo " just remove this package using pacman." -} - -post_upgrade() { - echo "Running OSS update script..." - sh /usr/lib/oss/build/install.sh &>/dev/null - - if [[ $(vercmp $2 4.2_2006) == "-1" ]]; then - echo "libflashsupport.so has been split into a seperate package." - echo "If you want flash to use oss, please install libflashsupport-oss" - fi -} - -pre_remove() { - # Restore any replaced ALSA drivers. - sh /usr/lib/oss/scripts/restore_drv.sh -} - -post_remove() { - echo " Open Sound System was now removed, and the ALSA kernel" - echo " modules were restored." -} - diff --git a/community-testing/oss/oss.service b/community-testing/oss/oss.service deleted file mode 100644 index 107c9bf3f..000000000 --- a/community-testing/oss/oss.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Open Sound System v4 -Before=sound.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/sbin/soundon -ExecStop=/usr/sbin/soundoff - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/oss/rc-script b/community-testing/oss/rc-script deleted file mode 100644 index 5c930107c..000000000 --- a/community-testing/oss/rc-script +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy 'Starting Open Sound System' - if /usr/sbin/soundon; then - add_daemon oss - stat_done - else - stat_fail - fi - ;; - stop) - stat_busy 'Stopping Open Sound System' - if /usr/sbin/soundoff; then - rm_daemon oss - stat_done - else - stat_fail - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/oss/remove-hal.patch b/community-testing/oss/remove-hal.patch deleted file mode 100644 index 27e2ef2de..000000000 --- a/community-testing/oss/remove-hal.patch +++ /dev/null @@ -1,20 +0,0 @@ -Date: Tue Aug 2 16:37:31 CEST 2011 -Author: Florian Pritz <bluewind@xinu.at> -This removes all hal dependencies - -References: -http://www.archlinux.org/todo/92/ - ---- usr/lib/oss/build/install_2011-08-02_162647.sh 2011-08-02 16:26:47.000000000 +0200 -+++ usr/lib/oss/build/install.sh 2011-08-02 16:27:13.000000000 +0200 -@@ -336,10 +336,4 @@ - echo "autosave_mixer yes" > $OSSLIBDIR/etc/userdefs - fi - --# Hal 0.5.0+ hotplug --mkdir -p /usr/lib/hal/scripts --ln -sf $OSSLIBDIR/scripts/oss_usb-create-devices /usr/lib/hal/scripts/ --mkdir -p /usr/share/hal/fdi/policy/20thirdparty/ --ln -sf $OSSLIBDIR/scripts/90-oss_usb-create-device.fdi /usr/share/hal/fdi/policy/20thirdparty/ -- - exit 0 diff --git a/community-testing/oss/rm-init-scripts.patch b/community-testing/oss/rm-init-scripts.patch deleted file mode 100644 index 981ff605f..000000000 --- a/community-testing/oss/rm-init-scripts.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- usr/lib/oss/build/install.sh.orig 2008-09-25 11:41:47.180167692 -0300 -+++ usr/lib/oss/build/install.sh 2008-09-25 11:41:47.180167692 -0300 -@@ -290,38 +290,6 @@ - echo - fi - --if ! test -d /etc/init.d --then -- mkdir /etc/init.d --fi -- --rm -f /etc/init.d/oss /etc/rc.d/rc3.d/S89oss /etc/rc3.d/S89oss --cp -f $OSSLIBDIR/etc/S89oss /etc/init.d/oss -- --chmod 744 /etc/init.d/oss -- --if test -x /sbin/chkconfig --then -- /sbin/chkconfig oss on > /dev/null 2>&1 --else -- if test -x /usr/sbin/update-rc.d -- then -- /usr/sbin/update-rc.d oss defaults > /dev/null 2>&1 -- else -- if test -d etc/rc.d/rc3.d -- then -- rm -f /etc/rc.d/rc3.d/S89oss -- ln -s /etc/init.d/oss /etc/rc.d/rc3.d/S89oss -- else -- if test -d /etc/rc3.d -- then -- rm -f /etc/rc3.d/S89oss -- ln -s /etc/init.d/oss /etc/rc3.d/S89oss -- fi -- fi -- fi --fi -- - # Install ALSA interface module (Cuckoo) - #(cd $OSSLIBDIR/cuckoo && make clean) > /dev/null 2>&1 - #if (cd $OSSLIBDIR/cuckoo && make install) > /var/log/cuckoo.log 2>&1 ---- usr/lib/oss/scripts/restore_drv.sh.orig 2008-09-25 11:41:47.210168487 -0300 -+++ usr/lib/oss/scripts/restore_drv.sh 2008-09-25 11:41:47.210168487 -0300 -@@ -18,8 +18,6 @@ - fi - fi - --rm -f /etc/init.d/oss -- - if ! test -d /lib/modules/`uname -r`/kernel/sound - then - if test -f /lib/modules/`uname -r`/sound-preoss.tar.bz2 diff --git a/community-testing/oss/soundon.patch b/community-testing/oss/soundon.patch deleted file mode 100644 index 4702b8680..000000000 --- a/community-testing/oss/soundon.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- usr/sbin/soundon.old 2009-09-04 06:35:26.000000000 +0100 -+++ usr/sbin/soundon 2009-11-15 13:59:53.000000000 +0000 -@@ -255,7 +255,10 @@ - then - if test "`uname -m` " = "x86_64 " - then -- ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 -+ # Fix for compatibility with Arch's directory structure -+ # Not that we use it, there is no $OSSLIBDIR/.libsalsa_installed -+ ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib/libasound.so.2 -+ #ln -sf $OSSLIBDIR/lib/libsalsa.so.2.0.0 /usr/lib64/libasound.so.2 - #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 - else - if test -s /lib/libasound.so.2 -@@ -278,8 +281,11 @@ - then - if test "`uname -m` " = "x86_64 " - then -- ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 -- ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 -+ # Fix for compatibility with Arch's directory structure -+ ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib -+ ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib -+ #ln -sf $OSSLIBDIR/lib/libOSSlib.so /usr/lib64 -+ #ln -sf $OSSLIBDIR/lib/libossmix.so /usr/lib64 - else - if test -s /lib/libasound.so.2 - then diff --git a/community-testing/pdf2djvu/PKGBUILD b/community-testing/pdf2djvu/PKGBUILD deleted file mode 100644 index 6c2fe6351..000000000 --- a/community-testing/pdf2djvu/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 78476 2012-10-19 13:29:55Z bluewind $ -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> -# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> - -pkgname=pdf2djvu -pkgver=0.7.15 -pkgrel=1 -pkgdesc="Creates DjVu files from PDF files" -arch=('i686' 'x86_64') -url="http://pdf2djvu.googlecode.com" -license=('GPL') -depends=('poppler' 'djvulibre' 'libxslt' 'gcc-libs' 'graphicsmagick') -makedepends=('pstreams' 'python2-nose' 'ttf-liberation') -source=("http://pdf2djvu.googlecode.com/files/${pkgname}_${pkgver}.tar.gz") - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make install DESTDIR=${pkgdir} - install -Dm644 doc/${pkgname}.1 ${pkgdir}/usr/share/man/man1/${pkgname}.1 -} -check() { - - cd ${srcdir}/${pkgname}-${pkgver} - sed -i 's/nosetests/nosetests2/' tests/Makefile - make test -} -md5sums=('cd03b61636b8d58592e7f419b434581f') diff --git a/community-testing/pdnsd/PKGBUILD b/community-testing/pdnsd/PKGBUILD deleted file mode 100644 index 77ae37700..000000000 --- a/community-testing/pdnsd/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 72558 2012-06-16 17:10:27Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Henrik Nymann Jensen <h@henriknj.dk> - -pkgname=pdnsd -pkgver=1.2.9 -pkgrel=2 -pkgdesc="Is a proxy DNS server with permanent caching" -arch=(i686 x86_64) -url="http://members.home.nl/p.a.rombouts/pdnsd/" -license=('GPL') -depends=('glibc') -#backup=('etc/pdnsd.conf') -source=(http://members.home.nl/p.a.rombouts/pdnsd/releases/pdnsd-$pkgver-par.tar.gz - pdnsd - pdnsd.service) -md5sums=('037f79d191b98974ffc2c9649727bf66' - '3670bd47c9303fbb655d9216715512de' - 'fad5e518d126b29fc947941d57a0a494') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc - make - make DESTDIR=$pkgdir install - install -Dm0755 $srcdir/pdnsd $pkgdir/etc/rc.d/pdnsd - install -Dm0644 $srcdir/pdnsd.service $pkgdir/usr/lib/systemd/system/pdnsd.service -} diff --git a/community-testing/pdnsd/pdnsd b/community-testing/pdnsd/pdnsd deleted file mode 100644 index 34a541d18..000000000 --- a/community-testing/pdnsd/pdnsd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/pdnsd` -case "$1" in - start) - stat_busy "Starting pdnsd Daemon" - if [ -z "$PID" ]; then - /usr/sbin/pdnsd -d - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - stat_fail - else - add_daemon pdnsd - stat_done - fi - ;; - stop) - stat_busy "Stopping pdnsd Daemon" - [ ! -z "$PID" ] && kill -TERM $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon pdnsd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community-testing/pdnsd/pdnsd.service b/community-testing/pdnsd/pdnsd.service deleted file mode 100644 index 5821dbcb2..000000000 --- a/community-testing/pdnsd/pdnsd.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=proxy name server -After=network.target - -[Service] -ExecStart=/usr/sbin/pdnsd - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/performous/PKGBUILD b/community-testing/performous/PKGBUILD deleted file mode 100644 index 72d7611a3..000000000 --- a/community-testing/performous/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 74518 2012-07-29 21:16:06Z ebelanger $ -# Maintainer : Laurent Carlier <lordheavym@gmail.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=performous -pkgver=0.6.1 -pkgrel=16 -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.50') -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 - fix-boost-1.50-xtime.patch) -md5sums=('451a759de77984b5a699e91107fe52e2' - '42a8c825d80b0de16bd5752d2a80e585' - '07e52e926595d053155bbfb7168e308f' - '89157d5e21b0efd09fcbeee299d23c7e' - '6b43ab7f1c3e2cacd3540242634eabb3') - -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 - # boost 1.50 fix - patch -Np1 -i ../fix-boost-1.50-xtime.patch - - 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/fix-boost-1.50-xtime.patch b/community-testing/performous/fix-boost-1.50-xtime.patch deleted file mode 100644 index d13b18c26..000000000 --- a/community-testing/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-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/picard/PKGBUILD b/community-testing/picard/PKGBUILD deleted file mode 100644 index fbf462200..000000000 --- a/community-testing/picard/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 73378 2012-07-07 02:18:22Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: sysrq - -pkgname=picard -pkgver=1.0 -pkgrel=4 -pkgdesc='Official MusicBrainz tagger' -url='http://musicbrainz.org/doc/MusicBrainz_Picard' -license=('GPL') -arch=('i686' 'x86_64') -depends=('python2-pyqt' 'mutagen' 'libofa' 'ffmpeg') -optdepends=('libdiscid: CD lookup' - 'chromaprint: fingerprinting') -source=("http://ftp.musicbrainz.org/pub/musicbrainz/${pkgname}/${pkgname}-${pkgver}.tar.gz") -sha1sums=('abbd606a89b60ed8c948705d47ce1ae1a90f866a') - -install=install - -build() { - cd "${srcdir}/picard-${pkgver}" - python2 setup.py config -} - -package() { - cd "${srcdir}/picard-${pkgver}" - python2 setup.py install --root="${pkgdir}" -} diff --git a/community-testing/picard/install b/community-testing/picard/install deleted file mode 100644 index b46fab005..000000000 --- a/community-testing/picard/install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &>/dev/null - update-desktop-database -q &>/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/pingus/ChangeLog b/community-testing/pingus/ChangeLog deleted file mode 100644 index c182f92eb..000000000 --- a/community-testing/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-testing/pingus/PKGBUILD b/community-testing/pingus/PKGBUILD deleted file mode 100644 index dc6972232..000000000 --- a/community-testing/pingus/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 74300 2012-07-23 22:33:53Z lcarlier $ -# Maintainer: Eric Belanger <eric@archlinux.org> - -pkgname=pingus -pkgver=0.7.6 -pkgrel=5 -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-testing/pingus/pingus-0.7.6-gcc470-udl.patch b/community-testing/pingus/pingus-0.7.6-gcc470-udl.patch deleted file mode 100644 index 843439321..000000000 --- a/community-testing/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-testing/pingus/pingus.desktop b/community-testing/pingus/pingus.desktop deleted file mode 100644 index 276db36a4..000000000 --- a/community-testing/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-testing/pinot/PKGBUILD b/community-testing/pinot/PKGBUILD deleted file mode 100644 index 0fe321e35..000000000 --- a/community-testing/pinot/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 74733 2012-08-02 15:24:03Z andrea $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Alexander Fehr <pizzapunk gmail com> -# Contributor: William Rea <sillywilly@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=pinot -pkgver=1.0 -pkgrel=2 -pkgdesc='Personal search and metasearch tool' -arch=('i686' 'x86_64') -url='http://code.google.com/p/pinot-search/' -license=('GPL') -depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' - 'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' - 'cairo' 'exiv2' 'boost-libs') -makedepends=('boost' 'desktop-file-utils') -optdepends=('unzip: ZIP files extraction' - 'poppler: PDF to text conversion' - 'catdvi: DVI to text conversion' - 'djvulibre: DjVu text extraction' - 'unrtf: RTF to HTML conversion' - 'antiword: MS Word to text conversion' - 'catdoc: XLS and PPT to text conversion') -options=('!emptydirs') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz) -sha256sums=('d1f5ac17022014c5a29ba1e6d95fc39bcf254338a4e0bfe84bf16558d219e2e2') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat_conf.txt - sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat3_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat31_conf.txt - sed -i 's|/usr/share/libtextcat/|/usr/share/libtextcat/LM/|' textcat32_conf.txt - sed -i -e "s|.*russian$|/usr/share/libtextcat/LM/russian-iso8859_5.lm russian-iso8859_5\n\ -/usr/share/libtextcat/LM/russian-koi8_r.lm russian-koi8_r\n\ -/usr/share/libtextcat/LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt - - LIBS="-lboost_system" ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib --enable-gtkmm3=yes - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/pinot/pinot.changelog b/community-testing/pinot/pinot.changelog deleted file mode 100644 index 770a1ef0a..000000000 --- a/community-testing/pinot/pinot.changelog +++ /dev/null @@ -1,8 +0,0 @@ -2012-07-31 Eric Belanger <eric@archlinux.org> - * pinot 1.0-2 : Rebuild against exiv2 0.23, Add boost-libs depends - -2012-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * pinot 1.0-1 - -2011-12-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * pinot 0.98-1 diff --git a/community-testing/pinot/pinot.install b/community-testing/pinot/pinot.install deleted file mode 100644 index 55ab40426..000000000 --- a/community-testing/pinot/pinot.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo "Starting with 0.63, the service is auto-started. " - echo "The file that enables this is located at " - echo "/etc/xdg/autostart/pinot-dbus-daemon.desktop" - echo "Delete this file if you don't want the auto-start." -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/pion-net/PKGBUILD b/community-testing/pion-net/PKGBUILD deleted file mode 100644 index dfc81ac9e..000000000 --- a/community-testing/pion-net/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 73768 2012-07-15 13:20:00Z ibiru $ -# 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-testing/pion-net/boost_1.50_support.diff b/community-testing/pion-net/boost_1.50_support.diff deleted file mode 100644 index 7b82f34b9..000000000 --- a/community-testing/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-testing/pion-net/gcc_4.7_fix.diff b/community-testing/pion-net/gcc_4.7_fix.diff deleted file mode 100644 index 5c2ed3cfe..000000000 --- a/community-testing/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-testing/pokerth/PKGBUILD b/community-testing/pokerth/PKGBUILD deleted file mode 100644 index 51e24be69..000000000 --- a/community-testing/pokerth/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 73769 2012-07-15 13:20:03Z ibiru $ -# 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-testing/polipo/PKGBUILD b/community-testing/polipo/PKGBUILD deleted file mode 100644 index c6ccd1300..000000000 --- a/community-testing/polipo/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 72559 2012-06-16 17:10:40Z dreisner $ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> -# Contributor: Jelle van der Waa <jelle vdwaa nl> -# Contributor: Thomas Holmquist <thomas@vorget.com> -# Contributor: Jan Boehringer <ja(a)bm-boehringer.de> -# Contributor: Alex Griffin <griffin.aj(a)gmail.com> - -pkgname=polipo -pkgver=1.0.4.1 -pkgrel=3 -pkgdesc="A small and fast caching web proxy." -arch=('i686' 'x86_64') -url="http://www.pps.jussieu.fr/~jch/software/polipo/" -license=('GPL') -depends=('bash') -makedepends=('texinfo') -install=polipo.install -source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz" - "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service") -md5sums=('bfc5c85289519658280e093a270d6703' - 'bac0e1a871964c931eb5f7a369b3243c' - '8f096b7d77a71e0772ce71a8c8b1b3e3' - '685aa0c6070dee11c701932d23afcc6a' - '109d0e8c15d669281ff14f8991ad0ed8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX="$pkgdir/usr" \ - MANDIR="$pkgdir/usr/share/man" \ - INFODIR="$pkgdir/usr/share/info" \ - LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \ - DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \ - install - - - # install config files - install -Dm 644 config.sample $pkgdir/etc/polipo/config.sample - install -Dm 644 forbidden.sample $pkgdir/etc/polipo/forbidden.sample - - # install license - install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE - - # install daemon scripts / cron - install -Dm 755 $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo - install -Dm 755 $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron - install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/polipo/polipo.conf.d b/community-testing/polipo/polipo.conf.d deleted file mode 100644 index dc879d32b..000000000 --- a/community-testing/polipo/polipo.conf.d +++ /dev/null @@ -1,4 +0,0 @@ -# -# Parameters to be passed to polipo -# -POLIPO_ARGS="daemonise=true logFile=\"/var/log/polipo.log\"" diff --git a/community-testing/polipo/polipo.cron b/community-testing/polipo/polipo.cron deleted file mode 100644 index 8270d0a05..000000000 --- a/community-testing/polipo/polipo.cron +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/etc/rc.d/polipo purge >/dev/null 2>&1 diff --git a/community-testing/polipo/polipo.install b/community-testing/polipo/polipo.install deleted file mode 100644 index bacc46377..000000000 --- a/community-testing/polipo/polipo.install +++ /dev/null @@ -1,25 +0,0 @@ -infodir=/usr/share/info -filelist=(polipo.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done - install -d /var/cache/polipo 2> /dev/null - touch /var/log/polipo.log 2> /dev/null - chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/polipo/polipo.rc.d b/community-testing/polipo/polipo.rc.d deleted file mode 100644 index 260fab050..000000000 --- a/community-testing/polipo/polipo.rc.d +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/bash - -daemon_name=polipo - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/$daemon_name.conf - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [[ -z $PID ]]; then - [[ -f /run/$daemon_name.pid ]] && - rm -f /run/$daemon_name.pid - # RUN - sudo -u nobody /usr/bin/$daemon_name ${POLIPO_ARGS} - # - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - echo $(get_pid) > /run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [[ -n $PID ]] && kill $PID &> /dev/null - # - if [[ $? -gt 0 ]]; then - stat_fail - exit 1 - else - rm -f /run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/polipo/polipo.service b/community-testing/polipo/polipo.service deleted file mode 100644 index a1bdd9aa2..000000000 --- a/community-testing/polipo/polipo.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Polipo Proxy Server - -[Service] -ExecStart=/usr/bin/polipo -User=nobody -ExecReload=/bin/kill -USR1 $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/prboom/PKGBUILD b/community-testing/prboom/PKGBUILD deleted file mode 100644 index 7a6f8086d..000000000 --- a/community-testing/prboom/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 77584 2012-10-13 02:06:46Z ebelanger $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Thayer Williams <thayer@archlinux.org> -# Contributor: dale <dale@archlinux.org> - -pkgname=prboom -pkgver=2.5.0 -pkgrel=7 -pkgdesc='A game engine which provides a program to play Doom levels.' -url='http://prboom.sourceforge.net/' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('libpng' 'sdl_mixer' 'sdl_net' 'glu') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/prboom/${pkgname}-${pkgver}.tar.gz" - 'libpng-1.4.patch') -md5sums=('a8a15f61fa2626ab98051ab2703378c4' - 'ba53474db8e747035ca2320a445e4ae0') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 < ../libpng-1.4.patch - - ./configure --prefix=/usr --disable-i386-asm - sed -i "s|/games|/bin|g" "${srcdir}/${pkgname}-${pkgver}/src/Makefile" - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/community-testing/prboom/libpng-1.4.patch b/community-testing/prboom/libpng-1.4.patch deleted file mode 100644 index a2215e37b..000000000 --- a/community-testing/prboom/libpng-1.4.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur prboom-2.5.0-orig/src/SDL/i_sshot.c prboom-2.5.0/src/SDL/i_sshot.c ---- prboom-2.5.0-orig/src/SDL/i_sshot.c 2010-01-24 23:26:03.000000000 -0500 -+++ prboom-2.5.0/src/SDL/i_sshot.c 2010-01-24 23:28:42.000000000 -0500 -@@ -231,7 +231,7 @@ - if (fp) - { - png_struct *png_ptr = png_create_write_struct( -- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); -+ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - - if (png_ptr) - { -@@ -279,7 +279,7 @@ - break; - } - } -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - } - fclose(fp); - } diff --git a/community-testing/privoxy/PKGBUILD b/community-testing/privoxy/PKGBUILD deleted file mode 100644 index 8afa9261f..000000000 --- a/community-testing/privoxy/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 75713 2012-08-29 10:09:26Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Juergen Hoetzel <juergen@hoetzel.info> -# Contributor: basilburn (basilburn), Paul Bredbury (brebs) - -pkgname=privoxy -pkgver=3.0.19 -pkgrel=6 -pkgdesc='A web proxy with advanced filtering capabilities.' -arch=('i686' 'x86_64') -url='http://www.privoxy.org' -license=('GPL') -depends=('pcre' 'zlib') -makedepends=('autoconf') -backup=('etc/conf.d/privoxy' - 'etc/privoxy/'{config,trust,default.action,user.filter,default.filter} - 'etc/privoxy/'{match-all,user}.action - 'etc/logrotate.d/privoxy') -install='privoxy.install' -source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" - 'privoxy' - 'privoxy.logrotate.d' - 'privoxy.conf.d' - 'privoxy.service') -md5sums=('57acc79059565cc42eda67982842785d' - '1b4ed8c4e7e5b04b10ef41b597dc3f3b' - 'fc3046377137003726a151ee27b142a2' - '27830ef79418e277b90c1c1fa933f876' - '4c154a126ec17b02c623e3d451e062d9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - - autoheader - autoconf - ./configure --prefix=/usr --sysconfdir=/etc/privoxy - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - - make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \ - CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install - - # Don't overwrite existing log files! - rm "${pkgdir}/var/log/privoxy/"* - - install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy" - install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy" - install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy" - - # Fix config paths. - sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \ - -e '/^user-manual/s#.*#\#user-manual /usr/share/doc/privoxy/user-manual/#' \ - "${pkgdir}/etc/privoxy/config" - - # Fix group ownership and permissions. - chgrp -R 42 "${pkgdir}/etc/privoxy/" - chgrp -R 42 "${pkgdir}/var/log/privoxy/" - - find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770 - find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660 - chmod 0700 "${pkgdir}/var/log/privoxy" - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" - - # systemd unit file - install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service" -} diff --git a/community-testing/privoxy/privoxy b/community-testing/privoxy/privoxy deleted file mode 100644 index 754453de5..000000000 --- a/community-testing/privoxy/privoxy +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy - -# read logdir and logfile from privoxy config -prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2` -[ -n "$prld" ] || prld=/var/log/privoxy -prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2` -[ -n "$prlf" ] || prlf=logfile - -PID=`pidof -o %PPID /usr/sbin/privoxy` - -case "$1" in - start) - stat_busy "Starting Privoxy" - # create missing logdir and logfile - [ -d "$prld" ] || mkdir -p "$prld" - if [ ! -f "$prlf" ]; then - touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \ - chmod 0660 "$prld/$prlf" - fi - [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \ - ${PRIVOXY_ARGS} ${PRIVOXY_CONF} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon privoxy - stat_done - fi - ;; - stop) - stat_busy "Stopping Privoxy" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon privoxy - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/privoxy/privoxy.conf.d b/community-testing/privoxy/privoxy.conf.d deleted file mode 100644 index 9aa11cd67..000000000 --- a/community-testing/privoxy/privoxy.conf.d +++ /dev/null @@ -1,10 +0,0 @@ -# Location of the config file. -PRIVOXY_CONF='/etc/privoxy/config' - -# User and group that privoxy will be run as. -PRIVOXY_USER='privoxy' -PRIVOXY_GROUP='privoxy' - -# Additional arguments. -PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid" - diff --git a/community-testing/privoxy/privoxy.install b/community-testing/privoxy/privoxy.install deleted file mode 100644 index c3ed75111..000000000 --- a/community-testing/privoxy/privoxy.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { - groupadd -g 42 privoxy &>/dev/null - useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null - chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy - - if [ ! -d /var/spool/privoxy ]; then - install -dm0770 -o privoxy -g privoxy /var/spool/privoxy - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - userdel privoxy &>/dev/null - groupdel privoxy &>/dev/null - rm -rf var/spool/privoxy -} diff --git a/community-testing/privoxy/privoxy.logrotate.d b/community-testing/privoxy/privoxy.logrotate.d deleted file mode 100644 index 8c3129024..000000000 --- a/community-testing/privoxy/privoxy.logrotate.d +++ /dev/null @@ -1,8 +0,0 @@ -/var/log/privoxy/logfile { - create 660 root privoxy - notifempty - compress - postrotate - /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true - endscript -} diff --git a/community-testing/privoxy/privoxy.service b/community-testing/privoxy/privoxy.service deleted file mode 100644 index 59a8884f9..000000000 --- a/community-testing/privoxy/privoxy.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Privoxy Web Proxy With Advanced Filtering Capabilities -After=network.target - -[Service] -Type=forking -PIDFile=/run/privoxy.pid -ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config -SuccessExitStatus=15 - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/projectm/PKGBUILD b/community-testing/projectm/PKGBUILD deleted file mode 100644 index 5c8e90f15..000000000 --- a/community-testing/projectm/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 74519 2012-07-29 21:16:13Z ebelanger $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Alexander Baldeck <alexander@archlinux.org> - -pkgname=projectm -pkgver=2.0.1 -pkgrel=6 -pkgdesc='A music visualizer which uses 3D accelerated iterative image based rendering.' -arch=('i686' 'x86_64') -url='http://projectm.sourceforge.net/' -license=('LGPL') -depends=('gcc-libs' 'ftgl' 'glew' 'gtkglext') -makedepends=('pkg-config' 'cmake') -source=("http://downloads.sourceforge.net/${pkgname}/projectM-${pkgver}-Source.tar.gz" - 'libprojectM-2.0.1-pkg-config.patch' - 'libprojectM-2.0.1-fix-linking.patch') -md5sums=('f8bf795878cdbbef54784cf2390b4c89' - '4f258f4e7c2ab612931936bfd7f1f0fb' - '5c178cadf1e00ee4baf32cd9ccbc818c') - -build() { - cd "${srcdir}/projectM-${pkgver}-Source" - - patch -Np1 -i "${srcdir}/libprojectM-2.0.1-pkg-config.patch" - patch -Np1 -i "${srcdir}/libprojectM-2.0.1-fix-linking.patch" - - cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "${srcdir}/projectM-${pkgver}-Source" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch b/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch deleted file mode 100644 index 23d8a7b9a..000000000 --- a/community-testing/projectm/libprojectM-2.0.1-fix-linking.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- a/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 -+++ b/CMakeLists.txt 2012-02-23 04:30:51.000000000 +0100 -@@ -177,10 +177,10 @@ - LINK_DIRECTORIES(${FTGL_LINK_DIRS} ${Renderer_BINARY_DIR} ${PRESET_FACTORY_BINARY_DIR}) - - if(BUILD_PROJECTM_STATIC) -- TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) -+ TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES}) - else(BUILD_PROJECTM_STATIC) - --TARGET_LINK_LIBRARIES(projectM ${GLEW_LINK_TARGETS} m ${FTGL_LINK_TARGETS} ${OPENGL_LIBRARIES} ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS}) -+TARGET_LINK_LIBRARIES(projectM Renderer ${IMAGE_LINK_TARGETS} ${CG_LINK_TARGETS} ${PRESET_FACTORY_LINK_TARGETS} ${GLEW_LINK_TARGETS} ${FTGL_LINK_TARGETS} m dl ${OPENGL_LIBRARIES} ) - - endif(BUILD_PROJECTM_STATIC) - ---- a/Renderer/CMakeLists.txt 2009-12-06 02:42:51.000000000 +0100 -+++ b/Renderer/CMakeLists.txt 2012-02-23 04:31:58.000000000 +0100 -@@ -13,4 +13,4 @@ - INCLUDE_DIRECTORIES(${projectM_SOURCE_DIR}) - ADD_LIBRARY(Renderer STATIC ${Renderer_SOURCES}) - SET_TARGET_PROPERTIES(Renderer PROPERTIES VERSION 2.00 SOVERSION 2) --TARGET_LINK_LIBRARIES(Renderer m) -+TARGET_LINK_LIBRARIES(Renderer m ${OPENGL_LIBRARIES} ${FREETYPE2_LIBRARIES}) diff --git a/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch b/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch deleted file mode 100644 index b5e38205a..000000000 --- a/community-testing/projectm/libprojectM-2.0.1-pkg-config.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/libprojectM.pc.in 2009-12-06 02:42:51.000000000 +0100 -+++ b/libprojectM.pc.in 2012-02-21 16:48:36.000000000 +0100 -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@LIB_INSTALL_DIR@ -+libdir=@CMAKE_INSTALL_PREFIX@/lib - includedir=@CMAKE_INSTALL_PREFIX@/include - pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ - sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@ diff --git a/community-testing/prosody/ChangeLog b/community-testing/prosody/ChangeLog deleted file mode 100644 index 45f3a05fd..000000000 --- a/community-testing/prosody/ChangeLog +++ /dev/null @@ -1,398 +0,0 @@ -2009-11-23 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.6.0-1 for changeset 6c5b7e66bee4 - [d573d1d7a403] [tip] - - * .hgtags: - Removed tag v0.6.0-1 - [6c5b7e66bee4] [v0.6.0-1] - - * PKGBUILD: - Use correct package name and version - [1e65e6a877d3] - - * .hgtags: - Added tag v0.6.0-1 for changeset ad52fee15148 - [8196689dd4c4] - - * PKGBUILD, prosody.cfg.lua: - Included mod_compression in example configuration file - [ad52fee15148] - - * ChangeLog: - Updated ChangeLog - [34b6046aca14] - - * PKGBUILD: - Updated checksums - [3b4c28f28321] - - * PKGBUILD, prosody.cfg.lua: - New upstream version - [9d201755b63d] - -2009-10-22 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.6.0rc1-1 for changeset c0a99ab935a8 - [a0e2015435b6] - - * ChangeLog, PKGBUILD: - New upstream version - [c0a99ab935a8] [v0.6.0rc1-1] - - * PKGBUILD: - Removed conflicts - [0f0560190a81] - - * PKGBUILD: - Removed makedepends for gcc, the base-devel group is assumed to - exist - [4160ed469fa4] - - * PKGBUILD: - Fix typo in PKGBUILD - [85d988c7e4a5] - -2009-09-28 Dwayne Bent <dbb.0@liqd.org> - - * ChangeLog, PKGBUILD: - New upstream version - [3e4ffcdc887a] - -2009-07-29 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.5.1-1 for changeset 1be51884e580 - [74f32914279c] - - * ChangeLog, PKGBUILD: - New upstream version - [1be51884e580] [v0.5.1-1] - -2009-07-20 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Corrected tag name - [d9662df69ab4] - - * .hgtags: - Added tag v0.5.0 for changeset d228983b5873 - [a350368643eb] - - * PKGBUILD: - New upstream version - [d228983b5873] [v0.5.0-1] - - * ChangeLog: - Updated ChangeLog - [111cf16bfc8b] - -2009-07-14 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.5.0rc2-1 for changeset 701e6c5ed639 - [828bb0fc4e5e] - - * PKGBUILD: - New upstream version - [701e6c5ed639] [v0.5.0rc2-1] - - * ChangeLog: - Updated ChangeLog - [7616eaf8b835] - - * prosody.cfg.lua: - Enabled PEP in default configuration - [c8a7c4d15e38] - -2009-07-11 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua: - Cleaned up and added new modules to default configuration file - [07fdc8fd8ff9] - - * PKGBUILD: - Added luasec back as hard dependency - [9506bff48c77] - - * .hgtags: - Added tag v0.5.0rc1-2 for changeset a252809a03a3 - [803ace20879a] - - * ChangeLog, PKGBUILD: - New release version - [a252809a03a3] [v0.5.0rc1-2] - - * PKGBUILD: - Added make before make install - - This should fix Prosody not correctly reporting version. - [881eca5b8e0e] - - * .hgtags: - Added tag v0.5.0rc1-1 for changeset f1d918d4779e - [1fc8dbc498d5] - - * ChangeLog: - New upstream version - [f1d918d4779e] [v0.5.0rc1-1] - - * PKGBUILD, prosody.rcd: - Redid indent alignment and silenced successful output of prosodyctl - [de9bdd756bd8] - - * PKGBUILD, prosody-datadir.diff: - Converted to prosody-devel package - [92e5e98529dd] - -2009-06-30 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD, prosody.cfg.lua: - Moved luasec from depends to optdepends - - Since luasec is not strictly required for Prosody to operate it is - now an optional dependency. - [7079ec87eef5] - -2009-06-27 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-4 for changeset 0345a59e8495 - [1e488e1c03eb] - - * PKGBUILD: - New release version - [0345a59e8495] [v0.4.2-4] - - * prosody.install: - Added note about ChangeLog to install script - [c683ef309b6a] - - * PKGBUILD, prosody.rcd: - Use prosodyctl to start/stop daemon - [eaf4c26bb29f] - - * PKGBUILD, prosody.rcd: - Refactored start, stop, reload in rc.d script - - Start, stop, reload will not display a friendly error message if - Prosody is not running when you attempt to stop or reload, or if - Prosody is already running when you attempt to start. Reload also - now utilizes the get_pid function. - [9873d5256a42] - - * PKGBUILD, prosody.logrotated: - Use explicit log filenames in logrotate script - - This fixes an issue where if you do not have olddir enabled, rotated - logs will be rotated again. - [38ea11efacb9] - -2009-06-22 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD, prosody.rcd: - Added status command to rc.d usage - [1b31e88d992d] - - * PKGBUILD, prosody.rcd: - Added reload command - [62e3cbdff1d5] - - * prosody.install: - Updated leftover olddir path - [e91b3fc2a9ee] - - * PKGBUILD, prosody.rcd: - Use explicit source command - [b790c098d519] - - * prosody.install: - Removed tab characters - [870316274137] - -2009-06-20 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD: - Updated md5 sums - [74ce2ab8a96b] - - * prosody.logrotated: - Changed default olddir path - [cef8226473c2] - - * prosody.rcd: - Removed sleep delay in restart - [a94167e59091] - -2009-06-10 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua: - Removed per-host certificate entry in example configuration - - Until Issue #30 - [http://code.google.com/p/lxmppd/issues/detail?id=30] is fixed per- - host certificates have no effect. - [d00e35979450] - -2009-06-05 Dwayne Bent <dbb.0@liqd.org> - - * ChangeLog: - Added ChangeLog - [7298c4da135a] - -2009-06-03 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-3 for changeset 028183ffeba8 - [7dbfd040e908] - - * PKGBUILD: - New release version - [028183ffeba8] [v0.4.2-3] - - * PKGBUILD: - Removed superfluous make command - [3d96c98bac26] - - * PKGBUILD: - More consistent use of quote marks - [f6bd5b595b2d] - - * PKGBUILD, prosody.logrotated: - Correct PID file location in logrotate script - [cec60904c739] - -2009-05-30 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-2 for changeset 37268dd0d4fd - [a8a197635bb6] - - * PKGBUILD: - New release version - [37268dd0d4fd] [v0.4.2-2] - - * PKGBUILD: - Use install instead of mkdir in PKGBUILD - [8e48108bbe9a] - - * PKGBUILD, prosody-datadir.diff: - Apply patch to fix world-readable data directory - [2c706dda941c] - -2009-05-23 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4.2-1 for changeset 1d29ea2dc519 - [e2d2962de3f7] - - * PKGBUILD: - New upstream release - [1d29ea2dc519] [v0.4.2-1] - - * prosody.cfg.lua: - Aesthetic changes to the configuration file - [d5d848a58965] - -2009-05-22 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua: - Removed extraneous semicolon in configuration file - [9a002c74edc2] - - * PKGBUILD: - Cleaned up PKGBUILD license - [82cb66a84de8] - -2009-05-21 Dwayne Bent <dbb.0@liqd.org> - - * prosody.install: - Changed formatting of leftover path messages. - [ac6069de93c9] - - * prosody.install: - Moved prosody user removal to post_remove. - [2c60e27d0c13] - - * PKGBUILD, prosody.cfg.lua: - Added comment about pidfile in prosody configuration file. - [8b9fa4da48ca] - - * .hgtags: - Added tag v0.4.1-5 for changeset 69962178bcae - [01812099521b] - - * PKGBUILD: - New release version. - [69962178bcae] [v0.4.1-5] - - * PKGBUILD, prosody.cfg.lua, prosody.install, prosody.rcd: - Refactored rc.d daemon script. - - Prosody now writes its own PID file to /var/run/prosody/prosody.pid. - rc.d script now uses '/bin/kill -0' to check for running process - instead of awkward combination of 'ps' and 'awk'. - [4f0e937c5148] - - * prosody.install: - Added post_install message with link to Arch Wiki documentation. - [88d99267ad19] - -2009-05-19 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD: - Add logrotate script to backup array. - [d4f5445707f7] - -2009-05-11 Dwayne Bent <dbb.0@liqd.org> - - * prosody.install: - Fixed install script attempting to add prosody group when it already - exists. - [7d7807aa5d30] - - * .hgtags: - Added tag v0.4.1-4 for changeset 442f62077f30 - [389c885a35c5] - - * PKGBUILD: - New release version. - [442f62077f30] [v0.4.1-4] - - * PKGBUILD: - Generated correct checksums for source files. - [162859c9e287] - - * .hgtags: - Added tag v0.4.1-3 for changeset b629392e4716 - [f3d11fbd0b45] - - * PKGBUILD: - New release version. - [b629392e4716] [v0.4.1-3] - - * prosody.logrotated: - Fixed wrong PID file path in logrotate script. - [0871a4a12392] - -2009-05-07 Dwayne Bent <dbb.0@liqd.org> - - * prosody.cfg.lua, prosody.rcd: - Removed trailing whitespace. - [7c86c073650e] - - * prosody.cfg.lua: - Added logging timestamps to default configuration. - [46f9111d47ce] - - * .hgtags: - Added tag v0.4.1-2 for changeset 24b9dee19e65 - [5240b39d76d7] - - * PKGBUILD, prosody.cfg.lua, prosody.install, prosody.logrotated, - prosody.rcd: - Initial commit. - [24b9dee19e65] [v0.4.1-2] - diff --git a/community-testing/prosody/PKGBUILD b/community-testing/prosody/PKGBUILD deleted file mode 100644 index 3e4947701..000000000 --- a/community-testing/prosody/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 72560 2012-06-16 17:10:57Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Dwayne Bent <dbb.0@liqd.org> -# Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com> - -pkgname=prosody -pkgver=0.8.2 -pkgrel=4 -pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua." -arch=('i686' 'x86_64') -url="http://prosody.im/" -license=('MIT') -depends=('lua>=5.1' 'luasocket' 'luaexpat' 'luafilesystem' 'libidn>=0.5.18' 'openssl') -optdepends=('luasec: TLS encryption support' - 'lua-zlib: compression support' - 'luadbi: SQL storage support') -install=prosody.install -backup=('etc/logrotate.d/prosody' - 'etc/prosody/prosody.cfg.lua') -source=("http://prosody.im/depot/${pkgver}/prosody-${pkgver}.tar.gz" - 'prosody.rcd' - 'prosody.logrotated' - 'fix-config.patch' - 'prosody.tmpfile.d' - 'prosody.service') -md5sums=('6e907bf0d0acf24f1011083020ba6ffb' - 'd2b5f9c8e42bb31819e715eb1756ee53' - '26466fdbea87963a3ca6f48f76fe4a29' - '59a1bf2dfd0bd386cef6fa646e2a3752' - 'e2f5a1df410b05696a30dcb058841084' - 'e74045f27cb60908d535969906781f75') - -build() { - cd "$srcdir/prosody-$pkgver" - patch -p1 <$srcdir/fix-config.patch - ./configure --prefix=/usr --sysconfdir=/etc/prosody \ - --datadir=/var/lib/prosody - make -} - -package() { - cd "$srcdir/prosody-$pkgver" - - make DESTDIR="$pkgdir" install - - rm $pkgdir/etc/prosody/certs/* - - install -d "$pkgdir/etc/rc.d" - install -d "$pkgdir/etc/logrotate.d" - install -d "$pkgdir/var/log/prosody" - - install -o root -g root -m 755 "$srcdir/prosody.rcd" \ - "$pkgdir/etc/rc.d/prosody" - install -o root -g root -m 644 "$srcdir/prosody.logrotated" \ - "$pkgdir/etc/logrotate.d/prosody" - - install -Dm0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - install -Dm0644 $srcdir/prosody.tmpfile.d $pkgdir//usr/lib/tmpfiles.d/prosody.conf - install -Dm0644 $srcdir/prosody.service $pkgdir/usr/lib/systemd/system/prosody.service -} diff --git a/community-testing/prosody/fix-config.patch b/community-testing/prosody/fix-config.patch deleted file mode 100644 index 8856bfb92..000000000 --- a/community-testing/prosody/fix-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -wbBur prosody-0.8.0/prosody.cfg.lua.dist prosody-0.8.0.my/prosody.cfg.lua.dist ---- prosody-0.8.0/prosody.cfg.lua.dist 2011-04-05 13:47:06.000000000 +0000 -+++ prosody-0.8.0.my/prosody.cfg.lua.dist 2011-04-07 16:03:42.000000000 +0000 -@@ -21,6 +21,8 @@ - -- (see http://prosody.im/doc/creating_accounts for info) - -- Example: admins = { "user1@example.com", "user2@example.net" } - admins = { } -+daemonize = true -+pidfile = "/var/run/prosody/prosody.pid" - - -- Enable use of libevent for better performance under high load - -- For more information see: http://prosody.im/doc/libevent -@@ -59,7 +61,7 @@ - --"admin_telnet"; -- Opens telnet console interface on localhost port 5582 - - -- Other specific functionality -- --"posix"; -- POSIX functionality, sends server to background, enables syslog, etc. -+ "posix"; -- POSIX functionality, sends server to background, enables syslog, etc. - --"bosh"; -- Enable BOSH clients, aka "Jabber over HTTP" - --"httpserver"; -- Serve static files from a directory over HTTP - --"groups"; -- Shared roster support -@@ -123,8 +125,8 @@ - -- Logging configuration - -- For advanced logging see http://prosody.im/doc/logging - log = { -- info = "prosody.log"; -- Change 'info' to 'debug' for verbose logging -- error = "prosody.err"; -+ info = "/var/log/prosody/prosody.log"; -- Change 'info' to 'debug' for verbose logging -+ error = "/var/log/prosody/prosody.err"; - -- "*syslog"; -- Uncomment this for logging to syslog - -- "*console"; -- Log to the console, useful for debugging with daemonize=false - } diff --git a/community-testing/prosody/prosody.install b/community-testing/prosody/prosody.install deleted file mode 100644 index f935e3d63..000000000 --- a/community-testing/prosody/prosody.install +++ /dev/null @@ -1,35 +0,0 @@ -post_install() { - if [ -z "`grep '^prosody:' /etc/group`" ]; then - groupadd -g 412 prosody - fi - if [ -z "`grep '^prosody:' /etc/passwd`" ]; then - useradd -u 412 -d /var/lib/prosody -g prosody -s /bin/false prosody - fi - - chown prosody:prosody var/lib/prosody - chown prosody:prosody var/log/prosody - - echo ">> Documentation: http://wiki.archlinux.org/index.php/Prosody" -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - userdel prosody - - paths=(/etc/prosody /var/lib/prosody /var/log/prosody - /var/log/old/prosody) - - first=true - for path in ${paths[@]}; do - if [ -d $path ]; then - if $first; then - first=false - echo "==> Leftover Paths:" - fi - echo "==> $path" - fi - done -} diff --git a/community-testing/prosody/prosody.logrotated b/community-testing/prosody/prosody.logrotated deleted file mode 100644 index 5659ba01f..000000000 --- a/community-testing/prosody/prosody.logrotated +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/prosody/prosody.log /var/log/prosody/prosody.err { - # olddir /var/log/old/prosody - create 644 prosody prosody - sharedscripts - missingok - postrotate - /bin/kill -HUP `cat /var/run/prosody/prosody.pid 2> /dev/null` 2> /dev/null || true - endscript -} diff --git a/community-testing/prosody/prosody.rcd b/community-testing/prosody/prosody.rcd deleted file mode 100644 index afaf77903..000000000 --- a/community-testing/prosody/prosody.rcd +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash - -daemon_name=prosody -pid_file=/var/run/$daemon_name/$daemon_name.pid - -source /etc/rc.conf -source /etc/rc.d/functions - -get_pid() { - if [ -f $pid_file ]; then - /bin/kill -0 $(cat $pid_file) - if [ $? == 0 ]; then - cat $pid_file - fi - fi -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - [ -d /var/run/$daemon_name ] || { mkdir -p /var/run/$daemon_name ; chown prosody:prosody /var/run/prosody; } - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f $pid_file ] && rm -f $pid_file - mkdir -p `dirname $pid_file` - prosodyctl start 1>/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - add_daemon $daemon_name - stat_done - fi - else - stat_fail - printhl "$daemon_name is already running" - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - if [ ! -z "$PID" ]; then - prosodyctl stop 1>/dev/null 2>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f $pid_file &> /dev/null - rm_daemon $daemon_name - stat_done - fi - else - stat_fail - printhl "$daemon_name is not running" - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - - reload) - stat_busy "Reloading $daemon_name" - PID=$(get_pid) - if [ ! -z "$PID" ]; then - /bin/kill -HUP $PID 2> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - stat_done - fi - else - stat_fail - printhl "$daemon_name is not running" - fi - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|reload|status}" - esac - -exit 0 diff --git a/community-testing/prosody/prosody.service b/community-testing/prosody/prosody.service deleted file mode 100644 index f54159f55..000000000 --- a/community-testing/prosody/prosody.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=XMPP (Jabber) Server -After=network.target - -[Service] -Type=forking -PIDFile=/run/prosody/prosody.pid -ExecStart=/usr/bin/prosodyctl start -ExecStop=/usr/bin/prosodyctl stop - -[Install] -WantedBy=multi-user.target - diff --git a/community-testing/prosody/prosody.tmpfile.d b/community-testing/prosody/prosody.tmpfile.d deleted file mode 100644 index 5f6de657d..000000000 --- a/community-testing/prosody/prosody.tmpfile.d +++ /dev/null @@ -1 +0,0 @@ -d /run/prosody 0755 412 412 diff --git a/community-testing/pyqt3/PKGBUILD b/community-testing/pyqt3/PKGBUILD deleted file mode 100644 index 19e46af0b..000000000 --- a/community-testing/pyqt3/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 77299 2012-10-08 15:06:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> -# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net> - -pkgname=pyqt3 -pkgver=3.18.1 -pkgrel=11 -pkgdesc="A set of Python bindings for the Qt3 toolkit" -arch=('i686' 'x86_64') -url="http://www.riverbankcomputing.com/software/pyqt/intro" -depends=('python2-sip' 'qscintilla-qt3') -makedepends=('glu') -license=('GPL') -source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz") -md5sums=('f1d120495d1aaf393819e988c0a7bb7e') - -build() { - cd ${srcdir}/PyQt-x11-gpl-${pkgver} - . /etc/profile.d/qt3.sh - echo yes | python2 configure.py -b /usr/bin \ - -d /usr/lib/python2.7/site-packages \ - -v /usr/share/sip - make -} - -package() { - cd ${srcdir}/PyQt-x11-gpl-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/pysfml/PKGBUILD b/community-testing/pysfml/PKGBUILD deleted file mode 100644 index 204197c1b..000000000 --- a/community-testing/pysfml/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 29367 2010-10-13 15:58:47Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: scj <scj(at)archlinux(dot)us> - -pkgname=('python-pysfml' 'python2-pysfml') -pkgbase=python-pysfml -pkgver=1.6 -pkgrel=2 -pkgdesc="Python bindings for the SFML library" -arch=('i686' 'x86_64') -url="http://www.sfml-dev.org" -makedepends=('sfml' 'python' 'python2') -license=('zlib') -depends=() -replaces=('pysfml') -source=(http://downloads.sourceforge.net/sfml/SFML-${pkgver}-python-sdk.zip) -md5sums=('9acaf793ae9a498a51f7f6fc74307b32') - -build() { - cd "${srcdir}/SFML-${pkgver}/python" -} - -package_python-pysfml() { - depends=('sfml' 'python') - - cd "${srcdir}/SFML-${pkgver}/python" - - python3 setup.py install --root=${pkgdir} -} - -package_python2-pysfml() { - depends=('sfml' 'python2') - - cd "${srcdir}/SFML-${pkgver}/python" - - python2 setup.py install --root=${pkgdir} -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/python-bsddb/LICENSE b/community-testing/python-bsddb/LICENSE deleted file mode 100644 index 7d6035775..000000000 --- a/community-testing/python-bsddb/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (c) 2008-2009 Jesus Cea Avion - -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.
\ No newline at end of file diff --git a/community-testing/python-bsddb/PKGBUILD b/community-testing/python-bsddb/PKGBUILD deleted file mode 100644 index 64a455419..000000000 --- a/community-testing/python-bsddb/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 78072 2012-10-16 11:52:09Z allan $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-bsddb -pkgname=('python2-bsddb' 'python-bsddb') -pkgver=5.3.0 -pkgrel=3 -pkgdesc="Python interface for BerkeleyDB" -license=('MIT') -arch=('i686' 'x86_64') -url="http://www.jcea.es/programacion/pybsddb.htm" -makedepends=('python2-distribute' 'python-distribute') -source=(http://pypi.python.org/packages/source/b/bsddb3/bsddb3-${pkgver}.tar.gz - LICENSE) -sha1sums=('8743f6d7a2f5471094941a46859723aae88f3915' - 'ef4e4caf618781104dbf5824279ed39d127b4713') - -build () { - cd "${srcdir}" - - cp -r bsddb3-${pkgver}{,-python2} - - # Build python 3 module - cd bsddb3-${pkgver} - python3 setup.py --berkeley-db=/usr build - - # Build python 2 module - cd ../bsddb3-${pkgver}-python2 - python2 setup.py --berkeley-db=/usr build -} - -package_python2-bsddb() { - depends=('db' 'python2>=2.7') - cd "${srcdir}/bsddb3-${pkgver}-python2" - - python2 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python-bsddb() { - depends=('db' 'python>=3.3') - cd "${srcdir}/bsddb3-${pkgver}" - - python3 setup.py --berkeley-db=/usr install --root="${pkgdir}" --skip-build --optimize=1 - install -Dm644 "${srcdir}"/LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/python-gnupginterface/PKGBUILD b/community-testing/python-gnupginterface/PKGBUILD deleted file mode 100644 index 33446e9b3..000000000 --- a/community-testing/python-gnupginterface/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Aaron Schaefer <aaron@elasticdog.com> - -pkgbase=python-gnupginterface -pkgname=python2-gnupginterface -pkgver=0.3.2 -pkgrel=1 -pkgdesc='A Python interface to GNU Privacy Guard (GnuPG).' -arch=('i686' 'x86_64') -url='http://py-gnupg.sourceforge.net/' -license=('GPL') -depends=('gnupg' 'python2') -conflicts=('python-gnupginterface<=0.3.2-6') -replaces=('python-gnupginterface<=0.3.2-6') -source=("http://downloads.sourceforge.net/sourceforge/py-gnupg/GnuPGInterface-$pkgver.tar.gz") -md5sums=('d4627d83446f96bd8c22f8d15db3f7c2') - -package_python2-gnupginterface() { - cd "$srcdir/GnuPGInterface-$pkgver" - python2 setup.py install --root="$pkgdir" -O1 -} diff --git a/community-testing/python-mpi4py/PKGBUILD b/community-testing/python-mpi4py/PKGBUILD deleted file mode 100644 index 74cb41ee8..000000000 --- a/community-testing/python-mpi4py/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 78088 2012-10-16 11:52:49Z allan $ -# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Sebastien Binet <binet@cern.ch> - -pkgbase=python-mpi4py -pkgname=('python-mpi4py' 'python2-mpi4py') -pkgver=1.3 -pkgrel=2 -arch=('i686' 'x86_64') -url="http://mpi4py.scipy.org" -license=('BSD') -makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi') -source=(http://mpi4py.googlecode.com/files/mpi4py-${pkgver}.tar.gz) -sha1sums=('282c1b9e35b242c9bd86126ebc5af6c70d8c2833') - -build() { - cd "${srcdir}" - cp -a mpi4py-${pkgver}{,-python2} - - # Build python 3 module - cd mpi4py-${pkgver} - python3 setup.py build - - # Build python 2 module - cd ../mpi4py-${pkgver}-python2 - python2 setup.py build -} - -package_python-mpi4py() { - pkgdesc="Python bindings of the Message Passing Interface (MPI)" - depends=('python>=3.3' 'openmpi') - - cd "${srcdir}/mpi4py-${pkgver}" - python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build -} - -package_python2-mpi4py() { - pkgdesc="Python2 bindings of the Message Passing Interface (MPI)" - depends=('python2>=2.7' 'openmpi') - - cd "${srcdir}/mpi4py-${pkgver}-python2" - python2 setup.py install --root "${pkgdir}" --optimize=1 --skip-build -} diff --git a/community-testing/python-numarray/LICENSE b/community-testing/python-numarray/LICENSE deleted file mode 100644 index 30ff57fc4..000000000 --- a/community-testing/python-numarray/LICENSE +++ /dev/null @@ -1,9 +0,0 @@ -Copyright (C) 2005 Association of Universities for Research in Astronomy (AURA) - -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 AURA and its representatives may not be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY AURA ``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 AURA 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/community-testing/python-numarray/PKGBUILD b/community-testing/python-numarray/PKGBUILD deleted file mode 100644 index 327b286b5..000000000 --- a/community-testing/python-numarray/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 78090 2012-10-16 11:52:56Z allan $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com> - -pkgbase=python-numarray -pkgname=python2-numarray -pkgver=1.5.2 -pkgrel=6 -pkgdesc='Provides array manipulation and computational capabilities.' -arch=('i686' 'x86_64') -url='http://numpy.scipy.org/' -license=('BSD') -depends=('python2') -conflicts=('python2-numarray<=1.5.2-6') -replaces=('python2-numarray<=1.5.2-6') -source=("http://downloads.sourceforge.net/sourceforge/numpy/numarray-${pkgver}.tar.gz" - 'LICENSE') -md5sums=('d2ecfc60fe4869c328b872540d04e0f7' - 'e32b4466453e530d7fb0dbeee0ca1044') - -build() { - cd "${srcdir}/numarray-${pkgver}" - - # python2 fix - sed -i 's_#! /usr/bin/env python_#! /usr/bin/env python2_' Examples/convolve/benchmark.py -} - -package_python2-numarray() { - cd "${srcdir}/numarray-${pkgver}" - - python2 setup.py install --root="${pkgdir}" - install -D ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community-testing/python-openbabel/PKGBUILD b/community-testing/python-openbabel/PKGBUILD deleted file mode 100644 index 130117080..000000000 --- a/community-testing/python-openbabel/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 78091 2012-10-16 11:53:00Z allan $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Michal Bozon <bozonm@vscht.cz> - -pkgname=python-openbabel -pkgver=2.3.1 -pkgrel=3 -pkgdesc="Python bindings of openbabel library" -arch=('i686' 'x86_64') -url="http://openbabel.org/wiki/Python" -license=('GPL') -depends=('python' 'gcc-libs' "openbabel=${pkgver}" 'eigen2') -makedepends=('swig' 'cmake') -options=('!libtool') -source=(http://downloads.sourceforge.net/openbabel/openbabel-$pkgver.tar.gz) -md5sums=('1f029b0add12a3b55582dc2c832b04f8') - -build() { - cd "${srcdir}/openbabel-$pkgver" - - # Create babelconfig.h - cmake . - - # Regenerate interface with the patched swig 2.0.2 - cd scripts - swig -I../include/ -python -py3 -c++ openbabel-python.i - mv openbabel-python_wrap.cxx python/openbabel-python.cpp - mv openbabel.py python/ - - cd python - sed -i '19i os.path.join("/usr/include/openbabel-2.0"),' setup.py - sed -i '20i os.path.join("/usr/include/eigen2"),' setup.py -} - -package() { - cd "${srcdir}/openbabel-$pkgver/scripts/python" - python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 -} diff --git a/community-testing/python-psutil/PKGBUILD b/community-testing/python-psutil/PKGBUILD deleted file mode 100644 index 2ea97fda2..000000000 --- a/community-testing/python-psutil/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# $Id: PKGBUILD 78094 2012-10-16 11:53:08Z allan $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=python-psutil -pkgname=('python-psutil' 'python2-psutil') -pkgver=0.6.1 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://code.google.com/p/psutil/' -license=('custom: BSD') -makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') -source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") -sha1sums=('f7a76e201601d8e06a1fdf434422f884888aac86') - -build() { - cd psutil-$pkgver - python setup.py build --build-lib=build/python - python2 setup.py build --build-lib=build/python2 - find build/python2 -type f -exec \ - sed -i '1s,^#! \?/usr/bin/\(env \|\)python$,#!/usr/bin/python2,' {} \; -} - -package_python-psutil() { - pkgdesc='A cross-platform process and system utilities module for Python' - depends=('glibc' 'python') - - cd psutil-$pkgver - python setup.py build --build-lib=build/python \ - install --root="$pkgdir" --optimize=1 - install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE -} - -package_python2-psutil() { - pkgdesc='A cross-platform process and system utilities module for Python2' - depends=('glibc' 'python2') - - cd psutil-$pkgver - python2 setup.py build --build-lib=build/python2 \ - install --root="$pkgdir" --optimize=1 - install -D -m 644 LICENSE "$pkgdir/"usr/share/licenses/$pkgname/LICENSE -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/python-psycopg1/PKGBUILD b/community-testing/python-psycopg1/PKGBUILD deleted file mode 100644 index b2a54c3d5..000000000 --- a/community-testing/python-psycopg1/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 78095 2012-10-16 11:53:11Z allan $ -# Contributor: William Rea <sillywilly@gmail.com> - -pkgbase=python-psycopg1 -pkgname=python2-psycopg1 -pkgver=1.1.21 -pkgrel=8 -pkgdesc="A PostgreSQL database adapter for Python" -arch=('i686' 'x86_64') -url="http://initd.org/projects/psycopg1" -license=('GPL') -depends=('python2-egenix-mx-base' 'postgresql') -conflicts=('python-psycopg1<=1.1.21-7') -replaces=('python-psycopg1<=1.1.21-7') -source=(http://initd.org/psycopg/tarballs/PSYCOPG-1-1/psycopg-$pkgver.tar.gz) -md5sums=('a31f79f68d6d32898d6f24e11369a106') -sha1sums=('02d8a8b5dd682306117896c7c63a9a1b518997b6') - -build() { - cd "$srcdir/psycopg-$pkgver" - - ./configure --prefix=/usr --with-python=/usr/bin/python2 \ - --with-mxdatetime-includes=/usr/lib/python2.7/site-packages/mx/DateTime/mxDateTime - sed -e 's:\(echo " install -m 555 $$mod \)\($(PY_MOD_DIR)\)\("; \\\):\1${DESTDIR}\2/$$mod\3:' \ - -e 's:\($(INSTALL) -m 555 $$mod \)\($(PY_MOD_DIR)\)\(; \\\):\1${DESTDIR}\2/$$mod\3:' \ - -i Makefile - make -} - -package_python2-psycopg1() { - cd "$srcdir/psycopg-$pkgver" - - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/python-psycopg2/ChangeLog b/community-testing/python-psycopg2/ChangeLog deleted file mode 100644 index f31be0aaa..000000000 --- a/community-testing/python-psycopg2/ChangeLog +++ /dev/null @@ -1,25 +0,0 @@ - -2009-08-05 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated to: 2.0.11 - -2009-03-24 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 2.0.9 - -2009-01-11 Douglas Soares de Andrade <douglas@archlinux.org> - - * Rebuilt for python 2.6 - -2008-04-25 Mateusz Herych <heniekk@gmail.com> - - * Built for x86_64 - 2.0.7 - -2008-04-23 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Built for i686 - 2.0.7 - -2007-06-27 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 - diff --git a/community-testing/python-psycopg2/PKGBUILD b/community-testing/python-psycopg2/PKGBUILD deleted file mode 100644 index 34534e06a..000000000 --- a/community-testing/python-psycopg2/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 78096 2012-10-16 11:53:16Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgbase=python-psycopg2 -pkgname=('python-psycopg2' 'python2-psycopg2') -pkgver=2.4.5 -pkgrel=2 -pkgdesc="A PostgreSQL database adapter for the Python programming language." -arch=('i686' 'x86_64') -url="http://initd.org/psycopg/" -license=('LGPL3') -makedepends=('python2' 'python' 'postgresql-libs>=8.4.1') -source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-4/psycopg2-$pkgver.tar.gz) -md5sums=('075e4df465e9a863f288d5bdf6e6887e') - -build() { - cd "$srcdir/psycopg2-$pkgver" - sed -i 's/,PSYCOPG_DEBUG$//' setup.cfg -} - -package_python-psycopg2() { - depends=('python' 'postgresql-libs>=8.4.1') - - cd "$srcdir/psycopg2-$pkgver" - python setup.py install --root="$pkgdir" -} - -package_python2-psycopg2() { - depends=('python2' 'postgresql-libs>=8.4.1') - - cd "$srcdir/psycopg2-$pkgver" - python2 setup.py install --root="$pkgdir" -} diff --git a/community-testing/python-pymongo/PKGBUILD b/community-testing/python-pymongo/PKGBUILD deleted file mode 100644 index 0106f3034..000000000 --- a/community-testing/python-pymongo/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 78100 2012-10-16 11:53:25Z allan $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Thomas S Hatch <thatch45@gmail.com> - -pkgbase=python-pymongo -pkgname=('python-pymongo' 'python2-pymongo') -pkgver=2.3 -pkgrel=2 -pkgdesc='Python driver for MongoDB' -arch=('x86_64' 'i686') -license=('APACHE') -url='http://pypi.python.org/pypi/pymongo/' -makedepends=('python-distribute' 'python2-distribute') -source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz") -sha256sums=('8e43fdd7ea8e2aa965791af1b6e24186248023c6fde70092d9631b1d9150b1dc') - -build() { - cd "$srcdir" - cp -a "pymongo-$pkgver" "pymongo2-$pkgver" - -} - -package_python2-pymongo() { - depends=('python2') - cd "$srcdir/pymongo2-$pkgver" - - python2 setup.py install --root="$pkgdir" --optimize=1 -} - -package_python-pymongo() { - depends=('python') - - cd "$srcdir/pymongo-$pkgver" - - python setup.py install --root="$pkgdir" --optimize=1 -} -# vim:set ts=2 sw=2 et: diff --git a/community-testing/python-pyopencl/LICENSE.txt b/community-testing/python-pyopencl/LICENSE.txt deleted file mode 100644 index 3ce400f9d..000000000 --- a/community-testing/python-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-testing/python-pyopencl/PKGBUILD b/community-testing/python-pyopencl/PKGBUILD deleted file mode 100644 index c3bf9ef7a..000000000 --- a/community-testing/python-pyopencl/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 78161 2012-10-16 15:46:57Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgbase=python-pyopencl -pkgname=('python2-pyopencl' 'python-pyopencl' 'pyopencl-headers') -pkgver=2012.1 -pkgrel=5 -pkgdesc="A complete, object-oriented language binding of OpenCL to Python" -arch=('i686' 'x86_64') -url="http://mathema.tician.de/software/pyopencl" -license=('custom') -makedepends=('ctags' 'python2-distribute' 'python-distribute' 'libcl' 'opencl-headers' 'mesa' 'boost' 'python2-mako' 'python-mako' 'python-numpy' 'python2-numpy') -source=("http://pypi.python.org/packages/source/p/pyopencl/pyopencl-${pkgver}.tar.gz" - 'LICENSE.txt') -sha1sums=('ef2460d5e9b883d8afe0ec47863a243b6f8ac7ff' - '2e6966b3d9b15603ce2c3ff79eeadd63c5d066b7') - -build() { - cd "$srcdir" - - cp -a pyopencl-$pkgver{,-python2} - - cd "${srcdir}/pyopencl-${pkgver}" - python3 ./configure.py --cl-enable-gl --no-use-shipped-boost - python3 setup.py build - - cd "$srcdir/pyopencl-$pkgver-python2" - python2 ./configure.py --cl-enable-gl --no-use-shipped-boost - python2 setup.py build -} - -package_python-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python' 'python-numpy' 'python-mako' 'python-pytools' 'pyopencl-headers') - - cd "${srcdir}/pyopencl-${pkgver}" - python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - rm -fr "${pkgdir}"/usr/include - - install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python2-pyopencl() { - depends=('libcl' 'opencl-headers' 'mesa' 'boost' 'python2' 'python2-numpy' 'python2-mako' 'python2-pytools' 'pyopencl-headers') - - cd "${srcdir}/pyopencl-${pkgver}-python2" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - rm -fr "${pkgdir}"/usr/include - - install -D -m644 ../LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_pyopencl-headers() { - cd "${srcdir}/pyopencl-${pkgver}" - install -dm755 "${pkgdir}"/usr/include/pyopencl - - for file in pyopencl-bessel-j.cl pyopencl-cephes.cl pyopencl-airy.cl pyopencl-ranluxcl.cl pyopencl-complex.h; do - install -m644 src/cl/${file} "${pkgdir}"/usr/include/pyopencl - done -} diff --git a/community-testing/python-pyproj/PKGBUILD b/community-testing/python-pyproj/PKGBUILD deleted file mode 100644 index 5df85db9d..000000000 --- a/community-testing/python-pyproj/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 78103 2012-10-16 11:53:33Z allan $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> - -pkgbase=python-pyproj -pkgname=('python-pyproj' 'python2-pyproj') -pkgver=1.9.2 -pkgrel=1 -pkgdesc="Python interfaces to PROJ.4 library" -arch=('i686' 'x86_64') -url="http://code.google.com/p/pyproj" -license=('custom') -source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) -makedepends=('python' 'python2') -sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023') - -build() { - cd "${srcdir}" - - cp -a pyproj-${pkgver}{,-python2} - - # Build python 3 module - cd pyproj-${pkgver} - python3 setup.py build - - # Build python 2 module - cd ../pyproj-${pkgver}-python2 - python2 setup.py build -} - -package_python-pyproj() { - depends=('proj' 'python>=3.3') - - cd "${srcdir}"/pyproj-${pkgver} - python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} - -package_python2-pyproj() { - depends=('proj' 'python2>=2.7') - replaces=('pyproj') - - cd "${srcdir}"/pyproj-${pkgver}-python2 - python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build - - install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} - install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community-testing/python-pyxattr/PKGBUILD b/community-testing/python-pyxattr/PKGBUILD deleted file mode 100644 index a60dc386c..000000000 --- a/community-testing/python-pyxattr/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 78107 2012-10-16 11:53:42Z allan $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Jon Bergli Heier <snakebite@jvnv.net> - -pkgname=('python2-pyxattr' 'python-pyxattr') -pkgbase=python-pyxattr -_pkgname=pyxattr -pkgver=0.5.0 -pkgrel=4 -pkgdesc='A python extension module that allows you to manipulate the extended attributes.' -arch=('i686' 'x86_64') -url='http://pyxattr.sourceforge.net/' -license=('GPL') -makedepends=('python2' 'python' 'python2-distribute' 'python-distribute') -source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") -md5sums=('0f7ab1e185087329e40f7de218517c84') - -package_python2-pyxattr() { - depends=('python2') - provides=('pyxattr') - conflicts=('pyxattr') - replaces=('pyxattr') - - cd "${srcdir}/${_pkgname}-${pkgver}" - python2 setup.py install --root="${pkgdir}" -} - -package_python-pyxattr() { - depends=('python') - - cd "${srcdir}/${_pkgname}-${pkgver}" - python setup.py install --root="${pkgdir}" -} diff --git a/community-testing/python-pyzmq/PKGBUILD b/community-testing/python-pyzmq/PKGBUILD deleted file mode 100644 index a2951c651..000000000 --- a/community-testing/python-pyzmq/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 78108 2012-10-16 11:53:45Z allan $ -# Maintainer: Kyle Keen <keenerd at gmail dot com> -pkgname=python-pyzmq -pkgver=2.2.0.1 -pkgrel=2 -pkgdesc="Python3 bindings for zeromq, written in Cython" -arch=(i686 x86_64) -url="http://www.zeromq.org/bindings:python" -license=('LGPL') -depends=(zeromq python) -source=(https://github.com/zeromq/pyzmq/downloads/pyzmq-$pkgver.tar.gz) -md5sums=('f2f80709e84c8ac72d6671eee645d804') - -build() { - cd "$srcdir/pyzmq-$pkgver" - # py3 errors added in 2.2.0.1 - sed -i 's|except socket.error, e:|except socket.error as e:|' zmq/eventloop/ioloop.py - sed -i 's|except gevent.Timeout, t:|except gevent.Timeout as t:|' zmq/green/core.py - python3 setup.py install --root="$pkgdir" --optimize=0 -} diff --git a/community-testing/python-scipy/PKGBUILD b/community-testing/python-scipy/PKGBUILD deleted file mode 100644 index 49f943dc5..000000000 --- a/community-testing/python-scipy/PKGBUILD +++ /dev/null @@ -1,82 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Ray Rashif <schiv@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> -# Contributor: Bodor Dávid Gábor <david.gabor.bodor@gmail.com> -# Contributor: Andrzej Giniewicz <gginiu@gmail.com> - -pkgname=('python-scipy' 'python2-scipy') -pkgver=0.11.0 -pkgrel=2 -pkgdesc="SciPy is open-source software for mathematics, science, and engineering." -arch=('i686' 'x86_64') -url="http://www.scipy.org/" -license=('BSD') -makedepends=('gcc-fortran' 'python-numpy' 'python2-numpy') -checkdepends=('python-nose' 'python2-nose') -source=("http://downloads.sourceforge.net/scipy/scipy-${pkgver}.tar.gz") -md5sums=('842c81d35fd63579c41a8ca21a2419b9') - -build() { - unset LDFLAGS - unset FFLAGS - - # Changing the arithmetic parameter (Thanks to Fabrizio Castellano) - sed -i "s/\#define\ UNK\ 1/\#define\ IBMPC\ 1/" \ - scipy-${pkgver}/scipy/special/cephes/mconf.h - - # 2 builds - cp -r scipy-${pkgver} scipy-${pkgver}-py2 - - # build for python3 - cd scipy-${pkgver} - python setup.py config_fc --fcompiler=gnu95 build - - # build for python2 - cd ../scipy-${pkgver}-py2 - - for file in $(find . -name '*.py' -print); do - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file - sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file - done - - python2 setup.py config_fc --fcompiler=gnu95 build -} - -check() { - cd scipy-${pkgver} -# figure out how to run tests in the source tree easily -# python -c "from scipy import test; test('full')" - - cd ../scipy-${pkgver}-py2 -# figure out how to run tests in the source tree easily -# python2 -c "from scipy import test; test('full')" -} - -package_python-scipy() { - depends=('python-numpy') - provides=('python3-scipy' 'scipy') - - cd scipy-${pkgver} - - python setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root=${pkgdir} --optimize=1 - - install -Dm644 LICENSE.txt \ - "${pkgdir}/usr/share/licenses/python-scipy/LICENSE" -} - -package_python2-scipy() { - depends=('python2-numpy') - conflicts=('python-scipy<0.9.0') - - cd scipy-${pkgver}-py2 - - python2 setup.py config_fc --fcompiler=gnu95 install \ - --prefix=/usr --root=${pkgdir} --optimize=1 - - install -Dm644 LICENSE.txt \ - "${pkgdir}/usr/share/licenses/python2-scipy/LICENSE" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/python-sqlalchemy/PKGBUILD b/community-testing/python-sqlalchemy/PKGBUILD deleted file mode 100644 index e6a1ded02..000000000 --- a/community-testing/python-sqlalchemy/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 78113 2012-10-16 11:54:00Z allan $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=python-sqlalchemy -pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.7.9 -pkgrel=1 -arch=('i686' 'x86_64') # python2 package contain .so -url="http://www.sqlalchemy.org/" -license=('custom: MIT') -makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'python-nose' 'python2-nose') -source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('c4852d586d95a59fbc9358f4467875d5') - -build() { - cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver - cd SQLAlchemy-$pkgver - python setup.py build - cd ../SQLAlchemy2-$pkgver - python2 setup.py build -} - -package_python-sqlalchemy() { - pkgdesc='Python SQL toolkit and Object Relational Mapper' - depends=('python') - - cd SQLAlchemy-${pkgver} - python setup.py install --root="${pkgdir}" - install -D -m644 LICENSE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_python2-sqlalchemy() { - pkgdesc='Python 2 SQL toolkit and Object Relational Mapper' - depends=('python2') - - cd SQLAlchemy2-$pkgver - python2 setup.py install --root="$pkgdir" - install -D -m644 LICENSE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/python-yaml/PKGBUILD b/community-testing/python-yaml/PKGBUILD deleted file mode 100644 index 3d48ebc4e..000000000 --- a/community-testing/python-yaml/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 78118 2012-10-16 11:54:14Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Michal Bozon <michal.bozon__at__gmail.com> - -pkgbase=python-yaml -pkgname=(python2-yaml python-yaml) -pkgver=3.10 -pkgrel=3 -pkgdesc="Python bindings for YAML, using fast libYAML library" -arch=('i686' 'x86_64') -url="http://pyyaml.org" -license=('MIT') -makedepends=('python' 'python2' 'libyaml') -install='python-yaml.install' -source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz) -md5sums=('74c94a383886519e9e7b3dd1ee540247') - -build() { - true -} - -package_python2-yaml() { - depends=('python2' 'libyaml') - - cd $srcdir/PyYAML-$pkgver - python2 setup.py install --prefix=/usr --root=$pkgdir - install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} - -package_python-yaml() { - depends=('python' 'libyaml') - - cd $srcdir/PyYAML-$pkgver - python setup.py install --prefix=/usr --root=$pkgdir - install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-testing/python-yaml/python-yaml.install b/community-testing/python-yaml/python-yaml.install deleted file mode 100644 index e2ae0674b..000000000 --- a/community-testing/python-yaml/python-yaml.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - cat << EOT -==> Note that even though this package uses libyaml library, -==> slower pure python implementation is used by default. -==> See http://pyyaml.org/wiki/PyYAMLDocumentation -EOT -} diff --git a/community-testing/python2-cjson/PKGBUILD b/community-testing/python2-cjson/PKGBUILD deleted file mode 100644 index 2d95793a4..000000000 --- a/community-testing/python2-cjson/PKGBUILD +++ /dev/null @@ -1,19 +0,0 @@ -# $Id: PKGBUILD 66126 2012-02-23 01:35:30Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Lincoln de Sousa <lincoln@archlinux-br.org> - -pkgname=python2-cjson -pkgver=1.0.5 -pkgrel=5 -arch=('i686' 'x86_64') -license=('LGPL') -pkgdesc="Fast JSON encoder/decoder for Python" -url="http://pypi.python.org/pypi/python-cjson/" -depends=('python2') -source=("http://pypi.python.org/packages/source/p/python-cjson/python-cjson-$pkgver.tar.gz") -md5sums=('4d55b66ecdf0300313af9d030d9644a3') - -build() { - cd $srcdir/python-cjson-$pkgver - python2 setup.py install --root=$pkgdir -} diff --git a/community-testing/python2-galago/PKGBUILD b/community-testing/python2-galago/PKGBUILD deleted file mode 100644 index 6076c3a9e..000000000 --- a/community-testing/python2-galago/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 66128 2012-02-23 01:37:06Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python2-galago -pkgver=0.5.0 -pkgrel=6 -pkgdesc="A library of simple functions that are optimized for various CPUs" -arch=('i686' 'x86_64') -url="http://galago-project.org" -options=('!libtool') -license=('LGPL') -depends=('libgalago' 'pygtk') -source=(http://galago-project.org/files/releases/source/galago-python/galago-python-$pkgver.tar.bz2) -md5sums=('27be31fcf2886aa21823caec15dc34aa') - -build() { - cd $srcdir/galago-python-$pkgver - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install -} diff --git a/community-testing/python2-gnutls/PKGBUILD b/community-testing/python2-gnutls/PKGBUILD deleted file mode 100644 index 3a7c86a04..000000000 --- a/community-testing/python2-gnutls/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 74655 2012-08-01 13:54:20Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Hugo Doria <hugo@archlinux.org> -# Contributor: N3RD3X <n3rd3x@linuxmail.org> - -pkgname=python2-gnutls -pkgver=1.2.4 -pkgrel=2 -pkgdesc="Python wrapper for the GNUTLS library" -arch=('i686' 'x86_64') -url="http://cheeseshop.python.org/pypi/python-gnutls" -depends=('python2' 'gnutls') -license=('LGPL') -source=(http://pypi.python.org/packages/source/p/python-gnutls/python-gnutls-${pkgver}.tar.gz - gnutls3.patch) -md5sums=('e3536c421291a791869d875a41dcb26a' - '24bc95d9f5e71e9f5e180706cbb09248') - -build() { - cd ${srcdir}/python-gnutls-${pkgver} - patch -Np0 <$srcdir/gnutls3.patch - python2 setup.py install --root=${pkgdir} -} diff --git a/community-testing/python2-gnutls/gnutls3.patch b/community-testing/python2-gnutls/gnutls3.patch deleted file mode 100644 index 5110de2f2..000000000 --- a/community-testing/python2-gnutls/gnutls3.patch +++ /dev/null @@ -1,271 +0,0 @@ -diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py ---- gnutls/library/functions.py 2011-08-19 04:48:14.000000000 +0100 -+++ gnutls.fixed/library/functions.py 2012-08-01 11:56:43.450975419 +0100 -@@ -4,7 +4,7 @@ - import sys - from ctypes import * - --from gnutls.library import libgnutls, libgnutls_extra -+from gnutls.library import libgnutls - from gnutls.library.types import * - - -@@ -121,14 +121,6 @@ - gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)] - gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t) - --gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas --gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)] --gnutls_certificate_get_x509_cas.restype = None -- --gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls --gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)] --gnutls_certificate_get_x509_crls.restype = None -- - gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence - gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int] - gnutls_certificate_send_x509_rdn_sequence.restype = None -@@ -221,10 +213,6 @@ - gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)] - gnutls_certificate_type_set_priority.restype = c_int - --gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers --gnutls_certificate_verify_peers.argtypes = [gnutls_session_t] --gnutls_certificate_verify_peers.restype = c_int -- - gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2 - gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)] - gnutls_certificate_verify_peers2.restype = c_int -@@ -393,10 +381,6 @@ - gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)] - gnutls_error_to_alert.restype = c_int - --gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version --gnutls_extra_check_version.argtypes = [c_char_p] --gnutls_extra_check_version.restype = c_char_p -- - gnutls_fingerprint = libgnutls.gnutls_fingerprint - gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)] - gnutls_fingerprint.restype = c_int -@@ -409,10 +393,6 @@ - gnutls_global_init.argtypes = [] - gnutls_global_init.restype = c_int - --gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra --gnutls_global_init_extra.argtypes = [] --gnutls_global_init_extra.restype = c_int -- - gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function - gnutls_global_set_log_function.argtypes = [gnutls_log_func] - gnutls_global_set_log_function.restype = None -@@ -461,86 +441,6 @@ - gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] - gnutls_hex_encode.restype = c_int - --gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials --gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)] --gnutls_ia_allocate_client_credentials.restype = c_int -- --gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials --gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)] --gnutls_ia_allocate_server_credentials.restype = c_int -- --gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable --gnutls_ia_enable.argtypes = [gnutls_session_t, c_int] --gnutls_ia_enable.restype = None -- --gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send --gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int] --gnutls_ia_endphase_send.restype = c_int -- --gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret --gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p] --gnutls_ia_extract_inner_secret.restype = None -- --gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials --gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t] --gnutls_ia_free_client_credentials.restype = None -- --gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials --gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t] --gnutls_ia_free_server_credentials.restype = None -- --gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge --gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p] --gnutls_ia_generate_challenge.restype = c_int -- --gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr --gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t] --gnutls_ia_get_client_avp_ptr.restype = c_void_p -- --gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr --gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t] --gnutls_ia_get_server_avp_ptr.restype = c_void_p -- --gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake --gnutls_ia_handshake.argtypes = [gnutls_session_t] --gnutls_ia_handshake.restype = c_int -- --gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p --gnutls_ia_handshake_p.argtypes = [gnutls_session_t] --gnutls_ia_handshake_p.restype = c_int -- --gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret --gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p] --gnutls_ia_permute_inner_secret.restype = c_int -- --gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv --gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t] --gnutls_ia_recv.restype = ssize_t -- --gnutls_ia_send = libgnutls_extra.gnutls_ia_send --gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t] --gnutls_ia_send.restype = ssize_t -- --gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function --gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func] --gnutls_ia_set_client_avp_function.restype = None -- --gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr --gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p] --gnutls_ia_set_client_avp_ptr.restype = None -- --gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function --gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func] --gnutls_ia_set_server_avp_function.restype = None -- --gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr --gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p] --gnutls_ia_set_server_avp_ptr.restype = None -- --gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase --gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p] --gnutls_ia_verify_endphase.restype = c_int -- - gnutls_init = libgnutls.gnutls_init - gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t] - gnutls_init.restype = c_int -@@ -733,10 +633,6 @@ - gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t] - gnutls_psk_free_server_credentials.restype = None - --gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key --gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)] --gnutls_psk_netconf_derive_key.restype = c_int -- - gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username - gnutls_psk_server_get_username.argtypes = [gnutls_session_t] - gnutls_psk_server_get_username.restype = c_char_p -@@ -857,10 +753,6 @@ - gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t] - gnutls_session_enable_compatibility_mode.restype = None - --gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random --gnutls_session_get_client_random.argtypes = [gnutls_session_t] --gnutls_session_get_client_random.restype = c_void_p -- - gnutls_session_get_data = libgnutls.gnutls_session_get_data - gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] - gnutls_session_get_data.restype = c_int -@@ -873,18 +765,10 @@ - gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)] - gnutls_session_get_id.restype = c_int - --gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret --gnutls_session_get_master_secret.argtypes = [gnutls_session_t] --gnutls_session_get_master_secret.restype = c_void_p -- - gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr - gnutls_session_get_ptr.argtypes = [gnutls_session_t] - gnutls_session_get_ptr.restype = c_void_p - --gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random --gnutls_session_get_server_random.argtypes = [gnutls_session_t] --gnutls_session_get_server_random.restype = c_void_p -- - gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed - gnutls_session_is_resumed.argtypes = [gnutls_session_t] - gnutls_session_is_resumed.restype = c_int -@@ -905,10 +789,6 @@ - gnutls_set_default_priority.argtypes = [gnutls_session_t] - gnutls_set_default_priority.restype = c_int - --gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name --gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t] --gnutls_sign_algorithm_get_name.restype = c_char_p -- - gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get - gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)] - gnutls_sign_callback_get.restype = gnutls_sign_func -@@ -937,14 +817,6 @@ - gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int] - gnutls_transport_set_errno.restype = None - --gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno --gnutls_transport_set_global_errno.argtypes = [c_int] --gnutls_transport_set_global_errno.restype = None -- --gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat --gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int] --gnutls_transport_set_lowat.restype = None -- - gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr - gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t] - gnutls_transport_set_ptr.restype = None -@@ -1501,10 +1373,6 @@ - gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] - gnutls_x509_privkey_sign_hash.restype = c_int - --gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data --gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)] --gnutls_x509_privkey_verify_data.restype = c_int -- - gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get - gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)] - gnutls_x509_rdn_get.restype = c_int -diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py ---- gnutls/library/__init__.py 2011-11-11 17:23:49.000000000 +0000 -+++ gnutls.fixed/library/__init__.py 2012-08-01 11:57:42.284290997 +0100 -@@ -53,6 +53,9 @@ - else: - raise RuntimeError('cannot find lib%s on this system' % name) - -+def do_nothing(*args, **kwargs): -+ pass -+ - - def initialize_gcrypt(): - from ctypes import c_void_p -@@ -104,7 +107,7 @@ - libgcrypt = load_library(name='gcrypt', version=11) - gcry_control = libgcrypt.gcry_control - else: -- gcry_control = libgnutls.gcry_control -+ gcry_control = do_nothing - - gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr)) - if system == 'cygwin': -@@ -117,12 +120,10 @@ - - - --libgnutls = load_library(name='gnutls', version=26) --libgnutls_extra = load_library(name='gnutls-extra', version=26) -+libgnutls = load_library(name='gnutls', version=28) - - initialize_gcrypt() - libgnutls.gnutls_global_init() --libgnutls_extra.gnutls_global_init_extra() - - - from gnutls.library import constants -@@ -136,9 +137,6 @@ - if functions.gnutls_check_version(__need_version__) is None: - version = functions.gnutls_check_version(None) - raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__)) --if functions.gnutls_extra_check_version(__need_version__) is None: -- version = functions.gnutls_extra_check_version(None) -- raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__)) - - - del get_system_name, library_locations, load_library, initialize_gcrypt diff --git a/community-testing/python2-imaging/PKGBUILD b/community-testing/python2-imaging/PKGBUILD deleted file mode 100644 index 397dfceba..000000000 --- a/community-testing/python2-imaging/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 78139 2012-10-16 12:09:48Z allan $ -# Maintainer: Kyle Keen <keenerd@gmail.com> -# Contributor: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: simo <simo@archlinux.org> - -pkgname=python2-imaging -pkgver=1.1.7 -pkgrel=5 -pkgdesc="PIL. Provides image processing capabilities for python" -arch=('i686' 'x86_64') -url="http://www.pythonware.com/products/pil/index.htm" -license=('custom:"pil"') -depends=('python2' 'libjpeg' 'freetype2' 'lcms') -makedepends=('tk' 'sane') -optdepends=('tk: for the ImageTK module' - 'sane: for the ImageSane module') -provides=("pil=${pkgver}" "python-imaging=${pkgver}") -conflicts=('pil' 'python-imaging') -replaces=('pil' 'python-imaging') -source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz) -md5sums=('fc14a54e1ce02a0225be8854bfba478e') - -build() { - cd "${srcdir}/Imaging-${pkgver}" - python2 setup.py build_ext - cd Sane - python2 setup.py build_ext -} - -package() { - cd "${srcdir}/Imaging-${pkgver}" - python2 setup.py install --root="${pkgdir}" --optimize=1 - - pushd Sane - python2 setup.py install --root="${pkgdir}" --optimize=1 - popd - - install -dm755 "${pkgdir}/usr/include/python2.7/" - install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h - - # do not have files ending in .py in /usr/bin - for f in pildriver pilprint pilconvert pilfile pilfont; do - mv "${pkgdir}"/usr/bin/${f}{.py,} - done - - # Install license - install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \ - "${pkgdir}/usr/share/licenses/${pkgname}/README" -} diff --git a/community-testing/python2-lcms/PKGBUILD b/community-testing/python2-lcms/PKGBUILD deleted file mode 100644 index 3b75364ab..000000000 --- a/community-testing/python2-lcms/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 66130 2012-02-23 01:39:55Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Connor Behan <connor.behan@gmail.com> - -pkgname=python2-lcms -pkgver=1.19 -_mver=1.19 -pkgrel=4 -pkgdesc="LittleCMS Python bindings" -arch=(i686 x86_64) -license=('CUSTOM') -depends=('libtiff' 'python2' 'lcms') -url="http://www.littlecms.com" -options=('!libtool') -source=(http://downloads.sourceforge.net/project/lcms/lcms/${_mver}/lcms-$pkgver.tar.gz) -md5sums=('8af94611baf20d9646c7c2c285859818') - -build() { - cd $srcdir/lcms-${_mver} - ./configure --prefix=/usr --with-python - make -} - -package() { - cd $srcdir/lcms-${_mver} - make DESTDIR=$pkgdir install - install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - rm -rf $pkgdir/usr/bin \ - $pkgdir/usr/include \ - $pkgdir/usr/lib/pkgconfig \ - $pkgdir/usr/lib/liblcms.* \ - $pkgdir/usr/share/man/man1/icc2ps.1 \ - $pkgdir/usr/share/man/man1/icclink.1 \ - $pkgdir/usr/share/man/man1/jpegicc.1 \ - $pkgdir/usr/share/man/man1/tifficc.1 \ - $pkgdir/usr/share/man/man1/wtpt.1 -} diff --git a/community-testing/python2-m2crypto/PKGBUILD b/community-testing/python2-m2crypto/PKGBUILD deleted file mode 100644 index a68c5a35d..000000000 --- a/community-testing/python2-m2crypto/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 140196 2011-10-09 08:27:16Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Sergej Pupykin <sergej@aur.archlinux.org> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python2-m2crypto -pkgver=0.21.1 -pkgrel=2 -pkgdesc="A crypto and SSL toolkit for Python" -arch=('i686' 'x86_64') -url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto" -license=('BSD') -depends=('python2' 'openssl') -makedepends=('swig') -source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz") -md5sums=('f93d8462ff7646397a9f77a2fe602d17') - -build() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py build -} - -package() { - cd "${srcdir}/M2Crypto-${pkgver}" - python2 setup.py install --root="${pkgdir}/" --optimize=1 - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community-testing/python2-m2crypto/openssl1.patch b/community-testing/python2-m2crypto/openssl1.patch deleted file mode 100644 index 59dba554d..000000000 --- a/community-testing/python2-m2crypto/openssl1.patch +++ /dev/null @@ -1,531 +0,0 @@ -Index: tests/test_ssl.py -=================================================================== ---- tests/test_ssl.py (revision 698) -+++ tests/test_ssl.py (working copy) -@@ -405,8 +405,11 @@ - try: - ctx = SSL.Context('sslv23', weak_crypto=1) - s = SSL.Connection(ctx) -- s.connect(self.srv_addr) -- self.failUnlessEqual(s.get_version(), 'SSLv2') -+ if m2.OPENSSL_VERSION_NUMBER < 0x10000000: # SSLv2 ciphers disabled by default in newer OpenSSL -+ s.connect(self.srv_addr) -+ self.failUnlessEqual(s.get_version(), 'SSLv2') -+ else: -+ self.assertRaises(SSL.SSLError, s.connect, self.srv_addr) - s.close() - finally: - self.stop_server(pid) -Index: tests/test_x509.py -=================================================================== ---- tests/test_x509.py (revision 698) -+++ tests/test_x509.py (working copy) -@@ -142,7 +142,7 @@ - cn.set_data("Hello There!") - assert cn.get_data().as_text() == "Hello There!", cn.get_data().as_text() - -- assert n.as_hash() == 1697185131 -+ self.assertEquals(n.as_hash(), 1697185131) - - self.assertRaises(IndexError, lambda: n[100]) - self.assert_(n[10]) -Index: tests/test_smime.py -=================================================================== ---- tests/test_smime.py (revision 698) -+++ tests/test_smime.py (working copy) -@@ -6,7 +6,7 @@ - """ - - import unittest --from M2Crypto import SMIME, BIO, Rand, X509, EVP -+from M2Crypto import SMIME, BIO, Rand, X509, EVP, Err - - class SMIMETestCase(unittest.TestCase): - cleartext = 'some text to manipulate' -@@ -213,7 +213,7 @@ - - self.filenameSmime = 'tests/sig.p7s' - f = BIO.openfile(self.filenameSmime, 'wb') -- assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1 -+ assert s.write(f, p7, BIO.MemoryBuffer('some text')) == 1, Err.get_error() - f.close() - - def test_write_pkcs7_der(self): -Index: SWIG/_evp.i -=================================================================== ---- SWIG/_evp.i (revision 695) -+++ SWIG/_evp.i (working copy) -@@ -180,7 +180,7 @@ - - PKCS5_PBKDF2_HMAC_SHA1(passbuf, passlen, saltbuf, saltlen, iter, - keylen, key); -- ret = PyString_FromStringAndSize(key, keylen); -+ ret = PyString_FromStringAndSize((char*)key, keylen); - OPENSSL_cleanse(key, keylen); - return ret; - } -@@ -339,7 +339,7 @@ - klen = EVP_BytesToKey(cipher, md, (unsigned char *)sbuf, - (unsigned char *)dbuf, dlen, iter, - key, NULL); /* Since we are not returning IV no need to derive it */ -- ret = PyString_FromStringAndSize(key, klen); -+ ret = PyString_FromStringAndSize((char*)key, klen); - return ret; - } - -@@ -435,7 +435,7 @@ - PyErr_SetString(_evp_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- ret = PyString_FromStringAndSize(sigbuf, siglen); -+ ret = PyString_FromStringAndSize((char*)sigbuf, siglen); - OPENSSL_cleanse(sigbuf, siglen); - OPENSSL_free(sigbuf); - return ret; -@@ -513,7 +513,7 @@ - PyErr_SetString(PyExc_ValueError, "EVP_PKEY as DER failed"); - return NULL; - } -- der = PyString_FromStringAndSize(pp, len); -+ der = PyString_FromStringAndSize((char*)pp, len); - OPENSSL_free(pp); - return der; - } -Index: SWIG/_ssl.i -=================================================================== ---- SWIG/_ssl.i (revision 695) -+++ SWIG/_ssl.i (working copy) -@@ -17,13 +17,17 @@ - %apply Pointer NONNULL { SSL_CTX * }; - %apply Pointer NONNULL { SSL * }; - %apply Pointer NONNULL { SSL_CIPHER * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(SSL_CIPHER) * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { BIO * }; - %apply Pointer NONNULL { DH * }; - %apply Pointer NONNULL { RSA * }; - %apply Pointer NONNULL { EVP_PKEY *}; - %apply Pointer NONNULL { PyObject *pyfunc }; - -+%rename(ssl_get_ciphers) SSL_get_ciphers; -+extern STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *ssl); -+ - %rename(ssl_get_version) SSL_get_version; - extern const char *SSL_get_version(CONST SSL *); - %rename(ssl_get_error) SSL_get_error; -@@ -668,29 +672,25 @@ - return SSL_CIPHER_get_bits(c, NULL); - } - --STACK *ssl_get_ciphers(SSL *ssl) { -- return (STACK *)SSL_get_ciphers(ssl); -+int sk_ssl_cipher_num(STACK_OF(SSL_CIPHER) *stack) { -+ return sk_SSL_CIPHER_num(stack); - } - --int sk_ssl_cipher_num(STACK *stack) { -- return sk_num(stack); -+SSL_CIPHER *sk_ssl_cipher_value(STACK_OF(SSL_CIPHER) *stack, int idx) { -+ return sk_SSL_CIPHER_value(stack, idx); - } - --SSL_CIPHER *sk_ssl_cipher_value(STACK *stack, int idx) { -- return (SSL_CIPHER *)sk_value(stack, idx); -+STACK_OF(X509) *ssl_get_peer_cert_chain(SSL *ssl) { -+ return SSL_get_peer_cert_chain(ssl); - } - --STACK *ssl_get_peer_cert_chain(SSL *ssl) { -- return (STACK *)SSL_get_peer_cert_chain(ssl); -+int sk_x509_num(STACK_OF(X509) *stack) { -+ return sk_X509_num(stack); - } - --int sk_x509_num(STACK *stack) { -- return sk_num(stack); -+X509 *sk_x509_value(STACK_OF(X509) *stack, int idx) { -+ return sk_X509_value(stack, idx); - } -- --X509 *sk_x509_value(STACK *stack, int idx) { -- return (X509 *)sk_value(stack, idx); --} - %} - - %threadallow i2d_ssl_session; -Index: SWIG/_x509.i -=================================================================== ---- SWIG/_x509.i (revision 695) -+++ SWIG/_x509.i (working copy) -@@ -148,8 +148,15 @@ - extern int X509_NAME_print_ex(BIO *, X509_NAME *, int, unsigned long); - %rename(x509_name_print_ex_fp) X509_NAME_print_ex_fp; - extern int X509_NAME_print_ex_fp(FILE *, X509_NAME *, int, unsigned long); -+ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+%rename(x509_name_hash) X509_NAME_hash_old; -+extern unsigned long X509_NAME_hash_old(X509_NAME *); -+#else - %rename(x509_name_hash) X509_NAME_hash; - extern unsigned long X509_NAME_hash(X509_NAME *); -+#endif -+ - %rename(x509_name_get_index_by_nid) X509_NAME_get_index_by_NID; - extern int X509_NAME_get_index_by_NID(X509_NAME *, int, int); - -@@ -171,7 +178,7 @@ - if (PyString_Check($input)) { - Py_ssize_t len; - -- $1 = PyString_AsString($input); -+ $1 = (unsigned char *)PyString_AsString($input); - len = PyString_Size($input); - if (len > INT_MAX) { - PyErr_SetString(PyExc_ValueError, "object too large"); -@@ -184,7 +191,7 @@ - } - } - %rename(x509_name_entry_set_data) X509_NAME_ENTRY_set_data; --extern int X509_NAME_ENTRY_set_data( X509_NAME_ENTRY *, int, CONST unsigned char *, int); -+extern int X509_NAME_ENTRY_set_data(X509_NAME_ENTRY *, int, CONST unsigned char *, int); - %typemap(in) (CONST unsigned char *, int); - - %rename(x509_req_new) X509_REQ_new; -@@ -230,7 +237,7 @@ - %rename(x509_store_ctx_free) X509_STORE_CTX_free; - extern void X509_STORE_CTX_free(X509_STORE_CTX *); - %rename(x509_store_ctx_get1_chain) X509_STORE_CTX_get1_chain; --extern STACK *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); -+extern STACK_OF(X509) *X509_STORE_CTX_get1_chain(X509_STORE_CTX *); - - %rename(x509_extension_get_critical) X509_EXTENSION_get_critical; - extern int X509_EXTENSION_get_critical(X509_EXTENSION *); -@@ -348,7 +355,7 @@ - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - } - else { -- ret = PyString_FromStringAndSize(buf, len); -+ ret = PyString_FromStringAndSize((char*)buf, len); - OPENSSL_free(buf); - } - return ret; -@@ -435,12 +442,12 @@ - } - - int x509_name_set_by_nid(X509_NAME *name, int nid, PyObject *obj) { -- return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, PyString_AsString(obj), -1, -1, 0); -+ return X509_NAME_add_entry_by_NID(name, nid, MBSTRING_ASC, (unsigned char *)PyString_AsString(obj), -1, -1, 0); - } - - /* x509_name_add_entry_by_txt */ - int x509_name_add_entry_by_txt(X509_NAME *name, char *field, int type, char *bytes, int len, int loc, int set) { -- return X509_NAME_add_entry_by_txt(name, field, type, bytes, len, loc, set); -+ return X509_NAME_add_entry_by_txt(name, field, type, (unsigned char *)bytes, len, loc, set); - } - - PyObject *x509_name_get_der(X509_NAME *name) -@@ -450,23 +457,23 @@ - } - - /* sk_X509_new_null() is a macro returning "STACK_OF(X509) *". */ --STACK *sk_x509_new_null(void) { -- return (STACK *)sk_X509_new_null(); -+STACK_OF(X509) *sk_x509_new_null(void) { -+ return sk_X509_new_null(); - } - - /* sk_X509_free() is a macro. */ --void sk_x509_free(STACK *stack) { -- sk_X509_free((STACK_OF(X509) *)stack); -+void sk_x509_free(STACK_OF(X509) *stack) { -+ sk_X509_free(stack); - } - - /* sk_X509_push() is a macro. */ --int sk_x509_push(STACK *stack, X509 *x509) { -- return sk_X509_push((STACK_OF(X509) *)stack, x509); -+int sk_x509_push(STACK_OF(X509) *stack, X509 *x509) { -+ return sk_X509_push(stack, x509); - } - - /* sk_X509_pop() is a macro. */ --X509 *sk_x509_pop(STACK *stack) { -- return sk_X509_pop((STACK_OF(X509) *)stack); -+X509 *sk_x509_pop(STACK_OF(X509) *stack) { -+ return sk_X509_pop(stack); - } - - int x509_store_load_locations(X509_STORE *store, const char *file) { -@@ -493,21 +500,29 @@ - return X509_REQ_set_version(x, version); - } - --int x509_req_add_extensions(X509_REQ *req, STACK *exts) { -- return X509_REQ_add_extensions(req, (STACK_OF(X509_EXTENSION) *)exts); -+int x509_req_add_extensions(X509_REQ *req, STACK_OF(X509_EXTENSION) *exts) { -+ return X509_REQ_add_extensions(req, exts); - } - --X509_NAME_ENTRY *x509_name_entry_create_by_txt( X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -- return X509_NAME_ENTRY_create_by_txt( ne, field, type, bytes, len); -+X509_NAME_ENTRY *x509_name_entry_create_by_txt(X509_NAME_ENTRY **ne, char *field, int type, char *bytes, int len) { -+ return X509_NAME_ENTRY_create_by_txt( ne, field, type, (unsigned char *)bytes, len); - } - --LHASH * --x509v3_lhash(){ -- return lh_new(NULL,NULL); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+LHASH_OF(CONF_VALUE) -+#else -+LHASH -+#endif -+*x509v3_lhash() { -+ return lh_new(NULL, NULL); /* Should probably be lh_CONF_VALUE_new but won't compile. */ - } - - X509V3_CTX * --x509v3_set_conf_lhash(LHASH * lhash){ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_set_conf_lhash(LHASH_OF(CONF_VALUE) * lhash) { -+#else -+x509v3_set_conf_lhash(LHASH * lhash) { -+#endif - X509V3_CTX * ctx; - if (!(ctx=(X509V3_CTX *)PyMem_Malloc(sizeof(X509V3_CTX)))) { - PyErr_SetString(PyExc_MemoryError, "x509v3_set_conf_lhash"); -@@ -517,11 +532,20 @@ - return ctx; - } - --X509_EXTENSION *x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+X509_EXTENSION * -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+x509v3_ext_conf(LHASH_OF(CONF_VALUE) *conf, X509V3_CTX *ctx, char *name, char *value) { -+#else -+x509v3_ext_conf(LHASH *conf, X509V3_CTX *ctx, char *name, char *value) { -+#endif - X509_EXTENSION * ext = NULL; - ext = X509V3_EXT_conf(conf, ctx, name, value); - PyMem_Free(ctx); -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+ lh_CONF_VALUE_free(conf); -+#else - lh_free(conf); -+#endif - return ext; - } - -@@ -543,33 +567,33 @@ - } - - /* sk_X509_EXTENSION_new_null is a macro. */ --STACK *sk_x509_extension_new_null(void) { -- return (STACK *)sk_X509_EXTENSION_new_null(); -+STACK_OF(X509_EXTENSION) *sk_x509_extension_new_null(void) { -+ return sk_X509_EXTENSION_new_null(); - } - - /* sk_X509_EXTENSION_free() is a macro. */ --void sk_x509_extension_free(STACK *stack) { -- sk_X509_EXTENSION_free((STACK_OF(X509_EXTENSION) *)stack); -+void sk_x509_extension_free(STACK_OF(X509_EXTENSION) *stack) { -+ sk_X509_EXTENSION_free(stack); - } - - /* sk_X509_EXTENSION_push() is a macro. */ --int sk_x509_extension_push(STACK *stack, X509_EXTENSION *x509_ext) { -- return sk_X509_EXTENSION_push((STACK_OF(X509_EXTENSION) *)stack, x509_ext); -+int sk_x509_extension_push(STACK_OF(X509_EXTENSION) *stack, X509_EXTENSION *x509_ext) { -+ return sk_X509_EXTENSION_push(stack, x509_ext); - } - - /* sk_X509_EXTENSION_pop() is a macro. */ --X509_EXTENSION *sk_x509_extension_pop(STACK *stack) { -- return sk_X509_EXTENSION_pop((STACK_OF(X509_EXTENSION) *)stack); -+X509_EXTENSION *sk_x509_extension_pop(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_pop(stack); - } - - /* sk_X509_EXTENSION_num() is a macro. */ --int sk_x509_extension_num(STACK *stack) { -- return sk_X509_EXTENSION_num((STACK_OF(X509_EXTENSION) *)stack); -+int sk_x509_extension_num(STACK_OF(X509_EXTENSION) *stack) { -+ return sk_X509_EXTENSION_num(stack); - } - - /* sk_X509_EXTENSION_value() is a macro. */ --X509_EXTENSION *sk_x509_extension_value(STACK *stack, int i) { -- return sk_X509_EXTENSION_value((STACK_OF(X509_EXTENSION) *)stack, i); -+X509_EXTENSION *sk_x509_extension_value(STACK_OF(X509_EXTENSION) *stack, int i) { -+ return sk_X509_EXTENSION_value(stack, i); - } - - /* X509_STORE_CTX_get_app_data is a macro. */ -@@ -590,7 +614,7 @@ - #define I2DTYPE int (*)() - #endif - --STACK * -+STACK_OF(X509) * - make_stack_from_der_sequence(PyObject * pyEncodedString){ - STACK_OF(X509) *certs; - Py_ssize_t encoded_string_len; -@@ -606,7 +630,7 @@ - return NULL; - } - -- certs = ASN1_seq_unpack((unsigned char *)encoded_string, encoded_string_len, (D2ITYPE)d2i_X509, (void(*)())X509_free ); -+ certs = ASN1_seq_unpack_X509((unsigned char *)encoded_string, encoded_string_len, d2i_X509, X509_free ); - if (!certs) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -@@ -616,13 +640,13 @@ - } - - PyObject * --get_der_encoding_stack(STACK * stack){ -+get_der_encoding_stack(STACK_OF(X509) *stack){ - PyObject * encodedString; - - unsigned char * encoding; - int len; - -- encoding = ASN1_seq_pack((STACK_OF(X509)*) stack, (I2DTYPE)i2d_X509, NULL, &len); -+ encoding = ASN1_seq_pack_X509(stack, i2d_X509, NULL, &len); - if (!encoding) { - PyErr_SetString(_x509_err, ERR_reason_error_string(ERR_get_error())); - return NULL; -Index: SWIG/_aes.i -=================================================================== ---- SWIG/_aes.i (revision 695) -+++ SWIG/_aes.i (working copy) -@@ -76,7 +76,7 @@ - AES_encrypt((const unsigned char *)in, out, key); - else - AES_decrypt((const unsigned char *)in, out, key); -- return PyString_FromStringAndSize(out, outlen); -+ return PyString_FromStringAndSize((char*)out, outlen); - } - - int AES_type_check(AES_KEY *key) { -Index: SWIG/_util.i -=================================================================== ---- SWIG/_util.i (revision 695) -+++ SWIG/_util.i (working copy) -@@ -48,7 +48,7 @@ - PyErr_SetString(_util_err, ERR_reason_error_string(ERR_get_error())); - return NULL; - } -- obj = PyString_FromStringAndSize(ret, len); -+ obj = PyString_FromStringAndSize((char*)ret, len); - OPENSSL_free(ret); - return obj; - } -Index: SWIG/_m2crypto.i -=================================================================== ---- SWIG/_m2crypto.i (revision 695) -+++ SWIG/_m2crypto.i (working copy) -@@ -38,6 +38,19 @@ - #define CONST098 - #endif - -+/* Bring in STACK_OF macro definition */ -+%include <openssl/safestack.h> -+ -+/* Bring in LHASH_OF macro definition */ -+/* XXX Can't include lhash.h where LHASH_OF is defined, because it includes -+ XXX stdio.h etc. which we fail to include. So we have to (re)define -+ XXX LHASH_OF here instead. -+%include <openssl/lhash.h> -+*/ -+#if OPENSSL_VERSION_NUMBER >= 0x10000000L -+#define LHASH_OF(type) struct lhash_st_##type -+#endif -+ - %include constraints.i - %include _threads.i - %include _lib.i -Index: SWIG/_rand.i -=================================================================== ---- SWIG/_rand.i (revision 695) -+++ SWIG/_rand.i (working copy) -@@ -87,7 +87,7 @@ - Py_INCREF(Py_None); - return Py_None; - } else { -- PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize(blob, n)); -+ PyTuple_SET_ITEM(tuple, 0, PyString_FromStringAndSize((char*)blob, n)); - PyMem_Free(blob); - PyTuple_SET_ITEM(tuple, 1, PyInt_FromLong((long)ret)); - return tuple; -Index: SWIG/_pkcs7.i -=================================================================== ---- SWIG/_pkcs7.i (revision 695) -+++ SWIG/_pkcs7.i (working copy) -@@ -12,7 +12,7 @@ - %apply Pointer NONNULL { EVP_CIPHER * }; - %apply Pointer NONNULL { EVP_PKEY * }; - %apply Pointer NONNULL { PKCS7 * }; --%apply Pointer NONNULL { STACK * }; -+%apply Pointer NONNULL { STACK_OF(X509) * }; - %apply Pointer NONNULL { X509 * }; - - %rename(pkcs7_new) PKCS7_new; -@@ -54,8 +54,8 @@ - - %threadallow pkcs7_encrypt; - %inline %{ --PKCS7 *pkcs7_encrypt(STACK *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -- return PKCS7_encrypt((STACK_OF(X509) *)stack, bio, cipher, flags); -+PKCS7 *pkcs7_encrypt(STACK_OF(X509) *stack, BIO *bio, EVP_CIPHER *cipher, int flags) { -+ return PKCS7_encrypt(stack, bio, cipher, flags); - } - - PyObject *pkcs7_decrypt(PKCS7 *pkcs7, EVP_PKEY *pkey, X509 *cert, int flags) { -@@ -96,14 +96,14 @@ - - %threadallow pkcs7_sign1; - %inline %{ --PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK *stack, BIO *bio, int flags) { -- return PKCS7_sign(x509, pkey, (STACK_OF(X509) *)stack, bio, flags); -+PKCS7 *pkcs7_sign1(X509 *x509, EVP_PKEY *pkey, STACK_OF(X509) *stack, BIO *bio, int flags) { -+ return PKCS7_sign(x509, pkey, stack, bio, flags); - } - %} - - %threadallow pkcs7_verify1; - %inline %{ --PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, BIO *data, int flags) { -+PyObject *pkcs7_verify1(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, BIO *data, int flags) { - int outlen; - char *outbuf; - BIO *bio; -@@ -113,7 +113,7 @@ - PyErr_SetString(PyExc_MemoryError, "pkcs7_verify1"); - return NULL; - } -- if (!PKCS7_verify(pkcs7, (STACK_OF(X509) *)stack, store, data, bio, flags)) { -+ if (!PKCS7_verify(pkcs7, stack, store, data, bio, flags)) { - PyErr_SetString(_pkcs7_err, ERR_reason_error_string(ERR_get_error())); - BIO_free(bio); - return NULL; -@@ -131,7 +131,7 @@ - return ret; - } - --PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK *stack, X509_STORE *store, int flags) { -+PyObject *pkcs7_verify0(PKCS7 *pkcs7, STACK_OF(X509) *stack, X509_STORE *store, int flags) { - return pkcs7_verify1(pkcs7, stack, store, NULL, flags); - } - %} -@@ -229,7 +229,7 @@ - } - - /* return STACK_OF(X509)* */ --STACK *pkcs7_get0_signers(PKCS7 *p7, STACK *certs, int flags) { -+STACK_OF(X509) *pkcs7_get0_signers(PKCS7 *p7, STACK_OF(X509) *certs, int flags) { - return PKCS7_get0_signers(p7, certs, flags); - } - diff --git a/community-testing/python2-matplotlib/PKGBUILD b/community-testing/python2-matplotlib/PKGBUILD deleted file mode 100644 index 2f96cd33e..000000000 --- a/community-testing/python2-matplotlib/PKGBUILD +++ /dev/null @@ -1,55 +0,0 @@ -# $Id: PKGBUILD 73023 2012-06-28 11:16:15Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=python2-matplotlib -pkgver=1.1.0 -pkgrel=4 -pkgdesc="A python plotting library, making publication quality plots" -arch=('i686' 'x86_64') -url="http://matplotlib.sourceforge.net/" -license=('custom') -backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc) -depends=('python2-dateutil' 'python2-pytz' 'python2-numpy' 'python2-pyparsing' 'python2-pyqt') -optdepends=('pygtk: for use with the GTK or GTKAgg backend' - 'tk: used by the TkAgg backend' - 'wxpython: for use with the WXAgg backend') -makedepends=('pygtk' 'tk' 'wxpython') -provides=('matplotlib' "python-matplotlib=${pkgver}") -replaces=('python-matplotlib') -conflicts=('python-matplotlib') -source=("http://downloads.sourceforge.net/matplotlib/matplotlib-${pkgver}.tar.gz" - setup.cfg) -sha1sums=('435b4f04a7e099b79f66451d69ad0b5ce66030ae' - 'f074495fc965298e0372751b34c8edb319437c5f') - -build() { - cd "${srcdir}/matplotlib-${pkgver}" - - cp ../setup.cfg . - - # remove internal copy of pyparsing - rm lib/matplotlib/pyparsing.py - sed -i "s/matplotlib.pyparsing/pyparsing/g" lib/matplotlib/{mathtext,fontconfig_pattern}.py - - # remove internal copy of dateutil - rm -r lib/dateutil - - # python2 fix - for file in $(find . -name '*.py' -print); do - sed -i -e "s|^#!.*/usr/bin/python|#!/usr/bin/python2|" \ - -e "s|^#!.*/usr/bin/env *python|#!/usr/bin/env python2|" ${file} - done - - python2 setup.py build -} - -package() { - cd "${srcdir}/matplotlib-${pkgver}" - python2 setup.py install -O1 --skip-build --root "${pkgdir}" --prefix=/usr - - install -dm755 "${pkgdir}/usr/share/licenses/${pkgname}" - install -m 644 doc/users/license.rst "${pkgdir}/usr/share/licenses/${pkgname}" -} diff --git a/community-testing/python2-matplotlib/setup.cfg b/community-testing/python2-matplotlib/setup.cfg deleted file mode 100644 index 778b04ccc..000000000 --- a/community-testing/python2-matplotlib/setup.cfg +++ /dev/null @@ -1,83 +0,0 @@ -# Rename this file to setup.cfg to modify matplotlib's -# build options. - -[egg_info] -tag_svn_revision = 1 - -[directories] -# Uncomment to override the default basedir in setupext.py. -# This can be a single directory or a space-delimited list of directories. -#basedirlist = /usr - -[status] -# To suppress display of the dependencies and their versions -# at the top of the build log, uncomment the following line: -#suppress = True -# -# Uncomment to insert lots of diagnostic prints in extension code -#verbose = True - -[provide_packages] -# By default, matplotlib checks for a few dependencies and -# installs them if missing. This feature can be turned off -# by uncommenting the following lines. Acceptible values are: -# True: install, overwrite an existing installation -# False: do not install -# auto: install only if the package is unavailable. This -# is the default behavior -# -## Date/timezone support: -#pytz = False -dateutil = False - -[gui_support] -# Matplotlib supports multiple GUI toolkits, including Cocoa, -# GTK, Fltk, MacOSX, Qt, Qt4, Tk, and WX. Support for many of -# these toolkits requires AGG, the Anti-Grain Geometry library, -# which is provided by matplotlib and built by default. -# -# Some backends are written in pure Python, and others require -# extension code to be compiled. By default, matplotlib checks -# for these GUI toolkits during installation and, if present, -# compiles the required extensions to support the toolkit. GTK -# support requires the GTK runtime environment and PyGTK. Wx -# support requires wxWidgets and wxPython. Tk support requires -# Tk and Tkinter. The other GUI toolkits do not require any -# extension code, and can be used as long as the libraries are -# installed on your system. -# -# You can uncomment any the following lines if you know you do -# not want to use the GUI toolkit. Acceptible values are: -# True: build the extension. Exits with a warning if the -# required dependencies are not available -# False: do not build the extension -# auto: build if the required dependencies are available, -# otherwise skip silently. This is the default -# behavior -# -gtk = True -gtkagg = True -tkagg = True -wxagg = True -macosx = False - -[rc_options] -# User-configurable options -# -# Default backend, one of: Agg, Cairo, CocoaAgg, GTK, GTKAgg, GTKCairo, -# FltkAgg, MacOSX, Pdf, Ps, QtAgg, Qt4Agg, SVG, TkAgg, WX, WXAgg. -# -# The Agg, Ps, Pdf and SVG backends do not require external -# dependencies. Do not choose GTK, GTKAgg, GTKCairo, MacOSX, TkAgg or WXAgg -# if you have disabled the relevent extension modules. Agg will be used -# by default. -# -backend = Qt4Agg -# -# The numerix module was historically used to provide -# compatibility between the Numeric, numarray, and NumPy array -# packages. Now that NumPy has emerge as the universal array -# package for python, numerix is not really necessary and is -# maintained to provide backward compatibility. Do not change -# this unless you have a compelling reason to do so. -numerix = numpy diff --git a/community-testing/python2-pybluez/PKGBUILD b/community-testing/python2-pybluez/PKGBUILD deleted file mode 100644 index 6007614a6..000000000 --- a/community-testing/python2-pybluez/PKGBUILD +++ /dev/null @@ -1,23 +0,0 @@ -# $Id: PKGBUILD 66132 2012-02-23 01:40:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: cs-cam - me.at.camdaniel.com - -pkgname=python2-pybluez -pkgver=0.18 -pkgrel=4 -pkgdesc="Python wrapper for the BlueZ Bluetooth stack" -arch=('i686' 'x86_64') -url="http://code.google.com/p/pybluez/" -license=('GPL') -provides=('pybluez') -conflicts=('pybluez') -replaces=('pybluez') -depends=('python2' 'bluez') -source=(http://pybluez.googlecode.com/files/PyBluez-$pkgver.tar.gz) -md5sums=('be8c8ce615c3189fda1aaf3d568314b2') - -build() { - cd $srcdir/PyBluez-$pkgver - python2 setup.py install --root=$pkgdir - ln -s bluetooth/_bluetooth.so $pkgdir/usr/lib/python2.7/site-packages/_bluetooth.so -} diff --git a/community-testing/python2-pyopencl/LICENSE.txt b/community-testing/python2-pyopencl/LICENSE.txt deleted file mode 100644 index 3ce400f9d..000000000 --- a/community-testing/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-testing/python2-pyopencl/PKGBUILD b/community-testing/python2-pyopencl/PKGBUILD deleted file mode 100644 index 02a07630c..000000000 --- a/community-testing/python2-pyopencl/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73771 2012-07-15 13:20:19Z ibiru $ -# 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-testing/python2-pyxmpp/PKGBUILD b/community-testing/python2-pyxmpp/PKGBUILD deleted file mode 100644 index 49096a86f..000000000 --- a/community-testing/python2-pyxmpp/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 72078 2012-06-08 09:35:02Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python2-pyxmpp -pkgver=1.1.2 -pkgrel=2 -pkgdesc="A Python XMPP and Jabber implementation based on libxml2" -arch=('i686' 'x86_64') -url="http://pyxmpp.jajcus.net/" -license=('LGPL') -depends=('python2-dnspython' 'libxml2' 'python2-m2crypto') -source=(http://pyxmpp.jajcus.net/downloads/pyxmpp-$pkgver.tar.gz) -md5sums=('a38abf032aca0408b6055cd94296eb75') - -build() { - cd $srcdir/pyxmpp-$pkgver - python2 setup.py build - python2 setup.py install --root=$pkgdir -} diff --git a/community-testing/python2-simplejson/PKGBUILD b/community-testing/python2-simplejson/PKGBUILD deleted file mode 100644 index 1ec0a97b5..000000000 --- a/community-testing/python2-simplejson/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 74926 2012-08-09 22:02:03Z jlichtblau $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: David Moore <davidm@sjsoft.com> - -pkgname=python2-simplejson -pkgver=2.6.1 -pkgrel=3 -pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" -license=('MIT') -arch=('i686' 'x86_64') -url="http://undefined.org/python/#simplejson" -depends=('python2') -makedepends=('python2-distribute') -provides=("python-simplejson=$pkgver") -conflicts=('python-simplejson') -replaces=('python-simplejson') -changelog=$pkgname.changelog -source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver}) -sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31') - -build() { - cd ${srcdir}/simplejson-simplejson-* - - python2 setup.py install --root=${pkgdir} - -# License - install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \ - ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community-testing/python2-simplejson/python2-simplejson.changelog b/community-testing/python2-simplejson/python2-simplejson.changelog deleted file mode 100644 index c1e227d24..000000000 --- a/community-testing/python2-simplejson/python2-simplejson.changelog +++ /dev/null @@ -1,20 +0,0 @@ -2012-07-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.6.1-1 - -2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.5.2-1 - -2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.3.3-1 - -2011-10-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.2.1-1 - -2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * python-simplejson 2.1.3-1 - -2010-05-15 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.1.1 - -2010-03-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 2.1.0 diff --git a/community-testing/python2-vorbissimple/PKGBUILD b/community-testing/python2-vorbissimple/PKGBUILD deleted file mode 100644 index ba0a8be63..000000000 --- a/community-testing/python2-vorbissimple/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 66136 2012-02-23 01:43:46Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python2-vorbissimple -pkgver=0.0.2 -pkgrel=6 -pkgdesc="Python bindings for vorbissimple" -arch=('i686' 'x86_64') -url="http://kamaelia.sourceforge.net" -license=('MPL') -depends=('python2' 'vorbissimple') -makedepends=('pyrex') -source=(http://downloads.sourceforge.net/kamaelia/vorbissimple-$pkgver.tar.gz) -md5sums=('332077b25a4c9547947ab0922361ffda') - -build() { - cd $srcdir/vorbissimple-$pkgver/python - sed -i 's#__new__#__cinit__#' vorbissimple.pyx - python2 setup.py install --root=$pkgdir -} diff --git a/community-testing/qcad/PKGBUILD b/community-testing/qcad/PKGBUILD deleted file mode 100644 index 7cecac054..000000000 --- a/community-testing/qcad/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 77433 2012-10-10 12:17:59Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: Giovanni Scafora <linuxmania@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=qcad -pkgver=2.0.5.0 -pkgrel=11 -pkgdesc="A 2D CAD package based upon Qt" -arch=('i686' 'x86_64') -url="http://www.ribbonsoft.com/qcad.html" -license=('GPL2') -depends=('qt3') -makedepends=('glu') -options=(libtool) -source=(http://www.ribbonsoft.com/archives/$pkgname/$pkgname-$pkgver-1-community.src.tar.gz - qcad.xpm - QCad.desktop - qcad-intptr.patch - qcad.patch) - # http://ghost1227.com/files/misc/qm.tar.gz) -md5sums=('96b6a56027782aec953c9c4e64c5998c' - 'da32fec0d2fb85d96126bf28bb0ab9ff' - 'b4d1eb6724b4b41f191f1ab6fd859c39' - '92f900fe1fd3a8f841232b587b49c7da' - '7e6779b1e3b10da1eb4daf36d93f8479') - -build() { - export PATH="/opt/qt/bin:$PATH" - export QTDIR=/opt/qt - - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src - - [ "$CARCH" = "x86_64" ] && { - patch -p1 < ../qcad-intptr.patch; - sed -i '1,1i#include <stdint.h>' qcadlib/src/engine/rs_layer.cpp qcadlib/src/engine/rs_entity.cpp; - } - patch -p1 < ../qcad.patch - sed -i "s:"-pedantic"::g" mkspecs/defs.pro - - cd scripts - ./build_qcad.sh notrans -} - -package() { - cd ${srcdir}/${pkgname}-2.0.5.0-1-community.src/qcad - - install -D -m755 qcad ${pkgdir}/usr/bin/qcad - install -d ${pkgdir}/usr/share/{qcad,pixmaps,applications} - install -m644 ../../qcad.xpm ${pkgdir}/usr/share/pixmaps/qcad.xpm - install -m644 ../../QCad.desktop \ - ${pkgdir}/usr/share/applications/QCad.desktop - cp -r fonts patterns data library machines ${pkgdir}/usr/share/qcad - #cp -r ${srcdir}/qm ${pkgdir}/usr/share/qcad/ -} diff --git a/community-testing/qcad/QCad.desktop b/community-testing/qcad/QCad.desktop deleted file mode 100644 index a55f5940f..000000000 --- a/community-testing/qcad/QCad.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/qcad -Icon=/usr/share/pixmaps/qcad.xpm -Name=QCad -StartupNotify=true -Terminal=false -Type=Application -Categories=Application;Office; diff --git a/community-testing/qcad/qcad-intptr.patch b/community-testing/qcad/qcad-intptr.patch deleted file mode 100644 index 6d8b6acca..000000000 --- a/community-testing/qcad/qcad-intptr.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_entity.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_entity.cpp 2006-06-23 14:21:40.000000000 -0500 -@@ -849,7 +849,7 @@ - os << " layer: NULL "; - } else { - os << " layer: " << e.layer->getName().latin1() << " "; -- os << " layer address: " << (int)(e.layer) << " "; -+ os << " layer address: " << (intptr_t)(e.layer) << " "; - } - - os << e.pen << "\n"; -diff -Naur qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp ---- qcad-2.0.4.0-1.src.orig/qcadlib/src/engine/rs_layer.cpp 2004-09-14 15:13:02.000000000 -0500 -+++ qcad-2.0.4.0-1.src.patched/qcadlib/src/engine/rs_layer.cpp 2006-06-23 14:21:23.000000000 -0500 -@@ -57,7 +57,7 @@ - os << " name: " << l.getName().latin1() - << " pen: " << l.getPen() - << " frozen: " << (int)l.isFrozen() -- << " address: " << (int)(&l) -+ << " address: " << (intptr_t)(&l) - << std::endl; - return os; - } diff --git a/community-testing/qcad/qcad.patch b/community-testing/qcad/qcad.patch deleted file mode 100644 index f051f29af..000000000 --- a/community-testing/qcad/qcad.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -aur qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h ---- qcad-2.0.5.0-1-community.src.orig/dxflib/src/dl_writer.h 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/dxflib/src/dl_writer.h 2008-12-11 22:29:51.000000000 +0100 -@@ -37,6 +37,7 @@ - #endif - - #include <iostream> -+#include <cstring> - - #include "dl_attributes.h" - #include "dl_codes.h" -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadactions/src/rs_actionzoompan.cpp 2008-12-11 22:29:51.000000000 +0100 -@@ -23,7 +23,7 @@ - ** not clear to you. - ** - **********************************************************************/ -- -+#include <cstdlib> - #include "rs_actionzoompan.h" - #include "rs_snapper.h" - #include "rs_point.h" -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_entity.cpp.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.orig.rej. -Nur in qcad-2.0.5.0-1-community.src.new/qcadlib/src/engine: rs_layer.cpp.rej. -diff -aur qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp ---- qcad-2.0.5.0-1-community.src.orig/qcadlib/src/information/rs_information.cpp 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/qcadlib/src/information/rs_information.cpp 2008-12-11 22:30:18.000000000 +0100 -@@ -25,7 +25,7 @@ - **********************************************************************/ - - #include "rs_information.h" -- -+#include <cstdlib> - #include "rs_constructionline.h" - - -diff -aur qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh ---- qcad-2.0.5.0-1-community.src.orig/scripts/build_qcad.sh 2008-12-11 22:28:20.000000000 +0100 -+++ qcad-2.0.5.0-1-community.src.new/scripts/build_qcad.sh 2008-12-11 22:31:37.000000000 +0100 -@@ -16,9 +16,6 @@ - echo " distcc use distcc for distributed compilation. DISTCC_HOSTS must be set." - echo - --echo "QTDIR is: $QTDIR" --echo "QMAKESPEC is: $QMAKESPEC" -- - # detect system: - if [ "x$OS" == "xWindows_NT" ] - then diff --git a/community-testing/qcad/qcad.xpm b/community-testing/qcad/qcad.xpm deleted file mode 100644 index e747fa984..000000000 --- a/community-testing/qcad/qcad.xpm +++ /dev/null @@ -1,132 +0,0 @@ -/* XPM */ -static const char * qcad_xpm[] = { -"32 32 97 2", -" c None", -". c #3F3F3F", -"+ c #010180", -"@ c #FFFFFF", -"# c #E0E0EF", -"$ c #41419F", -"% c #4545A1", -"& c #4949A3", -"* c #4D4DA5", -"= c #5151A7", -"- c #5555A9", -"; c #5959AB", -"> c #4444A2", -", c #3C3C9D", -"' c #40409F", -") c #4444A1", -"! c #4848A3", -"~ c #4C4CA5", -"{ c #5050A7", -"] c #5454A9", -"^ c #5858AB", -"/ c #5D5DAD", -"( c #6161AF", -"_ c #6565B1", -": c #5C5CAD", -"< c #6060AF", -"[ c #6464B1", -"} c #6868B3", -"| c #6C6CB5", -"1 c #7070B7", -"2 c #7474B9", -"3 c #7878BB", -"4 c #3F3F9E", -"5 c #4343A0", -"6 c #4747A3", -"7 c #4B4BA5", -"8 c #000000", -"9 c #7C7CBD", -"0 c #8080BF", -"a c #4747A2", -"b c #4B4BA4", -"c c #4F4FA6", -"d c #7B7BBD", -"e c #7F7FBF", -"f c #8383C1", -"g c #5353A8", -"h c #8787C3", -"i c #5757AA", -"j c #8B8BC5", -"k c #4E4EA6", -"l c #5252A8", -"m c #5656AA", -"n c #5A5AAC", -"o c #8787C2", -"p c #8F8FC7", -"q c #5E5EAE", -"r c #8B8BC4", -"s c #8F8FC6", -"t c #9393C8", -"u c #6262B0", -"v c #8E8EC6", -"w c #9292C8", -"x c #9696CA", -"y c #6666B2", -"z c #9A9ACC", -"A c #6A6AB4", -"B c #9E9ECE", -"C c #6565B2", -"D c #6969B4", -"E c #6D6DB6", -"F c #7171B8", -"G c #7575BA", -"H c #9D9DCE", -"I c #A1A1D0", -"J c #7171B7", -"K c #7575B9", -"L c #7979BC", -"M c #7D7DBE", -"N c #8181C0", -"O c #8585C2", -"P c #8989C4", -"Q c #8D8DC6", -"R c #9191C8", -"S c #9595CA", -"T c #9999CC", -"U c #A5A5D2", -"V c #7979BB", -"W c #7D7DBD", -"X c #8181BF", -"Y c #8585C1", -"Z c #8989C3", -"` c #A9A9D4", -" . c #8D8DC5", -".. c #9191C7", -"+. c #9595C9", -"@. c #9999CB", -"#. c #ADADD6", -" ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" . . . . . . . . ", -" . . . + + + + + + + . . . ", -" . @ . @ + + # # # # # # # + + @ . @ . @ . ", -" . . . . . . . + # # $ % & * = - ; > > + . . . . . . . . . ", -" . . + # , ' ) ! ~ { ] ^ / ( _ > + . . ", -" . . + # , ' ) ! ~ { ] ^ : < [ } | > + . . ", -" . @ + # , ' ) ! ~ { ] ^ : < [ } | 1 2 > + @ . @ . ", -" . . . . + # ' ) ! . . . . . . . . . 1 2 3 > + . . . . . . ", -" . + # 4 5 6 7 . @ @ @ @ @ @ @ . 8 3 9 0 > + . . ", -" . + # 5 a b c . @ @ @ @ @ @ @ . 8 d e f > + . . ", -" . + # a b c g . @ @ @ @ @ @ @ . 8 e f h > + . @ . ", -" . . . + # b c g i . @ @ @ @ @ @ @ . 8 f h j > + . . . . . ", -" . + # k l m n . @ @ @ @ @ @ @ . 8 o j p > + . . ", -" . + # l m n q . @ @ @ @ @ @ @ . 8 r s t > + . . ", -" . + # m n q u . @ @ @ @ @ @ @ . 8 v w x > + . @ . ", -" . . . + # n q u y . @ @ @ @ @ @ @ . 8 w x z > + . . . . . ", -" . + # q u y A . @ @ @ @ @ @ @ . 8 x z B > + . . ", -" . + > C D E . . . . . . . . . 8 z B > + . . ", -" . @ + > D E F G 8 8 8 8 8 8 8 8 8 H I > + @ . @ . ", -" . . . . . + > J K L M N O P Q R S T H I U + . . . . . . . ", -" . . + > V W X Y Z Q R S T H I U ` > + . . ", -" . . + > > Y Z ...+.@.H > U ` #.#.> + . . ", -" . @ . @ + + > > > > > > > + > #.#.#.> + . @ . ", -" . . . . . . . . . . + + + + + + + . + > #.#.> + . . . . . ", -" . . . . . + > > + . . ", -" . . . . . + + . . ", -" . @ . @ . @ . @ . @ . @ . @ . ", -" . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", -" ", -" "}; diff --git a/community-testing/qingy/PKGBUILD b/community-testing/qingy/PKGBUILD deleted file mode 100644 index 54b88a8d9..000000000 --- a/community-testing/qingy/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 75329 2012-08-19 23:16:11Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - -pkgname=qingy -pkgver=1.0.0 -pkgrel=6 -pkgdesc="A DirectFB getty replacement" -arch=('i686' 'x86_64') -url="http://qingy.sourceforge.net/" -license=('GPL') -depends=('directfb' 'openssl' 'libxss') -makedepends=('emacs') -backup=('etc/qingy/settings' 'etc/qingy/welcomes') -options=('!libtool') -install=qingy.install -source=(http://downloads.sourceforge.net/sourceforge/qingy/${pkgname}-${pkgver}.tar.bz2 \ - qingy.logrotate qingy@.service) -sha1sums=('22ee505e935bf7ddcbd33e23f754a5a1ca082c81' - '21676cf0b71334c666f7b3e4f3d8b4f319266c81' - '55cfd0b24c1dedd8aaea42fd03f5ec39a1be5e70') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|/lib/security/||' media/pam/default/qingy - XFREE=/usr/bin/Xorg XINIT=/usr/bin/xinit \ - ./configure --prefix=/usr --sbindir=/sbin --sysconfdir=/etc \ - --disable-optimizations --enable-pam \ - --disable-static-build --enable-gpm-lock --enable-emacs - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/qingy.logrotate" "${pkgdir}/etc/logrotate.d/qingy" - install -D -m644 "${srcdir}/qingy@.service" "${pkgdir}/usr/lib/systemd/system/qingy@.service" -} diff --git a/community-testing/qingy/qingy.install b/community-testing/qingy/qingy.install deleted file mode 100644 index 5cf234b72..000000000 --- a/community-testing/qingy/qingy.install +++ /dev/null @@ -1,18 +0,0 @@ -infodir=usr/share/info -filelist=(qingy.info.gz) - -post_install() { - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community-testing/qingy/qingy.logrotate b/community-testing/qingy/qingy.logrotate deleted file mode 100644 index e16fb8d2a..000000000 --- a/community-testing/qingy/qingy.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/qingy.log { - compress - rotate 1 - size=+1024k - notifempty - missingok - copytruncate - noolddir -} diff --git a/community-testing/qingy/qingy@.service b/community-testing/qingy/qingy@.service deleted file mode 100644 index ce2156def..000000000 --- a/community-testing/qingy/qingy@.service +++ /dev/null @@ -1,20 +0,0 @@ -[Unit] -Description=Quingy on %I -Documentation=info:qingy -After=systemd-user-sessions.service plymouth-quit-wait.service - -[Service] -Environment=TERM=linux -ExecStart=/sbin/qingy %I -n -Restart=always -RestartSec=0 -UtmpIdentifier=%I -TTYPath=/dev/%I -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes -KillMode=process -IgnoreSIGPIPE=no - -[Install] -Alias=getty.target.wants/qingy@tty1.service diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD deleted file mode 100644 index dc5485029..000000000 --- a/community-testing/qlandkartegt/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 77586 2012-10-13 02:31:01Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Matthias Maennich <arch@maennich.net> -# Contributor: <boenki@gmx.de> - -pkgname=qlandkartegt -pkgver=1.5.1 -pkgrel=2 -pkgdesc="Use your GPS with Linux" -arch=('i686' 'x86_64') -url="http://www.qlandkarte.org/" -license=('GPL') -depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'glu' 'postgresql-libs' - 'qt' 'shared-mime-info' 'qtwebkit') -makedepends=('cmake' 'garmindev' 'mesa') -optdepends=('garmindev: to connect garmin devices') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz - $pkgname-mimetypes.xml) -sha256sums=('095cd2390684eead61b2868e1efc85500d6d61e95f3d54d0fd255cd95f55aadd' - 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') - -build() { - cd "${srcdir}" - mkdir build - cd build - - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package(){ - cd "${srcdir}/build" - - make DESTDIR="${pkgdir}" install - - install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ - "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" -} diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml deleted file mode 100644 index 46d3d402c..000000000 --- a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0"?> -<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'> - <mime-type type="application/vnd.qlandkartegt.qlb"> - <comment>QLandkarteGT File</comment> - <glob pattern="*.qlb"/> - </mime-type> -</mime-info> diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog deleted file mode 100644 index 47c05ab04..000000000 --- a/community-testing/qlandkartegt/qlandkartegt.changelog +++ /dev/null @@ -1,48 +0,0 @@ -2012-09-06 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.5.1-1 - -2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.5.0-1 - -2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.4.2-1 - -2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.4.1-1 - -2012-03-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.4.0-1 - -2012-02-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.3.2-1 - -2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.3.1-1 - -2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.2.4-1 - -2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.2.3-1 - -2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.2.2-1 - -2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.2.1-1 - -2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.2.0-1 - -2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.1.2-1 - -2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.1.1-1 - -2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.1.0-1 - -2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * qlandkartegt 1.0.1-2 - * moved to [community] with 59 AUR votes diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install deleted file mode 100644 index e55805570..000000000 --- a/community-testing/qlandkartegt/qlandkartegt.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - update-mime-database usr/share/mime > /dev/null -} - -post_remove() { - post_install $1 -} 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/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD deleted file mode 100644 index a65aeda04..000000000 --- a/community-testing/qtcreator/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 78436 2012-10-18 11:43:26Z svenstaro $ -# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Dan Vratil <progdan@progdansoft.com> -# Contributor: thotypous <matiasΘarchlinux-br·org> -# Contributor: delor <bartekpiech gmail com> - -pkgname="qtcreator" -pkgver=2.6.0rc -_pkgver=2.6.0-rc -pkgrel=1 -pkgdesc='Lightweight, cross-platform integrated development environment' -arch=('i686' 'x86_64') -url='http://qt.nokia.com/products/developer-tools' -license=('LGPL') -depends=('qt') -makedepends=('qt-private-headers' 'git') -options=('docs') -optdepends=('qt-doc: for the integrated Qt documentation' - 'gdb: for the debugger' - 'cmake: for cmake project suppport' - 'openssh-askpass: for ssh support' - 'git: for git support' - 'mercurial: for mercurial support' - 'bzr: for bazaar support' - 'valgrind: for analyze support') -install=qtcreator.install -source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz" - 'qtcreator.desktop') -md5sums=('df82e307dc9212fd69c1ee4e40501169' - '1bc38c4541cad4eafd83db7ac1524a42') - -build() { - cd ${srcdir} - - [[ -d build ]] && rm -r build - mkdir build && cd build - - qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro - make -} - -package() { - cd ${srcdir}/build - - make INSTALL_ROOT="${pkgdir}/usr/" install - - install -Dm644 ${srcdir}/qtcreator.desktop \ - ${pkgdir}/usr/share/applications/qtcreator.desktop - install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \ - ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT -} diff --git a/community-testing/qtcreator/fix-glsl-shit.patch b/community-testing/qtcreator/fix-glsl-shit.patch deleted file mode 100644 index 4b5e504e1..000000000 --- a/community-testing/qtcreator/fix-glsl-shit.patch +++ /dev/null @@ -1,2376 +0,0 @@ -From e91045469d59c35607faa344bcfba2b2c566da51 Mon Sep 17 00:00:00 2001 -From: Christian Kamm <christian.d.kamm@nokia.com> -Date: Mon, 6 Aug 2012 11:29:55 +0200 -Subject: [PATCH] GLSL: Fix recovery token order to avoid infinite loop. - -The case 'a = b ? ;' recovered with T_NUMBER, T_COMMA, T_NUMBER, ... - -Task-number: QTCREATORBUG-7517 -Change-Id: I3546266b21d11ce08e4af1331be94a78d3b24c19 -Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> ---- - src/libs/glsl/glsl.g | 4 +- - src/libs/glsl/glslparser.cpp | 638 +++++++++++++++++++++--------------------- - src/libs/glsl/glslparser.h | 2 +- - 3 files changed, 322 insertions(+), 322 deletions(-) - -diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g -index 67f564c..3c6ae7c 100644 ---- a/src/libs/glsl/glsl.g -+++ b/src/libs/glsl/glsl.g -@@ -456,7 +456,7 @@ private: - #include <iostream> - #include <cstdio> - #include <cassert> --#include <QtCore/QDebug> -+#include <QDebug> - - using namespace GLSL; - -@@ -591,7 +591,7 @@ AST *Parser::parse(int startToken) - - static int tks[] = { - T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, -- T_SEMICOLON, T_COMMA, T_COLON, -+ T_SEMICOLON, T_COLON, T_COMMA, - T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, - T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, - T_WHILE, -diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp -index cf4bbe4..d82096b 100644 ---- a/src/libs/glsl/glslparser.cpp -+++ b/src/libs/glsl/glslparser.cpp -@@ -1,5 +1,5 @@ - --#line 427 "./glsl.g" -+#line 423 "./glsl.g" - - /************************************************************************** - ** -@@ -171,7 +171,7 @@ AST *Parser::parse(int startToken) - - static int tks[] = { - T_RIGHT_BRACE, T_RIGHT_PAREN, T_RIGHT_BRACKET, -- T_SEMICOLON, T_COMMA, T_COLON, -+ T_SEMICOLON, T_COLON, T_COMMA, - T_NUMBER, T_TYPE_NAME, T_IDENTIFIER, - T_LEFT_BRACE, T_LEFT_PAREN, T_LEFT_BRACKET, - T_WHILE, -@@ -215,137 +215,137 @@ AST *Parser::parse(int startToken) - return 0; - } - --#line 647 "./glsl.g" -+#line 641 "./glsl.g" - - void Parser::reduce(int ruleno) - { - switch(ruleno) { - --#line 656 "./glsl.g" -+#line 650 "./glsl.g" - - case 0: { - ast(1) = makeAstNode<IdentifierExpressionAST>(string(1)); - } break; - --#line 663 "./glsl.g" -+#line 657 "./glsl.g" - - case 1: { - ast(1) = makeAstNode<LiteralExpressionAST>(string(1)); - } break; - --#line 670 "./glsl.g" -+#line 664 "./glsl.g" - - case 2: { - ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("true", 4)); - } break; - --#line 677 "./glsl.g" -+#line 671 "./glsl.g" - - case 3: { - ast(1) = makeAstNode<LiteralExpressionAST>(_engine->identifier("false", 5)); - } break; - --#line 684 "./glsl.g" -+#line 678 "./glsl.g" - - case 4: { - // nothing to do. - } break; - --#line 691 "./glsl.g" -+#line 685 "./glsl.g" - - case 5: { - ast(1) = ast(2); - } break; - --#line 698 "./glsl.g" -+#line 692 "./glsl.g" - - case 6: { - // nothing to do. - } break; - --#line 705 "./glsl.g" -+#line 699 "./glsl.g" - - case 7: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ArrayAccess, expression(1), expression(3)); - } break; - --#line 712 "./glsl.g" -+#line 706 "./glsl.g" - - case 8: { - // nothing to do. - } break; - --#line 719 "./glsl.g" -+#line 713 "./glsl.g" - - case 9: { - ast(1) = makeAstNode<MemberAccessExpressionAST>(expression(1), string(3)); - } break; - --#line 726 "./glsl.g" -+#line 720 "./glsl.g" - - case 10: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostIncrement, expression(1)); - } break; - --#line 733 "./glsl.g" -+#line 727 "./glsl.g" - - case 11: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PostDecrement, expression(1)); - } break; - --#line 740 "./glsl.g" -+#line 734 "./glsl.g" - - case 12: { - // nothing to do. - } break; - --#line 747 "./glsl.g" -+#line 741 "./glsl.g" - - case 13: { - // nothing to do. - } break; - --#line 754 "./glsl.g" -+#line 748 "./glsl.g" - - case 14: { - ast(1) = makeAstNode<FunctionCallExpressionAST> - (sym(1).function.id, sym(1).function.arguments); - } break; - --#line 762 "./glsl.g" -+#line 756 "./glsl.g" - - case 15: { - ast(1) = makeAstNode<FunctionCallExpressionAST> - (expression(1), sym(3).function.id, sym(3).function.arguments); - } break; - --#line 770 "./glsl.g" -+#line 764 "./glsl.g" - - case 16: { - // nothing to do. - } break; - --#line 777 "./glsl.g" -+#line 771 "./glsl.g" - - case 17: { - // nothing to do. - } break; - --#line 784 "./glsl.g" -+#line 778 "./glsl.g" - - case 18: { - sym(1).function.id = sym(1).function_identifier; - sym(1).function.arguments = 0; - } break; - --#line 792 "./glsl.g" -+#line 786 "./glsl.g" - - case 19: { - sym(1).function.id = sym(1).function_identifier; - sym(1).function.arguments = 0; - } break; - --#line 800 "./glsl.g" -+#line 794 "./glsl.g" - - case 20: { - sym(1).function.id = sym(1).function_identifier; -@@ -353,7 +353,7 @@ case 20: { - makeAstNode< List<ExpressionAST *> >(expression(2)); - } break; - --#line 809 "./glsl.g" -+#line 803 "./glsl.g" - - case 21: { - sym(1).function.arguments = -@@ -361,379 +361,379 @@ case 21: { - (sym(1).function.arguments, expression(3)); - } break; - --#line 818 "./glsl.g" -+#line 812 "./glsl.g" - - case 22: { - // nothing to do. - } break; - --#line 825 "./glsl.g" -+#line 819 "./glsl.g" - - case 23: { - ast(1) = makeAstNode<FunctionIdentifierAST>(type(1)); - } break; - --#line 832 "./glsl.g" -+#line 826 "./glsl.g" - - case 24: { - ast(1) = makeAstNode<FunctionIdentifierAST>(string(1)); - } break; - --#line 839 "./glsl.g" -+#line 833 "./glsl.g" - - case 25: { - // nothing to do. - } break; - --#line 846 "./glsl.g" -+#line 840 "./glsl.g" - - case 26: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreIncrement, expression(2)); - } break; - --#line 853 "./glsl.g" -+#line 847 "./glsl.g" - - case 27: { - ast(1) = makeAstNode<UnaryExpressionAST>(AST::Kind_PreDecrement, expression(2)); - } break; - --#line 860 "./glsl.g" -+#line 854 "./glsl.g" - - case 28: { - ast(1) = makeAstNode<UnaryExpressionAST>(sym(1).kind, expression(2)); - } break; - --#line 867 "./glsl.g" -+#line 861 "./glsl.g" - - case 29: { - sym(1).kind = AST::Kind_UnaryPlus; - } break; - --#line 874 "./glsl.g" -+#line 868 "./glsl.g" - - case 30: { - sym(1).kind = AST::Kind_UnaryMinus; - } break; - --#line 881 "./glsl.g" -+#line 875 "./glsl.g" - - case 31: { - sym(1).kind = AST::Kind_LogicalNot; - } break; - --#line 888 "./glsl.g" -+#line 882 "./glsl.g" - - case 32: { - sym(1).kind = AST::Kind_BitwiseNot; - } break; - --#line 895 "./glsl.g" -+#line 889 "./glsl.g" - - case 33: { - // nothing to do. - } break; - --#line 902 "./glsl.g" -+#line 896 "./glsl.g" - - case 34: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Multiply, expression(1), expression(3)); - } break; - --#line 909 "./glsl.g" -+#line 903 "./glsl.g" - - case 35: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Divide, expression(1), expression(3)); - } break; - --#line 916 "./glsl.g" -+#line 910 "./glsl.g" - - case 36: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Modulus, expression(1), expression(3)); - } break; - --#line 923 "./glsl.g" -+#line 917 "./glsl.g" - - case 37: { - // nothing to do. - } break; - --#line 930 "./glsl.g" -+#line 924 "./glsl.g" - - case 38: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Plus, expression(1), expression(3)); - } break; - --#line 937 "./glsl.g" -+#line 931 "./glsl.g" - - case 39: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Minus, expression(1), expression(3)); - } break; - --#line 944 "./glsl.g" -+#line 938 "./glsl.g" - - case 40: { - // nothing to do. - } break; - --#line 951 "./glsl.g" -+#line 945 "./glsl.g" - - case 41: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftLeft, expression(1), expression(3)); - } break; - --#line 958 "./glsl.g" -+#line 952 "./glsl.g" - - case 42: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_ShiftRight, expression(1), expression(3)); - } break; - --#line 965 "./glsl.g" -+#line 959 "./glsl.g" - - case 43: { - // nothing to do. - } break; - --#line 972 "./glsl.g" -+#line 966 "./glsl.g" - - case 44: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessThan, expression(1), expression(3)); - } break; - --#line 979 "./glsl.g" -+#line 973 "./glsl.g" - - case 45: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterThan, expression(1), expression(3)); - } break; - --#line 986 "./glsl.g" -+#line 980 "./glsl.g" - - case 46: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LessEqual, expression(1), expression(3)); - } break; - --#line 993 "./glsl.g" -+#line 987 "./glsl.g" - - case 47: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_GreaterEqual, expression(1), expression(3)); - } break; - --#line 1000 "./glsl.g" -+#line 994 "./glsl.g" - - case 48: { - // nothing to do. - } break; - --#line 1007 "./glsl.g" -+#line 1001 "./glsl.g" - - case 49: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Equal, expression(1), expression(3)); - } break; - --#line 1014 "./glsl.g" -+#line 1008 "./glsl.g" - - case 50: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_NotEqual, expression(1), expression(3)); - } break; - --#line 1021 "./glsl.g" -+#line 1015 "./glsl.g" - - case 51: { - // nothing to do. - } break; - --#line 1028 "./glsl.g" -+#line 1022 "./glsl.g" - - case 52: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseAnd, expression(1), expression(3)); - } break; - --#line 1035 "./glsl.g" -+#line 1029 "./glsl.g" - - case 53: { - // nothing to do. - } break; - --#line 1042 "./glsl.g" -+#line 1036 "./glsl.g" - - case 54: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseXor, expression(1), expression(3)); - } break; - --#line 1049 "./glsl.g" -+#line 1043 "./glsl.g" - - case 55: { - // nothing to do. - } break; - --#line 1056 "./glsl.g" -+#line 1050 "./glsl.g" - - case 56: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_BitwiseOr, expression(1), expression(3)); - } break; - --#line 1063 "./glsl.g" -+#line 1057 "./glsl.g" - - case 57: { - // nothing to do. - } break; - --#line 1070 "./glsl.g" -+#line 1064 "./glsl.g" - - case 58: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalAnd, expression(1), expression(3)); - } break; - --#line 1077 "./glsl.g" -+#line 1071 "./glsl.g" - - case 59: { - // nothing to do. - } break; - --#line 1084 "./glsl.g" -+#line 1078 "./glsl.g" - - case 60: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalXor, expression(1), expression(3)); - } break; - --#line 1091 "./glsl.g" -+#line 1085 "./glsl.g" - - case 61: { - // nothing to do. - } break; - --#line 1098 "./glsl.g" -+#line 1092 "./glsl.g" - - case 62: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_LogicalOr, expression(1), expression(3)); - } break; - --#line 1105 "./glsl.g" -+#line 1099 "./glsl.g" - - case 63: { - // nothing to do. - } break; - --#line 1112 "./glsl.g" -+#line 1106 "./glsl.g" - - case 64: { - ast(1) = makeAstNode<TernaryExpressionAST>(AST::Kind_Conditional, expression(1), expression(3), expression(5)); - } break; - --#line 1119 "./glsl.g" -+#line 1113 "./glsl.g" - - case 65: { - // nothing to do. - } break; - --#line 1126 "./glsl.g" -+#line 1120 "./glsl.g" - - case 66: { - ast(1) = makeAstNode<AssignmentExpressionAST>(sym(2).kind, expression(1), expression(3)); - } break; - --#line 1133 "./glsl.g" -+#line 1127 "./glsl.g" - - case 67: { - sym(1).kind = AST::Kind_Assign; - } break; - --#line 1140 "./glsl.g" -+#line 1134 "./glsl.g" - - case 68: { - sym(1).kind = AST::Kind_AssignMultiply; - } break; - --#line 1147 "./glsl.g" -+#line 1141 "./glsl.g" - - case 69: { - sym(1).kind = AST::Kind_AssignDivide; - } break; - --#line 1154 "./glsl.g" -+#line 1148 "./glsl.g" - - case 70: { - sym(1).kind = AST::Kind_AssignModulus; - } break; - --#line 1161 "./glsl.g" -+#line 1155 "./glsl.g" - - case 71: { - sym(1).kind = AST::Kind_AssignPlus; - } break; - --#line 1168 "./glsl.g" -+#line 1162 "./glsl.g" - - case 72: { - sym(1).kind = AST::Kind_AssignMinus; - } break; - --#line 1175 "./glsl.g" -+#line 1169 "./glsl.g" - - case 73: { - sym(1).kind = AST::Kind_AssignShiftLeft; - } break; - --#line 1182 "./glsl.g" -+#line 1176 "./glsl.g" - - case 74: { - sym(1).kind = AST::Kind_AssignShiftRight; - } break; - --#line 1189 "./glsl.g" -+#line 1183 "./glsl.g" - - case 75: { - sym(1).kind = AST::Kind_AssignAnd; - } break; - --#line 1196 "./glsl.g" -+#line 1190 "./glsl.g" - - case 76: { - sym(1).kind = AST::Kind_AssignXor; - } break; - --#line 1203 "./glsl.g" -+#line 1197 "./glsl.g" - - case 77: { - sym(1).kind = AST::Kind_AssignOr; - } break; - --#line 1210 "./glsl.g" -+#line 1204 "./glsl.g" - - case 78: { - // nothing to do. - } break; - --#line 1217 "./glsl.g" -+#line 1211 "./glsl.g" - - case 79: { - ast(1) = makeAstNode<BinaryExpressionAST>(AST::Kind_Comma, expression(1), expression(3)); - } break; - --#line 1224 "./glsl.g" -+#line 1218 "./glsl.g" - - case 80: { - // nothing to do. - } break; - --#line 1231 "./glsl.g" -+#line 1225 "./glsl.g" - - case 81: { - // nothing to do. - } break; - --#line 1238 "./glsl.g" -+#line 1232 "./glsl.g" - - case 82: { - ast(1) = makeAstNode<InitDeclarationAST>(sym(1).declaration_list); - } break; - --#line 1245 "./glsl.g" -+#line 1239 "./glsl.g" - - case 83: { - ast(1) = makeAstNode<PrecisionDeclarationAST>(sym(2).precision, type(3)); - } break; - --#line 1252 "./glsl.g" -+#line 1246 "./glsl.g" - - case 84: { - if (sym(1).type_qualifier.qualifier != QualifiedTypeAST::Struct) { -@@ -743,7 +743,7 @@ case 84: { - ast(1) = makeAstNode<TypeDeclarationAST>(type); - } break; - --#line 1263 "./glsl.g" -+#line 1257 "./glsl.g" - - case 85: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -761,7 +761,7 @@ case 85: { - makeAstNode<VariableDeclarationAST>(qualtype, string(6))); - } break; - --#line 1282 "./glsl.g" -+#line 1276 "./glsl.g" - - case 86: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -780,7 +780,7 @@ case 86: { - (makeAstNode<ArrayTypeAST>(qualtype), string(6))); - } break; - --#line 1302 "./glsl.g" -+#line 1296 "./glsl.g" - - case 87: { - if ((sym(1).type_qualifier.qualifier & QualifiedTypeAST::Struct) == 0) { -@@ -799,7 +799,7 @@ case 87: { - (makeAstNode<ArrayTypeAST>(qualtype, expression(8)), string(6))); - } break; - --#line 1322 "./glsl.g" -+#line 1316 "./glsl.g" - - case 88: { - TypeAST *type = makeAstNode<QualifiedTypeAST> -@@ -808,59 +808,59 @@ case 88: { - ast(1) = makeAstNode<TypeDeclarationAST>(type); - } break; - --#line 1332 "./glsl.g" -+#line 1326 "./glsl.g" - - case 89: { - function(1)->finishParams(); - } break; - --#line 1339 "./glsl.g" -+#line 1333 "./glsl.g" - - case 90: { - // nothing to do. - } break; - --#line 1346 "./glsl.g" -+#line 1340 "./glsl.g" - - case 91: { - // nothing to do. - } break; - --#line 1353 "./glsl.g" -+#line 1347 "./glsl.g" - - case 92: { - function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > - (sym(2).param_declaration); - } break; - --#line 1361 "./glsl.g" -+#line 1355 "./glsl.g" - - case 93: { - function(1)->params = makeAstNode< List<ParameterDeclarationAST *> > - (function(1)->params, sym(3).param_declaration); - } break; - --#line 1369 "./glsl.g" -+#line 1363 "./glsl.g" - - case 94: { - function(1) = makeAstNode<FunctionDeclarationAST>(type(1), string(2)); - } break; - --#line 1376 "./glsl.g" -+#line 1370 "./glsl.g" - - case 95: { - sym(1).param_declarator.type = type(1); - sym(1).param_declarator.name = string(2); - } break; - --#line 1384 "./glsl.g" -+#line 1378 "./glsl.g" - - case 96: { - sym(1).param_declarator.type = makeAstNode<ArrayTypeAST>(type(1), expression(4)); - sym(1).param_declarator.name = string(2); - } break; - --#line 1392 "./glsl.g" -+#line 1386 "./glsl.g" - - case 97: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -871,7 +871,7 @@ case 97: { - sym(3).param_declarator.name); - } break; - --#line 1404 "./glsl.g" -+#line 1398 "./glsl.g" - - case 98: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -880,7 +880,7 @@ case 98: { - sym(2).param_declarator.name); - } break; - --#line 1414 "./glsl.g" -+#line 1408 "./glsl.g" - - case 99: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -890,7 +890,7 @@ case 99: { - (const QString *)0); - } break; - --#line 1425 "./glsl.g" -+#line 1419 "./glsl.g" - - case 100: { - ast(1) = makeAstNode<ParameterDeclarationAST> -@@ -898,44 +898,44 @@ case 100: { - (const QString *)0); - } break; - --#line 1434 "./glsl.g" -+#line 1428 "./glsl.g" - - case 101: { - sym(1).qualifier = ParameterDeclarationAST::In; - } break; - --#line 1441 "./glsl.g" -+#line 1435 "./glsl.g" - - case 102: { - sym(1).qualifier = ParameterDeclarationAST::In; - } break; - --#line 1448 "./glsl.g" -+#line 1442 "./glsl.g" - - case 103: { - sym(1).qualifier = ParameterDeclarationAST::Out; - } break; - --#line 1455 "./glsl.g" -+#line 1449 "./glsl.g" - - case 104: { - sym(1).qualifier = ParameterDeclarationAST::InOut; - } break; - --#line 1462 "./glsl.g" -+#line 1456 "./glsl.g" - - case 105: { - // nothing to do. - } break; - --#line 1469 "./glsl.g" -+#line 1463 "./glsl.g" - - case 106: { - sym(1).declaration_list = makeAstNode< List<DeclarationAST *> > - (sym(1).declaration); - } break; - --#line 1477 "./glsl.g" -+#line 1471 "./glsl.g" - - case 107: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -944,7 +944,7 @@ case 107: { - (sym(1).declaration_list, decl); - } break; - --#line 1487 "./glsl.g" -+#line 1481 "./glsl.g" - - case 108: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -954,7 +954,7 @@ case 108: { - (sym(1).declaration_list, decl); - } break; - --#line 1498 "./glsl.g" -+#line 1492 "./glsl.g" - - case 109: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -964,7 +964,7 @@ case 109: { - (sym(1).declaration_list, decl); - } break; - --#line 1509 "./glsl.g" -+#line 1503 "./glsl.g" - - case 110: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -975,7 +975,7 @@ case 110: { - (sym(1).declaration_list, decl); - } break; - --#line 1521 "./glsl.g" -+#line 1515 "./glsl.g" - - case 111: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -986,7 +986,7 @@ case 111: { - (sym(1).declaration_list, decl); - } break; - --#line 1533 "./glsl.g" -+#line 1527 "./glsl.g" - - case 112: { - TypeAST *type = VariableDeclarationAST::declarationType(sym(1).declaration_list); -@@ -996,40 +996,40 @@ case 112: { - (sym(1).declaration_list, decl); - } break; - --#line 1544 "./glsl.g" -+#line 1538 "./glsl.g" - - case 113: { - ast(1) = makeAstNode<TypeDeclarationAST>(type(1)); - } break; - --#line 1551 "./glsl.g" -+#line 1545 "./glsl.g" - - case 114: { - ast(1) = makeAstNode<VariableDeclarationAST>(type(1), string(2)); - } break; - --#line 1558 "./glsl.g" -+#line 1552 "./glsl.g" - - case 115: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1)), string(2)); - } break; - --#line 1566 "./glsl.g" -+#line 1560 "./glsl.g" - - case 116: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1), expression(4)), string(2)); - } break; - --#line 1574 "./glsl.g" -+#line 1568 "./glsl.g" - - case 117: { - ast(1) = makeAstNode<VariableDeclarationAST> - (makeAstNode<ArrayTypeAST>(type(1)), string(2), expression(6)); - } break; - --#line 1582 "./glsl.g" -+#line 1576 "./glsl.g" - - case 118: { - ast(1) = makeAstNode<VariableDeclarationAST> -@@ -1037,26 +1037,26 @@ case 118: { - string(2), expression(7)); - } break; - --#line 1591 "./glsl.g" -+#line 1585 "./glsl.g" - - case 119: { - ast(1) = makeAstNode<VariableDeclarationAST> - (type(1), string(2), expression(4)); - } break; - --#line 1599 "./glsl.g" -+#line 1593 "./glsl.g" - - case 120: { - ast(1) = makeAstNode<InvariantDeclarationAST>(string(2)); - } break; - --#line 1606 "./glsl.g" -+#line 1600 "./glsl.g" - - case 121: { - ast(1) = makeAstNode<QualifiedTypeAST>(0, type(1), (List<LayoutQualifierAST *> *)0); - } break; - --#line 1613 "./glsl.g" -+#line 1607 "./glsl.g" - - case 122: { - ast(1) = makeAstNode<QualifiedTypeAST> -@@ -1064,207 +1064,207 @@ case 122: { - sym(1).type_qualifier.layout_list); - } break; - --#line 1622 "./glsl.g" -+#line 1616 "./glsl.g" - - case 123: { - sym(1).qualifier = QualifiedTypeAST::Invariant; - } break; - --#line 1629 "./glsl.g" -+#line 1623 "./glsl.g" - - case 124: { - sym(1).qualifier = QualifiedTypeAST::Smooth; - } break; - --#line 1636 "./glsl.g" -+#line 1630 "./glsl.g" - - case 125: { - sym(1).qualifier = QualifiedTypeAST::Flat; - } break; - --#line 1643 "./glsl.g" -+#line 1637 "./glsl.g" - - case 126: { - sym(1).qualifier = QualifiedTypeAST::NoPerspective; - } break; - --#line 1650 "./glsl.g" -+#line 1644 "./glsl.g" - - case 127: { - sym(1) = sym(3); - } break; - --#line 1657 "./glsl.g" -+#line 1651 "./glsl.g" - - case 128: { - sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout); - } break; - --#line 1664 "./glsl.g" -+#line 1658 "./glsl.g" - - case 129: { - sym(1).layout_list = makeAstNode< List<LayoutQualifierAST *> >(sym(1).layout_list, sym(3).layout); - } break; - --#line 1671 "./glsl.g" -+#line 1665 "./glsl.g" - - case 130: { - sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), (const QString *)0); - } break; - --#line 1678 "./glsl.g" -+#line 1672 "./glsl.g" - - case 131: { - sym(1).layout = makeAstNode<LayoutQualifierAST>(string(1), string(3)); - } break; - --#line 1685 "./glsl.g" -+#line 1679 "./glsl.g" - - case 132: { - sym(1).qualifier = QualifiedTypeAST::Const; - } break; - --#line 1692 "./glsl.g" -+#line 1686 "./glsl.g" - - case 133: { - sym(1).type_qualifier.qualifier = sym(1).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1700 "./glsl.g" -+#line 1694 "./glsl.g" - - case 134: { - sym(1).type_qualifier.layout_list = sym(1).layout_list; - sym(1).type_qualifier.qualifier = 0; - } break; - --#line 1708 "./glsl.g" -+#line 1702 "./glsl.g" - - case 135: { - sym(1).type_qualifier.layout_list = sym(1).layout_list; - sym(1).type_qualifier.qualifier = sym(2).qualifier; - } break; - --#line 1716 "./glsl.g" -+#line 1710 "./glsl.g" - - case 136: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1724 "./glsl.g" -+#line 1718 "./glsl.g" - - case 137: { - sym(1).type_qualifier.qualifier = sym(1).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1732 "./glsl.g" -+#line 1726 "./glsl.g" - - case 138: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1740 "./glsl.g" -+#line 1734 "./glsl.g" - - case 139: { - sym(1).type_qualifier.qualifier = sym(1).qualifier | sym(2).qualifier | sym(3).qualifier; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1748 "./glsl.g" -+#line 1742 "./glsl.g" - - case 140: { - sym(1).type_qualifier.qualifier = QualifiedTypeAST::Invariant; - sym(1).type_qualifier.layout_list = 0; - } break; - --#line 1756 "./glsl.g" -+#line 1750 "./glsl.g" - - case 141: { - sym(1).qualifier = QualifiedTypeAST::Const; - } break; - --#line 1763 "./glsl.g" -+#line 1757 "./glsl.g" - - case 142: { - sym(1).qualifier = QualifiedTypeAST::Attribute; - } break; - --#line 1770 "./glsl.g" -+#line 1764 "./glsl.g" - - case 143: { - sym(1).qualifier = QualifiedTypeAST::Varying; - } break; - --#line 1777 "./glsl.g" -+#line 1771 "./glsl.g" - - case 144: { - sym(1).qualifier = QualifiedTypeAST::CentroidVarying; - } break; - --#line 1784 "./glsl.g" -+#line 1778 "./glsl.g" - - case 145: { - sym(1).qualifier = QualifiedTypeAST::In; - } break; - --#line 1791 "./glsl.g" -+#line 1785 "./glsl.g" - - case 146: { - sym(1).qualifier = QualifiedTypeAST::Out; - } break; - --#line 1798 "./glsl.g" -+#line 1792 "./glsl.g" - - case 147: { - sym(1).qualifier = QualifiedTypeAST::CentroidIn; - } break; - --#line 1805 "./glsl.g" -+#line 1799 "./glsl.g" - - case 148: { - sym(1).qualifier = QualifiedTypeAST::CentroidOut; - } break; - --#line 1812 "./glsl.g" -+#line 1806 "./glsl.g" - - case 149: { - sym(1).qualifier = QualifiedTypeAST::PatchIn; - } break; - --#line 1819 "./glsl.g" -+#line 1813 "./glsl.g" - - case 150: { - sym(1).qualifier = QualifiedTypeAST::PatchOut; - } break; - --#line 1826 "./glsl.g" -+#line 1820 "./glsl.g" - - case 151: { - sym(1).qualifier = QualifiedTypeAST::SampleIn; - } break; - --#line 1833 "./glsl.g" -+#line 1827 "./glsl.g" - - case 152: { - sym(1).qualifier = QualifiedTypeAST::SampleOut; - } break; - --#line 1840 "./glsl.g" -+#line 1834 "./glsl.g" - - case 153: { - sym(1).qualifier = QualifiedTypeAST::Uniform; - } break; - --#line 1847 "./glsl.g" -+#line 1841 "./glsl.g" - - case 154: { - // nothing to do. - } break; - --#line 1854 "./glsl.g" -+#line 1848 "./glsl.g" - - case 155: { - if (!type(2)->setPrecision(sym(1).precision)) { -@@ -1273,595 +1273,595 @@ case 155: { - ast(1) = type(2); - } break; - --#line 1864 "./glsl.g" -+#line 1858 "./glsl.g" - - case 156: { - // nothing to do. - } break; - --#line 1871 "./glsl.g" -+#line 1865 "./glsl.g" - - case 157: { - ast(1) = makeAstNode<ArrayTypeAST>(type(1)); - } break; - --#line 1878 "./glsl.g" -+#line 1872 "./glsl.g" - - case 158: { - ast(1) = makeAstNode<ArrayTypeAST>(type(1), expression(3)); - } break; - --#line 1885 "./glsl.g" -+#line 1879 "./glsl.g" - - case 159: { - ast(1) = makeBasicType(T_VOID); - } break; - --#line 1892 "./glsl.g" -+#line 1886 "./glsl.g" - - case 160: { - ast(1) = makeBasicType(T_FLOAT); - } break; - --#line 1899 "./glsl.g" -+#line 1893 "./glsl.g" - - case 161: { - ast(1) = makeBasicType(T_DOUBLE); - } break; - --#line 1906 "./glsl.g" -+#line 1900 "./glsl.g" - - case 162: { - ast(1) = makeBasicType(T_INT); - } break; - --#line 1913 "./glsl.g" -+#line 1907 "./glsl.g" - - case 163: { - ast(1) = makeBasicType(T_UINT); - } break; - --#line 1920 "./glsl.g" -+#line 1914 "./glsl.g" - - case 164: { - ast(1) = makeBasicType(T_BOOL); - } break; - --#line 1927 "./glsl.g" -+#line 1921 "./glsl.g" - - case 165: { - ast(1) = makeBasicType(T_VEC2); - } break; - --#line 1934 "./glsl.g" -+#line 1928 "./glsl.g" - - case 166: { - ast(1) = makeBasicType(T_VEC3); - } break; - --#line 1941 "./glsl.g" -+#line 1935 "./glsl.g" - - case 167: { - ast(1) = makeBasicType(T_VEC4); - } break; - --#line 1948 "./glsl.g" -+#line 1942 "./glsl.g" - - case 168: { - ast(1) = makeBasicType(T_DVEC2); - } break; - --#line 1955 "./glsl.g" -+#line 1949 "./glsl.g" - - case 169: { - ast(1) = makeBasicType(T_DVEC3); - } break; - --#line 1962 "./glsl.g" -+#line 1956 "./glsl.g" - - case 170: { - ast(1) = makeBasicType(T_DVEC4); - } break; - --#line 1969 "./glsl.g" -+#line 1963 "./glsl.g" - - case 171: { - ast(1) = makeBasicType(T_BVEC2); - } break; - --#line 1976 "./glsl.g" -+#line 1970 "./glsl.g" - - case 172: { - ast(1) = makeBasicType(T_BVEC3); - } break; - --#line 1983 "./glsl.g" -+#line 1977 "./glsl.g" - - case 173: { - ast(1) = makeBasicType(T_BVEC4); - } break; - --#line 1990 "./glsl.g" -+#line 1984 "./glsl.g" - - case 174: { - ast(1) = makeBasicType(T_IVEC2); - } break; - --#line 1997 "./glsl.g" -+#line 1991 "./glsl.g" - - case 175: { - ast(1) = makeBasicType(T_IVEC3); - } break; - --#line 2004 "./glsl.g" -+#line 1998 "./glsl.g" - - case 176: { - ast(1) = makeBasicType(T_IVEC4); - } break; - --#line 2011 "./glsl.g" -+#line 2005 "./glsl.g" - - case 177: { - ast(1) = makeBasicType(T_UVEC2); - } break; - --#line 2018 "./glsl.g" -+#line 2012 "./glsl.g" - - case 178: { - ast(1) = makeBasicType(T_UVEC3); - } break; - --#line 2025 "./glsl.g" -+#line 2019 "./glsl.g" - - case 179: { - ast(1) = makeBasicType(T_UVEC4); - } break; - --#line 2032 "./glsl.g" -+#line 2026 "./glsl.g" - - case 180: { - ast(1) = makeBasicType(T_MAT2); - } break; - --#line 2039 "./glsl.g" -+#line 2033 "./glsl.g" - - case 181: { - ast(1) = makeBasicType(T_MAT3); - } break; - --#line 2046 "./glsl.g" -+#line 2040 "./glsl.g" - - case 182: { - ast(1) = makeBasicType(T_MAT4); - } break; - --#line 2053 "./glsl.g" -+#line 2047 "./glsl.g" - - case 183: { - ast(1) = makeBasicType(T_MAT2); - } break; - --#line 2060 "./glsl.g" -+#line 2054 "./glsl.g" - - case 184: { - ast(1) = makeBasicType(T_MAT2X3); - } break; - --#line 2067 "./glsl.g" -+#line 2061 "./glsl.g" - - case 185: { - ast(1) = makeBasicType(T_MAT2X4); - } break; - --#line 2074 "./glsl.g" -+#line 2068 "./glsl.g" - - case 186: { - ast(1) = makeBasicType(T_MAT3X2); - } break; - --#line 2081 "./glsl.g" -+#line 2075 "./glsl.g" - - case 187: { - ast(1) = makeBasicType(T_MAT3); - } break; - --#line 2088 "./glsl.g" -+#line 2082 "./glsl.g" - - case 188: { - ast(1) = makeBasicType(T_MAT3X4); - } break; - --#line 2095 "./glsl.g" -+#line 2089 "./glsl.g" - - case 189: { - ast(1) = makeBasicType(T_MAT4X2); - } break; - --#line 2102 "./glsl.g" -+#line 2096 "./glsl.g" - - case 190: { - ast(1) = makeBasicType(T_MAT4X3); - } break; - --#line 2109 "./glsl.g" -+#line 2103 "./glsl.g" - - case 191: { - ast(1) = makeBasicType(T_MAT4); - } break; - --#line 2116 "./glsl.g" -+#line 2110 "./glsl.g" - - case 192: { - ast(1) = makeBasicType(T_DMAT2); - } break; - --#line 2123 "./glsl.g" -+#line 2117 "./glsl.g" - - case 193: { - ast(1) = makeBasicType(T_DMAT3); - } break; - --#line 2130 "./glsl.g" -+#line 2124 "./glsl.g" - - case 194: { - ast(1) = makeBasicType(T_DMAT4); - } break; - --#line 2137 "./glsl.g" -+#line 2131 "./glsl.g" - - case 195: { - ast(1) = makeBasicType(T_DMAT2); - } break; - --#line 2144 "./glsl.g" -+#line 2138 "./glsl.g" - - case 196: { - ast(1) = makeBasicType(T_DMAT2X3); - } break; - --#line 2151 "./glsl.g" -+#line 2145 "./glsl.g" - - case 197: { - ast(1) = makeBasicType(T_DMAT2X4); - } break; - --#line 2158 "./glsl.g" -+#line 2152 "./glsl.g" - - case 198: { - ast(1) = makeBasicType(T_DMAT3X2); - } break; - --#line 2165 "./glsl.g" -+#line 2159 "./glsl.g" - - case 199: { - ast(1) = makeBasicType(T_DMAT3); - } break; - --#line 2172 "./glsl.g" -+#line 2166 "./glsl.g" - - case 200: { - ast(1) = makeBasicType(T_DMAT3X4); - } break; - --#line 2179 "./glsl.g" -+#line 2173 "./glsl.g" - - case 201: { - ast(1) = makeBasicType(T_DMAT4X2); - } break; - --#line 2186 "./glsl.g" -+#line 2180 "./glsl.g" - - case 202: { - ast(1) = makeBasicType(T_DMAT4X3); - } break; - --#line 2193 "./glsl.g" -+#line 2187 "./glsl.g" - - case 203: { - ast(1) = makeBasicType(T_DMAT4); - } break; - --#line 2200 "./glsl.g" -+#line 2194 "./glsl.g" - - case 204: { - ast(1) = makeBasicType(T_SAMPLER1D); - } break; - --#line 2207 "./glsl.g" -+#line 2201 "./glsl.g" - - case 205: { - ast(1) = makeBasicType(T_SAMPLER2D); - } break; - --#line 2214 "./glsl.g" -+#line 2208 "./glsl.g" - - case 206: { - ast(1) = makeBasicType(T_SAMPLER3D); - } break; - --#line 2221 "./glsl.g" -+#line 2215 "./glsl.g" - - case 207: { - ast(1) = makeBasicType(T_SAMPLERCUBE); - } break; - --#line 2228 "./glsl.g" -+#line 2222 "./glsl.g" - - case 208: { - ast(1) = makeBasicType(T_SAMPLER1DSHADOW); - } break; - --#line 2235 "./glsl.g" -+#line 2229 "./glsl.g" - - case 209: { - ast(1) = makeBasicType(T_SAMPLER2DSHADOW); - } break; - --#line 2242 "./glsl.g" -+#line 2236 "./glsl.g" - - case 210: { - ast(1) = makeBasicType(T_SAMPLERCUBESHADOW); - } break; - --#line 2249 "./glsl.g" -+#line 2243 "./glsl.g" - - case 211: { - ast(1) = makeBasicType(T_SAMPLER1DARRAY); - } break; - --#line 2256 "./glsl.g" -+#line 2250 "./glsl.g" - - case 212: { - ast(1) = makeBasicType(T_SAMPLER2DARRAY); - } break; - --#line 2263 "./glsl.g" -+#line 2257 "./glsl.g" - - case 213: { - ast(1) = makeBasicType(T_SAMPLER1DARRAYSHADOW); - } break; - --#line 2270 "./glsl.g" -+#line 2264 "./glsl.g" - - case 214: { - ast(1) = makeBasicType(T_SAMPLER2DARRAYSHADOW); - } break; - --#line 2277 "./glsl.g" -+#line 2271 "./glsl.g" - - case 215: { - ast(1) = makeBasicType(T_SAMPLERCUBEARRAY); - } break; - --#line 2284 "./glsl.g" -+#line 2278 "./glsl.g" - - case 216: { - ast(1) = makeBasicType(T_SAMPLERCUBEARRAYSHADOW); - } break; - --#line 2291 "./glsl.g" -+#line 2285 "./glsl.g" - - case 217: { - ast(1) = makeBasicType(T_ISAMPLER1D); - } break; - --#line 2298 "./glsl.g" -+#line 2292 "./glsl.g" - - case 218: { - ast(1) = makeBasicType(T_ISAMPLER2D); - } break; - --#line 2305 "./glsl.g" -+#line 2299 "./glsl.g" - - case 219: { - ast(1) = makeBasicType(T_ISAMPLER3D); - } break; - --#line 2312 "./glsl.g" -+#line 2306 "./glsl.g" - - case 220: { - ast(1) = makeBasicType(T_ISAMPLERCUBE); - } break; - --#line 2319 "./glsl.g" -+#line 2313 "./glsl.g" - - case 221: { - ast(1) = makeBasicType(T_ISAMPLER1DARRAY); - } break; - --#line 2326 "./glsl.g" -+#line 2320 "./glsl.g" - - case 222: { - ast(1) = makeBasicType(T_ISAMPLER2DARRAY); - } break; - --#line 2333 "./glsl.g" -+#line 2327 "./glsl.g" - - case 223: { - ast(1) = makeBasicType(T_ISAMPLERCUBEARRAY); - } break; - --#line 2340 "./glsl.g" -+#line 2334 "./glsl.g" - - case 224: { - ast(1) = makeBasicType(T_USAMPLER1D); - } break; - --#line 2347 "./glsl.g" -+#line 2341 "./glsl.g" - - case 225: { - ast(1) = makeBasicType(T_USAMPLER2D); - } break; - --#line 2354 "./glsl.g" -+#line 2348 "./glsl.g" - - case 226: { - ast(1) = makeBasicType(T_USAMPLER3D); - } break; - --#line 2361 "./glsl.g" -+#line 2355 "./glsl.g" - - case 227: { - ast(1) = makeBasicType(T_USAMPLERCUBE); - } break; - --#line 2368 "./glsl.g" -+#line 2362 "./glsl.g" - - case 228: { - ast(1) = makeBasicType(T_USAMPLER1DARRAY); - } break; - --#line 2375 "./glsl.g" -+#line 2369 "./glsl.g" - - case 229: { - ast(1) = makeBasicType(T_USAMPLER2DARRAY); - } break; - --#line 2382 "./glsl.g" -+#line 2376 "./glsl.g" - - case 230: { - ast(1) = makeBasicType(T_USAMPLERCUBEARRAY); - } break; - --#line 2389 "./glsl.g" -+#line 2383 "./glsl.g" - - case 231: { - ast(1) = makeBasicType(T_SAMPLER2DRECT); - } break; - --#line 2396 "./glsl.g" -+#line 2390 "./glsl.g" - - case 232: { - ast(1) = makeBasicType(T_SAMPLER2DRECTSHADOW); - } break; - --#line 2403 "./glsl.g" -+#line 2397 "./glsl.g" - - case 233: { - ast(1) = makeBasicType(T_ISAMPLER2DRECT); - } break; - --#line 2410 "./glsl.g" -+#line 2404 "./glsl.g" - - case 234: { - ast(1) = makeBasicType(T_USAMPLER2DRECT); - } break; - --#line 2417 "./glsl.g" -+#line 2411 "./glsl.g" - - case 235: { - ast(1) = makeBasicType(T_SAMPLERBUFFER); - } break; - --#line 2424 "./glsl.g" -+#line 2418 "./glsl.g" - - case 236: { - ast(1) = makeBasicType(T_ISAMPLERBUFFER); - } break; - --#line 2431 "./glsl.g" -+#line 2425 "./glsl.g" - - case 237: { - ast(1) = makeBasicType(T_USAMPLERBUFFER); - } break; - --#line 2438 "./glsl.g" -+#line 2432 "./glsl.g" - - case 238: { - ast(1) = makeBasicType(T_SAMPLER2DMS); - } break; - --#line 2445 "./glsl.g" -+#line 2439 "./glsl.g" - - case 239: { - ast(1) = makeBasicType(T_ISAMPLER2DMS); - } break; - --#line 2452 "./glsl.g" -+#line 2446 "./glsl.g" - - case 240: { - ast(1) = makeBasicType(T_USAMPLER2DMS); - } break; - --#line 2459 "./glsl.g" -+#line 2453 "./glsl.g" - - case 241: { - ast(1) = makeBasicType(T_SAMPLER2DMSARRAY); - } break; - --#line 2466 "./glsl.g" -+#line 2460 "./glsl.g" - - case 242: { - ast(1) = makeBasicType(T_ISAMPLER2DMSARRAY); - } break; - --#line 2473 "./glsl.g" -+#line 2467 "./glsl.g" - - case 243: { - ast(1) = makeBasicType(T_USAMPLER2DMSARRAY); - } break; - --#line 2480 "./glsl.g" -+#line 2474 "./glsl.g" - - case 244: { - // nothing to do. - } break; - --#line 2487 "./glsl.g" -+#line 2481 "./glsl.g" - - case 245: { - ast(1) = makeAstNode<NamedTypeAST>(string(1)); - } break; - --#line 2494 "./glsl.g" -+#line 2488 "./glsl.g" - - case 246: { - sym(1).precision = TypeAST::Highp; - } break; - --#line 2501 "./glsl.g" -+#line 2495 "./glsl.g" - - case 247: { - sym(1).precision = TypeAST::Mediump; - } break; - --#line 2508 "./glsl.g" -+#line 2502 "./glsl.g" - - case 248: { - sym(1).precision = TypeAST::Lowp; - } break; - --#line 2515 "./glsl.g" -+#line 2509 "./glsl.g" - - case 249: { - ast(1) = makeAstNode<StructTypeAST>(string(2), sym(4).field_list); - } break; - --#line 2522 "./glsl.g" -+#line 2516 "./glsl.g" - - case 250: { - ast(1) = makeAstNode<StructTypeAST>(sym(3).field_list); - } break; - --#line 2529 "./glsl.g" -+#line 2523 "./glsl.g" - - case 251: { - // nothing to do. - } break; - --#line 2536 "./glsl.g" -+#line 2530 "./glsl.g" - - case 252: { - sym(1).field_list = appendLists(sym(1).field_list, sym(2).field_list); - } break; - --#line 2543 "./glsl.g" -+#line 2537 "./glsl.g" - - case 253: { - sym(1).field_list = StructTypeAST::fixInnerTypes(type(1), sym(2).field_list); - } break; - --#line 2550 "./glsl.g" -+#line 2544 "./glsl.g" - - case 254: { - sym(1).field_list = StructTypeAST::fixInnerTypes -@@ -1870,106 +1870,106 @@ case 254: { - sym(1).type_qualifier.layout_list), sym(3).field_list); - } break; - --#line 2560 "./glsl.g" -+#line 2554 "./glsl.g" - - case 255: { - // nothing to do. - sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field); - } break; - --#line 2568 "./glsl.g" -+#line 2562 "./glsl.g" - - case 256: { - sym(1).field_list = makeAstNode< List<StructTypeAST::Field *> >(sym(1).field_list, sym(3).field); - } break; - --#line 2575 "./glsl.g" -+#line 2569 "./glsl.g" - - case 257: { - sym(1).field = makeAstNode<StructTypeAST::Field>(string(1)); - } break; - --#line 2582 "./glsl.g" -+#line 2576 "./glsl.g" - - case 258: { - sym(1).field = makeAstNode<StructTypeAST::Field> - (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0)); - } break; - --#line 2590 "./glsl.g" -+#line 2584 "./glsl.g" - - case 259: { - sym(1).field = makeAstNode<StructTypeAST::Field> - (string(1), makeAstNode<ArrayTypeAST>((TypeAST *)0, expression(3))); - } break; - --#line 2598 "./glsl.g" -+#line 2592 "./glsl.g" - - case 260: { - // nothing to do. - } break; - --#line 2605 "./glsl.g" -+#line 2599 "./glsl.g" - - case 261: { - ast(1) = makeAstNode<DeclarationStatementAST>(sym(1).declaration); - } break; - --#line 2612 "./glsl.g" -+#line 2606 "./glsl.g" - - case 262: { - // nothing to do. - } break; - --#line 2619 "./glsl.g" -+#line 2613 "./glsl.g" - - case 263: { - // nothing to do. - } break; - --#line 2626 "./glsl.g" -+#line 2620 "./glsl.g" - - case 264: { - // nothing to do. - } break; - --#line 2633 "./glsl.g" -+#line 2627 "./glsl.g" - - case 265: { - // nothing to do. - } break; - --#line 2640 "./glsl.g" -+#line 2634 "./glsl.g" - - case 266: { - // nothing to do. - } break; - --#line 2647 "./glsl.g" -+#line 2641 "./glsl.g" - - case 267: { - // nothing to do. - } break; - --#line 2654 "./glsl.g" -+#line 2648 "./glsl.g" - - case 268: { - // nothing to do. - } break; - --#line 2661 "./glsl.g" -+#line 2655 "./glsl.g" - - case 269: { - // nothing to do. - } break; - --#line 2668 "./glsl.g" -+#line 2662 "./glsl.g" - - case 270: { - // nothing to do. - } break; - --#line 2675 "./glsl.g" -+#line 2669 "./glsl.g" - - case 271: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); -@@ -1978,7 +1978,7 @@ case 271: { - ast(1) = stmt; - } break; - --#line 2685 "./glsl.g" -+#line 2679 "./glsl.g" - - case 272: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); -@@ -1987,19 +1987,19 @@ case 272: { - ast(1) = stmt; - } break; - --#line 2695 "./glsl.g" -+#line 2689 "./glsl.g" - - case 273: { - // nothing to do. - } break; - --#line 2702 "./glsl.g" -+#line 2696 "./glsl.g" - - case 274: { - // nothing to do. - } break; - --#line 2709 "./glsl.g" -+#line 2703 "./glsl.g" - - case 275: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(); -@@ -2008,7 +2008,7 @@ case 275: { - ast(1) = stmt; - } break; - --#line 2719 "./glsl.g" -+#line 2713 "./glsl.g" - - case 276: { - CompoundStatementAST *stmt = makeAstNode<CompoundStatementAST>(sym(2).statement_list); -@@ -2017,186 +2017,186 @@ case 276: { - ast(1) = stmt; - } break; - --#line 2729 "./glsl.g" -+#line 2723 "./glsl.g" - - case 277: { - sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement); - } break; - --#line 2736 "./glsl.g" -+#line 2730 "./glsl.g" - - case 278: { - sym(1).statement_list = makeAstNode< List<StatementAST *> >(sym(1).statement_list, sym(2).statement); - } break; - --#line 2743 "./glsl.g" -+#line 2737 "./glsl.g" - - case 279: { - ast(1) = makeAstNode<CompoundStatementAST>(); // Empty statement - } break; - --#line 2750 "./glsl.g" -+#line 2744 "./glsl.g" - - case 280: { - ast(1) = makeAstNode<ExpressionStatementAST>(expression(1)); - } break; - --#line 2757 "./glsl.g" -+#line 2751 "./glsl.g" - - case 281: { - ast(1) = makeAstNode<IfStatementAST>(expression(3), sym(5).ifstmt.thenClause, sym(5).ifstmt.elseClause); - } break; - --#line 2764 "./glsl.g" -+#line 2758 "./glsl.g" - - case 282: { - sym(1).ifstmt.thenClause = statement(1); - sym(1).ifstmt.elseClause = statement(3); - } break; - --#line 2772 "./glsl.g" -+#line 2766 "./glsl.g" - - case 283: { - sym(1).ifstmt.thenClause = statement(1); - sym(1).ifstmt.elseClause = 0; - } break; - --#line 2780 "./glsl.g" -+#line 2774 "./glsl.g" - - case 284: { - // nothing to do. - } break; - --#line 2787 "./glsl.g" -+#line 2781 "./glsl.g" - - case 285: { - ast(1) = makeAstNode<DeclarationExpressionAST> - (type(1), string(2), expression(4)); - } break; - --#line 2795 "./glsl.g" -+#line 2789 "./glsl.g" - - case 286: { - ast(1) = makeAstNode<SwitchStatementAST>(expression(3), statement(6)); - } break; - --#line 2802 "./glsl.g" -+#line 2796 "./glsl.g" - - case 287: { - ast(1) = makeAstNode<CompoundStatementAST>(); - } break; - --#line 2809 "./glsl.g" -+#line 2803 "./glsl.g" - - case 288: { - ast(1) = makeAstNode<CompoundStatementAST>(sym(1).statement_list); - } break; - --#line 2816 "./glsl.g" -+#line 2810 "./glsl.g" - - case 289: { - ast(1) = makeAstNode<CaseLabelStatementAST>(expression(2)); - } break; - --#line 2823 "./glsl.g" -+#line 2817 "./glsl.g" - - case 290: { - ast(1) = makeAstNode<CaseLabelStatementAST>(); - } break; - --#line 2830 "./glsl.g" -+#line 2824 "./glsl.g" - - case 291: { - ast(1) = makeAstNode<WhileStatementAST>(expression(3), statement(5)); - } break; - --#line 2837 "./glsl.g" -+#line 2831 "./glsl.g" - - case 292: { - ast(1) = makeAstNode<DoStatementAST>(statement(2), expression(5)); - } break; - --#line 2844 "./glsl.g" -+#line 2838 "./glsl.g" - - case 293: { - ast(1) = makeAstNode<ForStatementAST>(statement(3), sym(4).forstmt.condition, sym(4).forstmt.increment, statement(6)); - } break; - --#line 2851 "./glsl.g" -+#line 2845 "./glsl.g" - - case 294: { - // nothing to do. - } break; - --#line 2858 "./glsl.g" -+#line 2852 "./glsl.g" - - case 295: { - // nothing to do. - } break; - --#line 2865 "./glsl.g" -+#line 2859 "./glsl.g" - - case 296: { - // nothing to do. - } break; - --#line 2872 "./glsl.g" -+#line 2866 "./glsl.g" - - case 297: { - // nothing to do. - } break; - --#line 2879 "./glsl.g" -+#line 2873 "./glsl.g" - - case 298: { - sym(1).forstmt.condition = expression(1); - sym(1).forstmt.increment = 0; - } break; - --#line 2887 "./glsl.g" -+#line 2881 "./glsl.g" - - case 299: { - sym(1).forstmt.condition = expression(1); - sym(1).forstmt.increment = expression(3); - } break; - --#line 2895 "./glsl.g" -+#line 2889 "./glsl.g" - - case 300: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Continue); - } break; - --#line 2902 "./glsl.g" -+#line 2896 "./glsl.g" - - case 301: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Break); - } break; - --#line 2909 "./glsl.g" -+#line 2903 "./glsl.g" - - case 302: { - ast(1) = makeAstNode<ReturnStatementAST>(); - } break; - --#line 2916 "./glsl.g" -+#line 2910 "./glsl.g" - - case 303: { - ast(1) = makeAstNode<ReturnStatementAST>(expression(2)); - } break; - --#line 2923 "./glsl.g" -+#line 2917 "./glsl.g" - - case 304: { - ast(1) = makeAstNode<JumpStatementAST>(AST::Kind_Discard); - } break; - --#line 2930 "./glsl.g" -+#line 2924 "./glsl.g" - - case 305: { - ast(1) = makeAstNode<TranslationUnitAST>(sym(1).declaration_list); - } break; - --#line 2937 "./glsl.g" -+#line 2931 "./glsl.g" - - case 306: { - if (sym(1).declaration) { -@@ -2207,7 +2207,7 @@ case 306: { - } - } break; - --#line 2949 "./glsl.g" -+#line 2943 "./glsl.g" - - case 307: { - if (sym(1).declaration_list && sym(2).declaration) { -@@ -2223,49 +2223,49 @@ case 307: { - } - } break; - --#line 2966 "./glsl.g" -+#line 2960 "./glsl.g" - - case 308: { - // nothing to do. - } break; - --#line 2973 "./glsl.g" -+#line 2967 "./glsl.g" - - case 309: { - // nothing to do. - } break; - --#line 2980 "./glsl.g" -+#line 2974 "./glsl.g" - - case 310: { - ast(1) = 0; - } break; - --#line 2987 "./glsl.g" -+#line 2981 "./glsl.g" - - case 311: { - function(1)->body = statement(2); - } break; - --#line 2994 "./glsl.g" -+#line 2988 "./glsl.g" - - case 312: { - ast(1) = 0; - } break; - --#line 3002 "./glsl.g" -+#line 2996 "./glsl.g" - - case 313: { - ast(1) = ast(2); - } break; - --#line 3009 "./glsl.g" -+#line 3003 "./glsl.g" - - case 314: { - ast(1) = ast(2); - } break; - --#line 3015 "./glsl.g" -+#line 3009 "./glsl.g" - - } // end switch - } // end Parser::reduce() -diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h -index 7bf70e2..bab2616 100644 ---- a/src/libs/glsl/glslparser.h -+++ b/src/libs/glsl/glslparser.h -@@ -1,5 +1,5 @@ - --#line 217 "./glsl.g" -+#line 215 "./glsl.g" - - /************************************************************************** - ** --- -1.7.10 - diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop deleted file mode 100644 index fbe06b7a2..000000000 --- a/community-testing/qtcreator/qtcreator.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/qtcreator -Name=Qt Creator -GenericName=C++ IDE -X-KDE-StartupNotify=true -Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png -Terminal=false -Type=Application -Categories=Qt;Development diff --git a/community-testing/qtcreator/qtcreator.install b/community-testing/qtcreator/qtcreator.install deleted file mode 100644 index 4d4a283db..000000000 --- a/community-testing/qtcreator/qtcreator.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/qtcurve-kde4/PKGBUILD b/community-testing/qtcurve-kde4/PKGBUILD deleted file mode 100644 index 817439c93..000000000 --- a/community-testing/qtcurve-kde4/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 74750 2012-08-03 09:56:11Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> - -pkgname=qtcurve-kde4 -pkgver=1.8.13 -pkgrel=3 -arch=('i686' 'x86_64') -groups=('qtcurve') -license=('GPL') -pkgdesc='A configurable set of widget styles for KDE and Gtk' -url='http://www.kde-look.org/content/show.php?content=40492' -depends=('kdebase-workspace') -makedepends=('cmake' 'automoc4') -source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" - 'bypass-kde-config.patch' - 'fix-kwin_decoration-macro.patch') -md5sums=('94ba22bc487a18f585249c2967878189' - '3f6681147cc361bd2bfd4d7477f2a8d0' - '7366e45ef9f24f53a36f87a539a937d6') - -build() { - cd "${srcdir}"/QtCurve-KDE4-${pkgver} - # Bypass KDE prefix detection by kde4-config, see: - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667 - patch -p1 -i "${srcdir}"/bypass-kde-config.patch - patch -p1 -i "${srcdir}"/fix-kwin_decoration-macro.patch - - cd "${srcdir}" - mkdir build - cd build - cmake ../QtCurve-KDE4-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd "${srcdir}"/build - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/qtcurve-kde4/bypass-kde-config.patch b/community-testing/qtcurve-kde4/bypass-kde-config.patch deleted file mode 100644 index d09e5ead5..000000000 --- a/community-testing/qtcurve-kde4/bypass-kde-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Pino Toscano <pino@kde.org> -Description: Disable braindead KDE3/4 prefix detection - The current detection of the KDE 3 and KDE 4 prefixes is done running - kde-config and kde4-config, resp. - This can be problematic, as these two could create files in ~/.kde, - thus breaking when the home of the current user (eg in buildds) is read-only. - Given the build system sets anyway "/usr" as prefix of KDE 3 and KDE 4 - if they were not detected, then just let it to. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=541667 - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -16,6 +16,11 @@ set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CM - set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${QTCURVE_VERSION_FULL}") - include(CPack) - -+# Comment the kde3/kde4 prefix detection as a whole as it wants to run -+# kde-config and kde4-config, which in turn can create stuff in ~/.kde. -+# This cannot work on read-only homes. -+# So, the "fallback" prefixes ("/usr" for both) will be used. -+if (BRAINDEAD_DETECTION) - set(OLD_CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) - - # Try to find kde4-config... -@@ -48,6 +53,7 @@ if (KDE4_KDECONFIG_EXECUTABLE) - ARGS --prefix - OUTPUT_VARIABLE KDE4PREFIX) - endif (KDE4_KDECONFIG_EXECUTABLE) -+endif (BRAINDEAD_DETECTION) - - if(NOT KDE3PREFIX) - if(KDE4PREFIX) diff --git a/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch b/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch deleted file mode 100644 index 6202e7b87..000000000 --- a/community-testing/qtcurve-kde4/fix-kwin_decoration-macro.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -Naur a/kwin/qtcurvehandler.cpp b/kwin/qtcurvehandler.cpp ---- a/kwin/qtcurvehandler.cpp 2012-08-02 13:36:58.811347708 +0000 -+++ b/kwin/qtcurvehandler.cpp 2012-08-02 13:38:03.240996792 +0000 -@@ -489,6 +489,11 @@ - - extern "C" - { -+ KWIN_EXPORT int decoration_version() -+ { -+ return KWIN_DECORATION_API_VERSION; -+ } -+ - KDE_EXPORT KDecorationFactory *create_factory() - { - KWinQtCurve::handler = new KWinQtCurve::QtCurveHandler(); diff --git a/community-testing/r8168-lts/PKGBUILD b/community-testing/r8168-lts/PKGBUILD deleted file mode 100644 index 62afc9066..000000000 --- a/community-testing/r8168-lts/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 75279 2012-08-17 18:35:26Z tpowa $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> - -pkgname=r8168-lts -_pkgname=r8168 -pkgver=8.031.00 -pkgrel=5 -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 - -build() { - cd "$_pkgname-$pkgver" - local _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - 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/rawstudio/PKGBUILD b/community-testing/rawstudio/PKGBUILD deleted file mode 100644 index 50d5d2324..000000000 --- a/community-testing/rawstudio/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 74734 2012-08-02 15:24:10Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Roman Kyrylych <roman@archlinux.org> -# Contributor: cdhotfire <cdhotfire@gmail.com> - -pkgname=rawstudio -pkgver=2.0 -pkgrel=7 -pkgdesc="An open source raw-image converter written in GTK+" -arch=('i686' 'x86_64') -license=('GPL') -url="http://rawstudio.org/" -depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun' - 'raptor1' 'lcms' 'gtk2') -install=${pkgname}.install -options=('!libtool') -source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz - libpng15.patch) -md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b' - '2f8b7acbe10d8096ce613cbea7986fd3') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 <$srcdir/libpng15.patch - export LDFLAGS="$LDFLAGS `pkg-config --libs gthread-2.0`" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make prefix="${pkgdir}/usr" install - mkdir $pkgdir/usr/lib/rawstudio - mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio - ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins -} diff --git a/community-testing/rawstudio/libpng15.patch b/community-testing/rawstudio/libpng15.patch deleted file mode 100644 index 6d3b85968..000000000 --- a/community-testing/rawstudio/libpng15.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -wbBur rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp ---- rawstudio-2.0/plugins/load-gdk/exiv2-colorspace.cpp 2011-02-24 01:35:18.000000000 +0300 -+++ rawstudio-2.0.my/plugins/load-gdk/exiv2-colorspace.cpp 2012-01-23 15:03:22.000000000 +0400 -@@ -102,8 +102,8 @@ - { - *linear_guess = FALSE; - RSColorSpace* profile = NULL; -- const gchar *icc_profile_title; -- const gchar *icc_profile; -+ png_charp icc_profile_title; -+ png_bytep icc_profile; - guint icc_profile_size; - png_structp png_ptr = png_create_read_struct( - PNG_LIBPNG_VER_STRING, -@@ -125,11 +125,11 @@ - - int compression_type; - /* Extract embedded ICC profile */ -- if (info_ptr->valid & PNG_INFO_iCCP) -+ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_iCCP)) - { - png_uint_32 retval = png_get_iCCP (png_ptr, info_ptr, -- (png_charpp) &icc_profile_title, &compression_type, -- (png_charpp) &icc_profile, (png_uint_32*) &icc_profile_size); -+ &icc_profile_title, &compression_type, -+ &icc_profile, (png_uint_32*) &icc_profile_size); - if (retval != 0) - { - RSIccProfile *icc = rs_icc_profile_new_from_memory((gchar*)icc_profile, icc_profile_size, TRUE); -diff -wbBur rawstudio-2.0/plugins/output-pngfile/output-pngfile.c rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c ---- rawstudio-2.0/plugins/output-pngfile/output-pngfile.c 2011-03-26 04:52:29.000000000 +0300 -+++ rawstudio-2.0.my/plugins/output-pngfile/output-pngfile.c 2012-01-23 15:04:59.000000000 +0400 -@@ -23,6 +23,7 @@ - #include <gettext.h> - #include "config.h" - #include <png.h> -+#include <zlib.h> - - #define RS_TYPE_PNGFILE (rs_pngfile_type) - #define RS_PNGFILE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), RS_TYPE_PNGFILE, RSPngfile)) diff --git a/community-testing/rawstudio/rawstudio.install b/community-testing/rawstudio/rawstudio.install deleted file mode 100644 index 261adb7b4..000000000 --- a/community-testing/rawstudio/rawstudio.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q || true -} - -post_upgrade() { - update-desktop-database -q || true -} - -post_remove() { - update-desktop-database -q || true -} diff --git a/community-testing/rss-glx/PKGBUILD b/community-testing/rss-glx/PKGBUILD deleted file mode 100644 index e2ef22fed..000000000 --- a/community-testing/rss-glx/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 77302 2012-10-08 15:09:01Z spupykin $ -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> -# Contributor: Tate "Tatey" Johnson <tatey86@tpg.com.au> - -pkgname=rss-glx -pkgver=0.9.1 -pkgrel=10 -pkgdesc="The Really Slick Screensavers port to GLX" -arch=('i686' 'x86_64') -url="http://rss-glx.sourceforge.net/" -license=('GPL') -depends=('desktop-file-utils' 'freealut' 'glew' 'imagemagick' 'glu' 'mesa') -optdepends=('xscreensaver: xscreensaver integration') -install=rss-glx.install -options=('!libtool') -source=(http://downloads.sourceforge.net/rss-glx/${pkgname}_${pkgver}.tar.bz2 - rss-glx-desktops.tar.bz2) -md5sums=('a772bd143cd8d141edf4d9eff9860ab3' - '4211215c9a4918b0dff30a7000647dd9') - -build() { - cd ${srcdir}/${pkgname}_${pkgver} - - [ "$CARCH" = "x86_64" ] && (sed -i -e 's|@LIBS@|@LIBS@ -fopenmp|g' src/Makefile.in) - - ./configure --prefix=/usr \ - --mandir=/usr/share/man \ - --program-transform-name='s/plasma/plasma_rss/' \ - --with-configdir=/usr/share/xscreensaver/config \ - --with-kdessconfigdir=/usr/share/applnk/System/ScreenSavers \ - --enable-shared=yes --enable-static=no - make CFLAGS="$CFLAGS -I/usr/include/ImageMagick" -} - -package() { - cd ${srcdir}/${pkgname}_${pkgver} - make DESTDIR=${pkgdir} install - - # FS#18300 - install -d ${pkgdir}/usr/lib/xscreensaver/ - list=$(ls ${pkgdir}/usr/bin --ignore rss-glx_install.pl) - for i in $list; do - ln -s "/usr/bin/$i" "$pkgdir/usr/lib/xscreensaver/" - done - - install -d ${pkgdir}/usr/share/applications/screensavers - install -m644 ${srcdir}/${pkgname}-desktops/*.desktop ${pkgdir}/usr/share/applications/screensavers -} diff --git a/community-testing/rss-glx/rss-glx-desktops.tar.bz2 b/community-testing/rss-glx/rss-glx-desktops.tar.bz2 Binary files differdeleted file mode 100644 index 940fd5277..000000000 --- a/community-testing/rss-glx/rss-glx-desktops.tar.bz2 +++ /dev/null diff --git a/community-testing/rss-glx/rss-glx.install b/community-testing/rss-glx/rss-glx.install deleted file mode 100644 index 758642618..000000000 --- a/community-testing/rss-glx/rss-glx.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - cat << 'EOM' - --> If you want to integrate the RSS screen savers with xscreensaver - --> for your user, then install the xscreensaver package and launch - --> the command "rss-glx_install.pl" -EOM - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/community-testing/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/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD deleted file mode 100644 index b6483c6e0..000000000 --- a/community-testing/sage-mathematics/PKGBUILD +++ /dev/null @@ -1,100 +0,0 @@ -# $Id: PKGBUILD 75170 2012-08-14 16:00:21Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Contributor: Antonio Rojas < nqn1976 @ gmail.com > -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Osman Ugus <ugus11@yahoo.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD - -pkgname=sage-mathematics -pkgver=5.2 -pkgrel=2 -pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.' -url='http://www.sagemath.org' -arch=('i686' 'x86_64') -license=('GPL') -#depends=('readline') -makedepends=('gcc-fortran' 'desktop-file-utils') -optdepends=('imagemagick: some plotting functionality benefits from it' - 'texlive-core: some plotting functionality benefits from it, also to use SageTeX' - 'openssh: to use the notebook in secure mode' - 'ffmpeg: to show animations' - 'jsmath-fonts: native TeX fonts for the notebook') -options=('!makeflags') -install="${pkgname}.install" -source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar" - 'SAGE-notebook.desktop') - -build() { - cd sage-${pkgver} - - # fix "missing sage.all error" during build - unset CFLAGS - unset CXXFLAGS - - # fix build errors - unset LDFLAGS - - # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS - export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }') - export MAKE="make -j${SAGE_BUILD_THREADS}" - - # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran - export SAGE_FORTRAN='/usr/bin/gfortran' - export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so' - - # disable building with debugging support - export SAGE_DEBUG='no' - - # enable fat binaries (disables processor specific optimizations) - # comment out if you're only building it for yourself - export SAGE_FAT_BINARY='yes' - - # can't write to root in a clean chroot - export DOT_SAGE='/build/src/' - - # only build sage, no documents - #make build - make -} - -<< COMMENT -check() { - cd sage-${pkgver} - - # uncomment if we want to run all the tests (warning: very long) - #make ptestlong -} -COMMENT - -package() { - cd sage-${pkgver} - - # cp because make install is experimental and will corrupt the install - install -d ${pkgdir}/opt/sage - cp -dpr --no-preserve=ownership * ${pkgdir}/opt/sage - - # move SageTeX files to more appropriate directory - install -d ${pkgdir}/usr/share - mv ${pkgdir}/opt/sage/local/share/texmf \ - ${pkgdir}/usr/share - - desktop-file-install ${srcdir}/SAGE-notebook.desktop \ - --dir ${pkgdir}/usr/share/applications - - # create link to main binary - install -d ${pkgdir}/usr/bin - ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage - - # remove build logs - rm -f ${pkgdir}/opt/sage/*.log - rm -rf ${pkgdir}/opt/sage/spkg/logs - - # remove source packages, since they are rarely needed, they are 300mb in size (compressed) - rm -f ${pkgdir}/opt/sage/spkg/base/*spkg - rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg -} - -# vim :set ts=2 sw=2 et: -md5sums=('59f55ec8cdd1ca595c56cc72620b3576' - 'dc391f12b7d17dd37326343ec0e99bbd') diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop deleted file mode 100644 index 26a35d3ac..000000000 --- a/community-testing/sage-mathematics/SAGE-notebook.desktop +++ /dev/null @@ -1,19 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=SAGE -Comment=SAGE NOTEBOOK -Comment[en_US]=SAGE NOTEBOOK -Exec=/opt/sage/sage -notebook -GenericName= -GenericName[de]= -Icon=/opt/sage/data/extcode/notebook/images/sageicon.png -MimeType= -Name[de]=SAGE -StartupNotify=true -Terminal=true -Type=Application -Categories=Science;Math; -X-DCOP-ServiceType= -X-KDE-SubstituteUID=false -X-KDE-Username= -GenericName[en_US]= diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install deleted file mode 100644 index 6caa5299e..000000000 --- a/community-testing/sage-mathematics/sage-mathematics.install +++ /dev/null @@ -1,56 +0,0 @@ -post_install() { - cd /opt/sage - - # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership - # the files it writes to ~/.sage can be safely ignored - HOME=/tmp ./sage -c - - # add sagemath user for the daemon - useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath - - # Update LaTeX db to point to SageTeX - if [ -f /usr/bin/texhash ]; then - /usr/bin/texhash /usr/share/texmf - else - echo 'Warning: could not find /usr/bin/texhash' - echo 'SageTeX has been installed but you need to run:' - echo '# texhash /usr/share/texmf' - echo 'So that LaTeX will be able to find it.' - fi - -echo ' - ___ -/ (_) o | -\__ _ _ __ | -/ / |/ | | / \_| | | -\___/ | |_/|/\__/ \_/|/o - /| /| - \| \| - ________________________________ -< sage-mathematics, I mean, MOO! > - -------------------------------- - \ ^__^ - \ (oo)\_______ - (__)\ )\/\ - ||----w | - || || -' - -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - # Update LaTeX db to remove SageTeX entries - if [ -f /usr/bin/texhash ]; then - /usr/bin/texhash /usr/share/texmf - fi - - # remove the sagemath daemon user - userdel sagemath - - # clean up left overs - rm -rf /opt/sage -} diff --git a/community-testing/schroot/PKGBUILD b/community-testing/schroot/PKGBUILD deleted file mode 100644 index 554f26fbf..000000000 --- a/community-testing/schroot/PKGBUILD +++ /dev/null @@ -1,71 +0,0 @@ -# $Id: PKGBUILD 73773 2012-07-15 13:20:34Z ibiru $ -# 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-testing/schroot/arch32-config b/community-testing/schroot/arch32-config deleted file mode 100644 index 0ee72d522..000000000 --- a/community-testing/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-testing/schroot/arch32-copyfiles b/community-testing/schroot/arch32-copyfiles deleted file mode 100644 index 88f093ceb..000000000 --- a/community-testing/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-testing/schroot/arch32-example b/community-testing/schroot/arch32-example deleted file mode 100644 index 3f059e3c0..000000000 --- a/community-testing/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-testing/schroot/arch32-mount b/community-testing/schroot/arch32-mount deleted file mode 100644 index 075d6e451..000000000 --- a/community-testing/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-testing/schroot/arch32-nssdatabases b/community-testing/schroot/arch32-nssdatabases deleted file mode 100644 index 815ddce3f..000000000 --- a/community-testing/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-testing/schroot/pam.d.schroot.patch b/community-testing/schroot/pam.d.schroot.patch deleted file mode 100644 index 528acb5f7..000000000 --- a/community-testing/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-testing/scorched3d/PKGBUILD b/community-testing/scorched3d/PKGBUILD deleted file mode 100644 index 0ae9d7dcb..000000000 --- a/community-testing/scorched3d/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Seppo Porspakka <sporspak@paju.oulu.fi> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=scorched3d -pkgver=43.3.d -_pkgver=43.3d -pkgrel=4 -pkgdesc="3D artillery combat game" -arch=('i686' 'x86_64') -url="http://www.scorched3d.co.uk/" -license=('GPL') -depends=('sdl_net' 'wxgtk' 'freealut>=1.0.0-3' 'libvorbis' 'glu' 'fftw' 'libjpeg>=8' 'xdg-utils') -makedepends=('gendesk' 'mesa') -install=scorched3d.install -source=("http://downloads.sourceforge.net/${pkgname}/Scorched3D-${_pkgver}-src.tar.gz" - 'scorched3d.png::http://cdn.portableapps.com/Scorched3DPortable_128.png' - 'scorched3d-42.1-gcc43.patch' - 'scorched3d-42.1-fixups.patch' - 'scorched3d-libpng1.5.patch' - 'libpng14.patch') -md5sums=('9c3043282a9e7451468ff325bef3b04c' - '0f7e570f586c227873e909ebbc17c84d' - '053769f77a38c252eef1d967b18e93e6' - 'dfde556559d95bca07c4a390c60790b4' - 'ec6958191751b5a2c44aa15abfc75269' - 'c8c03855fd3693122fd39427fa3638c1') - -build() { - cd "$srcdir/scorched" - -# patch -Np1 -i ${srcdir}/scorched3d-42.1-gcc43.patch -# patch -Np1 -i ${srcdir}/scorched3d-42.1-fixups.patch - patch -Np1 -i ${srcdir}/scorched3d-libpng1.5.patch -# patch -Np0 -i ${srcdir}/libpng14.patch - - WANT_WXGTK=gtk2 - sh autogen.sh \ - --prefix=/usr \ - --datadir=/usr/share/scorched3d \ - --disable-openaltest \ - --with-wx-config=wx-config - - sed -i '1 i #include <unistd.h>' src/client/client/SecureID.cpp - #sed -i 's/-lz/-lz -lalut/g' src/scorched/Makefile || return 1 - #sed -i 's|/usr/local/lib/libwx_gtk-2.4.a||' src/scorched/Makefile || return 1 - - make -} - -package() { - cd "$srcdir" - gendesk - - cd scorched - make DESTDIR=${pkgdir} install - cd .. - - install -D -m644 scorched3d.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/$pkgname.png" - install -D -m644 scorched3d.png "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -D -m644 scorched3d.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" -} diff --git a/community-testing/scorched3d/libpng14.patch b/community-testing/scorched3d/libpng14.patch deleted file mode 100644 index 7a5a9434c..000000000 --- a/community-testing/scorched3d/libpng14.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- src/common/image/ImagePng.cpp 2009-02-23 04:14:20.000000000 +0100 -+++ src/common/image/ImagePng.cpp_patched 2010-01-24 22:01:04.000000000 +0100 -@@ -189,7 +189,7 @@ - info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL)
- {
-- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, NULL, NULL);
- return false;
- }
-
-@@ -200,7 +200,7 @@ - if (setjmp(png_jmpbuf(png_ptr)))
- {
- /* Free all of the memory associated with the png_ptr and info_ptr */
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
- /* If we get here, we had a problem reading the file */
- return false;
- }
-@@ -258,7 +258,7 @@ - }
- else
- {
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-
- Logger::log(S3D::formatStringBuffer(
- "Invalid PNG format.\n"
-@@ -272,7 +272,7 @@ - // END NEW CODE
-
- /* clean up after the read, and free any memory allocated - REQUIRED */
-- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
-+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
-
- /* that's it */
- return true;
diff --git a/community-testing/scorched3d/scorched3d-42.1-fixups.patch b/community-testing/scorched3d/scorched3d-42.1-fixups.patch deleted file mode 100644 index 36a027cb6..000000000 --- a/community-testing/scorched3d/scorched3d-42.1-fixups.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4 ---- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500 -@@ -7,25 +7,9 @@ - [ --disable-openaltest Do not try to compile and run a test OpenAL program], - , enable_openaltest=yes) - AC_MSG_CHECKING(for OpenAL support) --AC_PATH_PROG(OPENAL_CONFIG, openal-config, no) --if test x$OPENAL_CONFIG = xno; then -- echo "*** The openal-config script installed by OpenAL could not be found" -- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG" -- echo "*** environment variable to the full path to openal-config." -- -- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/]) --else -- -- if test x"$use_static_openal" = x"yes"; then -- AL_LIBS="/usr/local/lib/libopenal.a" -- else -- AL_LIBS="`$OPENAL_CONFIG --libs`" -- fi -- -- AL_CFLAGS="`$OPENAL_CONFIG --cflags`" -- -- AC_MSG_RESULT(yes) --fi -+AL_LIBS="-lopenal" -+AL_CFLAGS="-I/usr/include/AL" -+AC_MSG_RESULT(yes) - - AC_MSG_CHECKING(for Freealut support) - AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no) -diff -ru scorched.orig/configure.ac scorched/configure.ac ---- scorched.orig/configure.ac 2008-03-03 16:17:18.000000000 -0500 -+++ scorched/configure.ac 2009-02-15 20:40:30.000000000 -0500 -@@ -13,22 +13,6 @@ - AC_PROG_INSTALL - AC_PROG_RANLIB - --LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6" --CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6" -- --if test `uname` == Darwin; then --LDFLAGS="$LDFLAGS -lmx" --CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__" --else --LDFLAGS="$LDFLAGS -L/usr/local/lib" --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[ -- echo "Warning: No beer found in fridge!"; -- echo "We highly suggest that you rectify this situation immediately." --]) -- - AC_ARG_ENABLE(serveronly, - [ --enable-serveronly Enable server only compilation], - , enable_serveronly=no, diff --git a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch b/community-testing/scorched3d/scorched3d-42.1-gcc43.patch deleted file mode 100644 index b235f07c5..000000000 --- a/community-testing/scorched3d/scorched3d-42.1-gcc43.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur scorched.old/src/common/common/main.h scorched/src/common/common/main.h ---- scorched.old/src/common/common/main.h 2009-02-18 20:06:22.000000000 +0200 -+++ scorched/src/common/common/main.h 2009-02-18 20:07:18.000000000 +0200 -@@ -40,7 +40,7 @@ - void _no_storage()
- {
- printf("Failed to allocate memory!!");
-- std::exit(1);
-+ exit(1);
- }
-
- void run_main(int argc, char *argv[], OptionsParameters ¶ms)
-diff -ur scorched.old/src/common/porting/windows.h scorched/src/common/porting/windows.h ---- scorched.old/src/common/porting/windows.h 2009-02-18 20:06:22.000000000 +0200 -+++ scorched/src/common/porting/windows.h 2009-02-18 20:06:46.000000000 +0200 -@@ -20,7 +20,7 @@ - typedef unsigned short WORD;
- typedef unsigned char BYTE;
-
--typedef int HWND;
-+// typedef int HWND;
- typedef void * HINSTANCE;
- typedef int WPARAM;
- typedef int LPARAM;
diff --git a/community-testing/scorched3d/scorched3d-libpng1.5.patch b/community-testing/scorched3d/scorched3d-libpng1.5.patch deleted file mode 100644 index 4e8f003b8..000000000 --- a/community-testing/scorched3d/scorched3d-libpng1.5.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- ./src/common/image/ImagePngFactory.cpp.old 2011-09-12 12:34:30.114461019 +0200 -+++ ./src/common/image/ImagePngFactory.cpp 2011-09-12 12:39:28.566425593 +0200 -@@ -104,7 +104,7 @@ -
- static void user_png_error(png_structp png_ptr, png_const_charp msg)
- {
-- longjmp(png_ptr->jmpbuf,1);
-+ longjmp(png_jmpbuf(png_ptr),1);
- }
-
- static void user_png_warning(png_structp png_ptr, png_const_charp msg)
---- ./src/client/client/LoadPNG.cpp.old 2011-09-12 12:45:49.167380419 +0200 -+++ ./src/client/client/LoadPNG.cpp 2011-09-12 14:11:14.961772024 +0200 -@@ -28,6 +28,8 @@ - int row, i; - volatile int ckey = -1; - png_color_16 *transv; -+ png_colorp png_palette; -+ int num_palette; - - if ( !src ) { - /* The error message has been set in SDL_RWFromFile */ -@@ -58,7 +60,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if ( setjmp(png_ptr->jmpbuf) ) { -+ if ( setjmp(png_jmpbuf(png_ptr)) ) { - error = "Error reading the PNG file."; - goto done; - } -@@ -127,9 +129,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -137,7 +139,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -185,12 +187,15 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0 ) { -- palette->ncolors = info_ptr->num_palette; -- for( i=0; i<info_ptr->num_palette; ++i ) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else { -+ png_get_PLTE(png_ptr, info_ptr, &png_palette, &num_palette); -+ if (num_palette > 0 ) { -+ palette->ncolors = num_palette; -+ for( i=0; i<num_palette; ++i ) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; -+ } - } - } - } diff --git a/community-testing/scorched3d/scorched3d.install b/community-testing/scorched3d/scorched3d.install deleted file mode 100644 index c5571196e..000000000 --- a/community-testing/scorched3d/scorched3d.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/community-testing/sdcc/PKGBUILD b/community-testing/sdcc/PKGBUILD deleted file mode 100644 index 378727faa..000000000 --- a/community-testing/sdcc/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# $Id: PKGBUILD 78121 2012-10-16 11:54:21Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Jose Negron <josenj.arch@mailnull.net> - -pkgname=sdcc -pkgver=3.2.0 -pkgrel=2 -pkgdesc="Retargettable ANSI C compiler (Intel 8051, Maxim 80DS390, Zilog Z80 and the Motorola 68HC08)" -arch=('i686' 'x86_64') -license=('GPL') -depends=('bash' 'gcc-libs' 'boost-libs') -makedepends=('gputils' 'flex' 'bison' 'patch' 'boost') -optdepends=('python') -url="http://sdcc.sourceforge.net/" -options=(!strip) -source=(http://downloads.sourceforge.net/sourceforge/sdcc/$pkgname-src-$pkgver.tar.bz2) -md5sums=('0808a9b4109d2ba6046ddd7b679a0012') - -build() { - cd $srcdir/$pkgname - ./configure \ - --prefix=/usr \ - --includedir=/usr/include/sdcc \ - --libdir=/usr/lib/sdcc - make - make install DESTDIR=$pkgdir - - if [ -d $pkgdir/usr/lib/lib ]; then - mv $pkgdir/usr/lib/lib/* $pkgdir/usr/lib/sdcc/ - rm -rf $pkgdir/usr/lib/lib - fi - - sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' $pkgdir/usr/bin/as2gbmap -} diff --git a/community-testing/sfml/PKGBUILD b/community-testing/sfml/PKGBUILD deleted file mode 100644 index 8650d6c50..000000000 --- a/community-testing/sfml/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 74521 2012-07-29 21:16:25Z ebelanger $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Ondrej Martinak <omartinak@gmail.com> - -pkgname=sfml -pkgver=2.0rc1 -pkgrel=2 -pkgdesc='A simple, fast, cross-platform, and object-oriented multimedia API' -arch=('i686' 'x86_64') -url='http://www.sfml-dev.org/' -license=('zlib') -depends=('libsndfile' 'libxrandr' 'libjpeg' 'openal' 'glew' 'freetype2') -makedepends=('mesa' 'cmake' 'doxygen') -install=sfml.install -source=("2.0-rc.tar.gz::https://github.com/LaurentGomila/SFML/tarball/2.0-rc") -md5sums=('03c8e6817f4525092b94a3d44e8eada8') - -build() { - cd "$srcdir"/Laurent* - - mkdir build && cd build - cmake -DCMAKE_INSTALL_PREFIX=/usr .. \ - -DBUILD_DOC=true \ - -DBUILD_EXAMPLES=true - make - make doc -} - -package() { - cd "$srcdir"/Laurent*/build - - make DESTDIR="$pkgdir/" install - - install -Dm644 "$pkgdir/usr/share/SFML/cmake/Modules/FindSFML.cmake" "$pkgdir/usr/share/cmake-2.8/Modules/FindSFML.cmake" - - install -Dm644 ../license.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - make clean -} - diff --git a/community-testing/sfml/sfml.install b/community-testing/sfml/sfml.install deleted file mode 100644 index 75f760be6..000000000 --- a/community-testing/sfml/sfml.install +++ /dev/null @@ -1,3 +0,0 @@ -post_install() { - echo "To view the SFML samples, go to /usr/share/SFML/examples/ and run them individually" -} diff --git a/community-testing/shotwell/PKGBUILD b/community-testing/shotwell/PKGBUILD deleted file mode 100644 index d8c81738d..000000000 --- a/community-testing/shotwell/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 78460 2012-10-18 22:34:19Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Ionut Biru <ibiru@archlinux.org> -# Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> - -pkgname=shotwell -pkgver=0.13.1 -pkgrel=1 -pkgdesc="A digital photo organizer designed for the GNOME desktop environment" -arch=('i686' 'x86_64') -url="http://yorba.org/shotwell/" -license=('LGPL2.1') -depends=('libgee' 'libunique3' 'libwebkit3' 'libgexiv2' 'libraw' 'rest' - 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'json-glib') -makedepends=('intltool' 'vala>=0.17.2') -install=shotwell.install -source=("http://yorba.org/download/shotwell/0.13/shotwell-${pkgver}.tar.xz") -md5sums=('71eb1346093705ca2b37c12a21994d14') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr \ - --disable-schemas-compile \ - --disable-desktop-update \ - --disable-icon-update - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/shotwell/shotwell.install b/community-testing/shotwell/shotwell.install deleted file mode 100644 index bab8ecd29..000000000 --- a/community-testing/shotwell/shotwell.install +++ /dev/null @@ -1,17 +0,0 @@ -pkgname=shotwell - -post_install() { - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - update-desktop-database -q - glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q - gtk-update-icon-cache -fq -t usr/share/icons/hicolor - glib-compile-schemas usr/share/glib-2.0/schemas -} diff --git a/community-testing/skrooge/PKGBUILD b/community-testing/skrooge/PKGBUILD deleted file mode 100644 index 6f324c2b3..000000000 --- a/community-testing/skrooge/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 74953 2012-08-10 05:05:01Z ebelanger $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Ray Rashif <schiv@archlinux.org> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: neuromante <lorenzo.nizzi.grifi@gmail.com> - -pkgname=skrooge -pkgver=1.3.0 -pkgrel=2 -pkgdesc="A personal finances manager for KDE" -arch=('i686' 'x86_64') -url="http://skrooge.org/" -license=('GPL') -depends=('kdebase-runtime' 'libofx' 'qca-ossl') -makedepends=('cmake' 'automoc4' 'docbook-xsl') -install=$pkgname.install -changelog=$pkgname.changelog -source=(http://skrooge.org/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('7f8ec247084a005b743bb080ded5724f6c1ee3644c135e12002c80df93fddfe9') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - - cmake . -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr - - make -} - -package() { - cd "${srcdir}/$pkgname-$pkgver" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/skrooge/skrooge.changelog b/community-testing/skrooge/skrooge.changelog deleted file mode 100644 index ffc491ba5..000000000 --- a/community-testing/skrooge/skrooge.changelog +++ /dev/null @@ -1,11 +0,0 @@ -2012-08-09 Eric Belanger <eric@archlinux.org> - * skrooge 1.3.0-2 Rebuild against libofx 0.9.5 - -2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * skrooge 1.3.0-1 - -2012-02-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * skrooge 1.2.0-1 - -2011-11-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * skrooge 1.1.1-1 diff --git a/community-testing/skrooge/skrooge.install b/community-testing/skrooge/skrooge.install deleted file mode 100644 index 050474c59..000000000 --- a/community-testing/skrooge/skrooge.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-mime-database usr/share/mime &> /dev/null - xdg-icon-resource forceupdate --theme hicolor &> /dev/null - update-desktop-database -q - kbuildsycoca4 &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/smc/PKGBUILD b/community-testing/smc/PKGBUILD deleted file mode 100644 index c16b4ef68..000000000 --- a/community-testing/smc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 77259 2012-10-08 12:29:17Z lcarlier $ -# Maintainer: -# Contributor: Juergen Hoetzel <juergen@archlinux.org> -# Contributor: Kritoke <typeolinux@yahoo.com> - -pkgname=smc -pkgver=1.9 -pkgrel=17.1 -pkgdesc="Secret Maryo Chronicles" -arch=('i686' 'x86_64') -url="http://www.secretmaryo.org/" -license=('GPL3') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') -makedepends=('autoconf' 'automake' 'boost') -source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 - smc-for-cegui-v0-7.diff - boost_filesystem3.diff - smc.desktop - smc.png) -md5sums=('75ab7826303c49aec25b052a8b90287f' - '51dfea21b741ad19df14e738df52f1cf' - '309a5a6d4b3c0b3dc5e1b7f4de84086f' - '80fe208132ff41dd7677a53ee429ecdb' - 'efca7580e28748625eb676c9d24ee122') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # to remove when smc will be compatible with cegui-0.7.x - patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" - # fix compilation - export CXXFLAGS="${CXXFLAGS} -fpermissive" - # fix for boost >= 1.50 - patch -Np1 -i "${srcdir}/boost_filesystem3.diff" - - ./autogen.sh - LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make install DESTDIR="$pkgdir" - # install some freedesktop.org compatibility - install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - - rm -rf "$pkgdir/usr/share/smc/" -} diff --git a/community-testing/smc/boost_filesystem3.diff b/community-testing/smc/boost_filesystem3.diff deleted file mode 100644 index 6786b98f5..000000000 --- a/community-testing/smc/boost_filesystem3.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp ---- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 12:11:18.000000000 +0200 -+++ smc-1.9.new/src/core/filesystem/filesystem.cpp 2012-07-12 15:36:31.361941069 +0200 -@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files( - if( fs::is_directory( *dir_itr ) ) - { - // ignore hidden directories -- if( dir_itr->path().leaf().find( "." ) == 0 ) -+ if( dir_itr->path().filename().string().find( "." ) == 0 ) - { - continue; - } - - if( with_directories ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - - // load all items from the sub-directory - if( search_in_sub_directories ) - { -- vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); -+ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories ); - valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); - } - } - // valid file -- else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) -+ else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos ) - { -- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); -+ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); - } - } - catch( const std::exception &ex ) -diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp ---- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 18:44:52.000000000 +0200 -+++ smc-1.9.new/src/overworld/world_manager.cpp 2012-07-12 15:37:13.564660591 +0200 -@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con - {
- try
- {
-- std::string current_dir = dir_itr->path().leaf();
-+ std::string current_dir = dir_itr->path().filename().string();
-
- // only directories with an existing description
- if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
diff --git a/community-testing/smc/smc-for-cegui-v0-7.diff b/community-testing/smc/smc-for-cegui-v0-7.diff deleted file mode 100644 index a99cbce6c..000000000 --- a/community-testing/smc/smc-for-cegui-v0-7.diff +++ /dev/null @@ -1,437 +0,0 @@ -diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac ---- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 -+++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 -@@ -53,7 +53,7 @@ - AC_MSG_ERROR([SDL_ttf library not found])) - - # Check for the CEGUI library --PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) -+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) - CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" - LIBS="$LIBS $CEGUI_LIBS" - -diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp ---- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 -+++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 -@@ -118,16 +118,10 @@ - return tmp;
- }
-
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- // draw text
-- list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
-- // draw text
-- list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+ list_text->draw( buffer, targetRect, alpha, clipper );
- }
-
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@ - if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- {
- // Listbox dimension
-- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
-- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- // Vertical ScrollBar Position
- float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- // font height
-- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
-
- // draw items
- for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h ---- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 -+++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 -@@ -62,8 +62,7 @@ - */
- virtual CEGUI::Size getPixelSize( void ) const;
- // draw
-- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
-- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- // draw image
- void Draw_Image( void );
-
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp ---- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 -+++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 -@@ -265,7 +265,7 @@ -
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- // fixme : Can't handle multiple lines of text
- float text_width = font->getTextExtent( text ) * global_downscalex;
-
-@@ -1182,7 +1182,7 @@ - text_default->setText( gui_text );
-
- // align text
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@ - text_default->moveToFront();
-
- // set window height
-- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
-
- while( draw )
- {
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp ---- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 -+++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 -@@ -444,13 +444,15 @@ - - if( pGuiSystem ) - { -- delete pGuiSystem; -+ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); -+ pGuiSystem->destroy(); - pGuiSystem = NULL; -+ delete rp; - } - - if( pGuiRenderer ) - { -- delete pGuiRenderer; -+ pGuiRenderer->destroy( *pGuiRenderer ); - pGuiRenderer = NULL; - } - -@@ -507,7 +509,7 @@ - } - case SDL_VIDEORESIZE: - { -- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); -+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); - break; - } - case SDL_KEYDOWN: -diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp ---- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 -+++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 -@@ -946,7 +946,7 @@ - m_text_debug_text->setVisible( 1 );
-
- // update position
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = font->getTextExtent( gui_text ) * global_downscalex;
-
- if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp ---- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 -+++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -432,17 +432,12 @@ -
- void cMouseCursor :: Render( void ) const
- {
-- if( !m_active )
-- {
-+ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+ if ( m_active == mouse->isVisible() )
- return;
-- }
-
-- // Render CEGUI Mouse
-- pGuiRenderer->setQueueingEnabled( 0 );
-- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-- mouse->setVisible( 1 );
-- mouse->draw();
-- mouse->setVisible( 0 );
-+ mouse->setVisible( m_active );
- }
-
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp ---- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 -+++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 -@@ -163,8 +163,8 @@ - editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- // preview window
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
-- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
-
- Update_BG_Colors( CEGUI::EventArgs() );
-
-@@ -555,8 +555,8 @@ -
- // set default rect
- CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
-- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
-- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
-
- if( !File_Exists( filename ) )
- {
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp ---- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 -+++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 -@@ -1663,7 +1663,7 @@ - window_name->setText( name );
- window_name->setTooltipText( tooltip );
- // get text width
-- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- // all names should have the same width
- if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp ---- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 -+++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 -@@ -103,15 +103,15 @@ -
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-
--cFake_Renderer :: cFake_Renderer( void )
--{
-- d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+// d_identifierString = "Fake Renderer";
-+//}
-
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
-
--}
-+//}
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
-
-@@ -158,7 +158,7 @@ - std::string log_dump_dir = "/dev/null";
- #endif
- // create fake system and renderer
-- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
-
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@ - CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
-
-- delete pGuiSystem;
-+ pGuiSystem->destroy();
- pGuiSystem = NULL;
- delete renderer;
- delete rp;
-@@ -177,7 +177,7 @@ - // create renderer
- try
- {
-- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@ - exit( EXIT_FAILURE );
- }
-
-- /* create Resource Provider
-- * no need to destroy it later since it is handled by the CEGUI renderer
-- */
-- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+ pGuiRenderer->enableExtraStateSettings(true);
-+
-+ // create Resource Provider
-+ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
-
- // set Resource Provider directories
- rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@ - // create system
- try
- {
-- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@ - // load the scheme file, which auto-loads the imageset
- try
- {
-- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- }
- // catch CEGUI Exceptions
- catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@ - // default mouse cursor
- pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- // force new mouse image
-- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
-- // hide CEGUI mouse always because we render it manually
-- CEGUI::MouseCursor::getSingleton().hide();
-+ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- // default tooltip
- pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- // create default root window
-@@ -553,7 +551,7 @@ - pFont->Restore_Textures();
-
- // send new size to CEGUI
-- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-
- // check if CEGUI is initialized
- bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h ---- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 -+++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 -@@ -23,7 +23,7 @@ - #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
-
- namespace SMC
- {
-@@ -129,31 +129,100 @@ - EFFECT_IN_AMOUNT
- };
-
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+ void draw() const {}
-+ void setTranslation(const CEGUI::Vector3&) {}
-+ void setRotation(const CEGUI::Vector3&) {}
-+ void setPivot(const CEGUI::Vector3&) {}
-+ void setClippingRegion(const CEGUI::Rect&) {}
-+ void appendVertex(const CEGUI::Vertex&) {}
-+ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+ void setActiveTexture(CEGUI::Texture*) {}
-+ void reset() {}
-+ CEGUI::Texture* getActiveTexture() const { return 0; }
-+ CEGUI::uint getVertexCount() const { return 0; }
-+ CEGUI::uint getBatchCount() const { return 0; }
-+ void setRenderEffect(CEGUI::RenderEffect*) {}
-+ CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
-
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+ cFake_Texture() :
-+ m_size(1, 1),
-+ m_scaling(1, 1) {}
-+
-+ const CEGUI::Size& getSize() const { return m_size; }
-+ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+ void saveToMemory(void*) {}
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
-- cFake_Renderer( void );
-- virtual ~cFake_Renderer( void );
-+ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+ void draw(const CEGUI::GeometryBuffer&) {}
-+ void draw(const CEGUI::RenderQueue&) {}
-+ void setArea(const CEGUI::Rect&) {}
-+ const CEGUI::Rect& getArea() const { return m_area; }
-+ bool isImageryCache() const { return false; }
-+ void activate() {}
-+ void deactivate() {}
-+ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+ CEGUI::Rect m_area;
-+};
-
-- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
-- virtual void doRender(void) {};
-- virtual void clearRenderList(void) {};
-- virtual void setQueueingEnabled(bool setting) {};
-- virtual CEGUI::Texture *createTexture(void) { return NULL; };
-- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
-- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
-- virtual void destroyTexture(CEGUI::Texture* texture) {};
-- virtual void destroyAllTextures(void) {};
-- virtual bool isQueueingEnabled(void) const { return 0; };
-- virtual float getWidth(void) const { return 0; };
-- virtual float getHeight(void) const { return 0; };
-- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
-- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
-- virtual unsigned int getMaxTextureSize(void) const { return 0; };
-- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
-- virtual unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+ cFake_Renderer( void ) :
-+ m_size(0, 0),
-+ m_dpi(0, 0),
-+ m_identifierString("Fake Renderer"),
-+ m_root(m_target) {}
-+ ~cFake_Renderer( void ) {}
-+
-+ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+ void destroyAllGeometryBuffers() {}
-+ CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+ void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+ void destroyAllTextureTargets() {}
-+ CEGUI::Texture& createTexture() { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+ void destroyTexture(CEGUI::Texture&) {}
-+ void destroyAllTextures() {}
-+ void beginRendering() {}
-+ void endRendering() {}
-+ void setDisplaySize(const CEGUI::Size&) {}
-+ const CEGUI::Size& getDisplaySize() const { return m_size; }
-+ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+ CEGUI::uint getMaxTextureSize() const { return 0; }
-+ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+ CEGUI::Size m_size;
-+ CEGUI::Vector2 m_dpi;
-+ CEGUI::String m_identifierString;
-+ cFake_GeometryBuffer m_geometry;
-+ cFake_Texture m_texture;
-+ cFake_RenderTarget m_target;
-+ CEGUI::RenderingRoot m_root;
- };
-
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-testing/smc/smc.desktop b/community-testing/smc/smc.desktop deleted file mode 100644 index 6cfe5b018..000000000 --- a/community-testing/smc/smc.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false
\ No newline at end of file diff --git a/community-testing/smc/smc.png b/community-testing/smc/smc.png Binary files differdeleted file mode 100644 index f02af1bfc..000000000 --- a/community-testing/smc/smc.png +++ /dev/null diff --git a/community-testing/soundkonverter/PKGBUILD b/community-testing/soundkonverter/PKGBUILD deleted file mode 100644 index 91d78cbfc..000000000 --- a/community-testing/soundkonverter/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 74664 2012-08-01 16:57:51Z andrea $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: Darwin Bautista <djclue917@gmail.com> - -pkgname=soundkonverter -pkgver=1.6.3 -pkgrel=2 -pkgdesc="Front-end to various audio converters" -arch=('i686' 'x86_64') -url="http://www.kde-apps.org/content/show.php?content=29024" -license=('GPL') -depends=('kdebase-runtime' 'libkcddb' 'cdparanoia' 'taglib') -makedepends=('automoc4' 'cmake') -optdepends=('cdrkit: cdda2wav backend' - 'faac: faac backend' - 'faad2: faad backend' - 'ffmpeg: ffmpeg backend' - 'flac: flac backend' - 'fluidsynth: flouidsynth backend' - 'lame: lame backend' - 'mac: mac backend' - 'mplayer: mplayer backend' - 'mp3gain: mp3gain backend' - 'speex: speexenc, speexdec backends' - 'timidity++: midi backend' - 'twolame: twolame backend' - 'vorbisgain: vorbisgain backend' - 'vorbis-tools: vorbis tools backend' - 'wavpack: wavpack backend') -install=$pkgname.install -source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz") -md5sums=('f617d9b73937d4576bc21fd359f4964b') - -build() { - cd "$srcdir"/$pkgname-$pkgver - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/soundkonverter/soundkonverter.install b/community-testing/soundkonverter/soundkonverter.install deleted file mode 100644 index 0e8feb79c..000000000 --- a/community-testing/soundkonverter/soundkonverter.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor &> /dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - diff --git a/community-testing/spring/PKGBUILD b/community-testing/spring/PKGBUILD deleted file mode 100644 index f7dae92f1..000000000 --- a/community-testing/spring/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 74522 2012-07-29 21:16:32Z ebelanger $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=spring -pkgver=0.89.0 -_pkgver=89.0 -pkgrel=2 -pkgdesc='A free 3D real-time-strategy (RTS) game engine' -arch=('i686' 'x86_64') -url="http://springrts.com/" -license=('GPL') -depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl' - 'libxcursor' 'curl' 'shared-mime-info' 'desktop-file-utils') -makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment') -optdepends=('python2: python-based bots' - 'java-runtime: java-based bots') -install=spring.install -source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma - boost-1.50.patch) -md5sums=('36fc266e925bc3790a68bf1bc7ebb315' - 'a3c3b4a53eeb499090b027fd6b3cf848') - -build() { - bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma - - cd spring_${_pkgver} - - sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h - patch -Np1 < "$srcdir/boost-1.50.patch" - - cmake . \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDATADIR=share/spring -DCMAKE_SKIP_RPATH:BOOL=YES - make -} - -package() { - cd spring_${_pkgver} - - make DESTDIR="$pkgdir" install - - install -d "$pkgdir/etc/spring" - echo '$HOME/.spring' > "$pkgdir/etc/spring/datadir" -} - -# vim sw=2:ts=2 et: diff --git a/community-testing/spring/boost-1.50.patch b/community-testing/spring/boost-1.50.patch deleted file mode 100644 index f8a8b5695..000000000 --- a/community-testing/spring/boost-1.50.patch +++ /dev/null @@ -1,2539 +0,0 @@ -diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp ---- spring_89.0/rts/Game/Camera/CameraController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -59,7 +59,7 @@ - bool CCameraController::GetUseDistToGroundForIcons() { - - const float3& dir = GetDir().UnsafeNormalize(); -- const float dot = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector)))); -+ const float dot = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector)))); - - if (dot < switchVal) { - // flat angle (typical for first person camera) -diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp ---- spring_89.0/rts/Game/Camera/FPSController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -80,9 +80,9 @@ - oldHeight = pos.y - gndHeight; - } - -- dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y)); -- dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y)); -- dir.y = (float)(sin(camera->rot.x)); -+ dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y)); -+ dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y)); -+ dir.y = (float)(math::sin(camera->rot.x)); - dir.ANormalize(); - } - -diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp ---- spring_89.0/rts/Game/Camera/FreeController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -51,9 +51,9 @@ - dir = float3(0.0f, -2.0f, -1.0f); - dir.ANormalize(); - if (camera) { -- const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z)); -- camera->rot.y = atan2(dir.x, dir.z); -- camera->rot.x = atan2(dir.y, hDist); -+ const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z)); -+ camera->rot.y = math::atan2(dir.x, dir.z); -+ camera->rot.x = math::atan2(dir.y, hDist); - } - pos -= (dir * 1000.0f); - -@@ -84,14 +84,14 @@ - - // lock the view direction to the target - const float3 diff(trackPos - pos); -- const float rads = atan2(diff.x, diff.z); -+ const float rads = math::atan2(diff.x, diff.z); - camera->rot.y = rads; - - const float len2D = diff.Length2D(); -- if (fabs(len2D) <= 0.001f) { -+ if (math::fabs(len2D) <= 0.001f) { - camera->rot.x = 0.0f; - } else { -- camera->rot.x = atan2((trackPos.y - pos.y), len2D); -+ camera->rot.x = math::atan2((trackPos.y - pos.y), len2D); - } - - camera->UpdateForward(); -@@ -130,11 +130,11 @@ - if (pos.y < (gndHeight + gndOffset + 1.0f)) { - float3 hDir; - hDir.y = 0.0f; -- hDir.x = (float)sin(camera->rot.y); -- hDir.z = (float)cos(camera->rot.y); -+ hDir.x = (float)math::sin(camera->rot.y); -+ hDir.z = (float)math::cos(camera->rot.y); - const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false); - const float dot = gndNormal.dot(hDir); -- const float gndRotX = (float)acos(dot) - (PI * 0.5f); -+ const float gndRotX = (float)math::acos(dot) - (PI * 0.5f); - const float rotXdiff = (gndRotX - camera->rot.x); - autoTiltVel = (autoTilt * rotXdiff); - } -@@ -214,8 +214,8 @@ - // convert the angular velocity into its positional change - const float3 diff2 = (pos - trackPos); - const float deltaRad = (avel.y * ft); -- const float cos_val = cos(deltaRad); -- const float sin_val = sin(deltaRad); -+ const float cos_val = math::cos(deltaRad); -+ const float sin_val = math::sin(deltaRad); - pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z)); - pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x)); - } -@@ -246,7 +246,7 @@ - if (pos.y < minHeight) { - pos.y = minHeight; - if (gndLock) { -- vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft)); -+ vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft)); - } else { - vel.y = 0.0f; - } -@@ -263,7 +263,7 @@ - camera->rot.x = -xRotLimit; - avel.x = 0.0f; - } -- camera->rot.y = fmod(camera->rot.y, PI * 2.0f); -+ camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f); - - // setup for the next loop - prevVel = vel; -@@ -277,9 +277,9 @@ - float3 CFreeController::GetDir() const - { - float3 dir; -- dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x)); -- dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x)); -- dir.y = (float)(sin(camera->rot.x)); -+ dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.y = (float)(math::sin(camera->rot.x)); - dir.ANormalize(); - return dir; - } -@@ -373,7 +373,7 @@ - if ((yDiff * dir.y) >= 0.0f) { - pos = float3(newPos.x, h, newPos.z); - } else { -- pos = target - (dir * fabs(yDiff / dir.y)); -+ pos = target - (dir * math::fabs(yDiff / dir.y)); - } // FIXME - /* - const float oldPosY = pos.y; -diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp ---- spring_89.0/rts/Game/Camera/OrbitController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -51,8 +51,8 @@ - const float3 w = (v / v.Length()); // do not normalize v in-place - - const float d = v.Length(); -- const float e = RAD2DEG(acos(v.Length2D() / d)); -- const float r = RAD2DEG(acos(w.x)); -+ const float e = RAD2DEG(math::acos(v.Length2D() / d)); -+ const float r = RAD2DEG(math::acos(w.x)); - - distance = cDistance = d; - elevation = cElevation = e; -@@ -251,12 +251,12 @@ - float tx = cx; - - tx = cx; -- cx = cx * cos(beta) + cy * sin(beta); -- cy = tx * sin(beta) + cy * cos(beta); -+ cx = cx * math::cos(beta) + cy * math::sin(beta); -+ cy = tx * math::sin(beta) + cy * math::cos(beta); - - tx = cx; -- cx = cx * cos(gamma) - cz * sin(gamma); -- cz = tx * sin(gamma) + cz * cos(gamma); -+ cx = cx * math::cos(gamma) - cz * math::sin(gamma); -+ cz = tx * math::sin(gamma) + cz * math::cos(gamma); - - return float3(cx, cy, cz); - } -diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp ---- spring_89.0/rts/Game/Camera/OverheadController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -52,7 +52,7 @@ - move.x = -move.x; - move.y = -move.y; - } -- move *= sqrt(move.z) * 200; -+ move *= math::sqrt(move.z) * 200; - - pos.x += move.x * pixelSize * 2.0f * scrollSpeed; - pos.z -= move.y * pixelSize * 2.0f * scrollSpeed; -diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp ---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -29,7 +29,7 @@ - - void CRotOverheadController::KeyMove(float3 move) - { -- move *= sqrt(move.z) * 400; -+ move *= math::sqrt(move.z) * 400; - - float3 flatForward = camera->forward; - if(camera->forward.y < -0.9f) -@@ -68,9 +68,9 @@ - - void CRotOverheadController::UpdateVectors() - { -- dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x)); -- dir.y=(float)(sin(camera->rot.x)); -- dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x)); -+ dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x)); -+ dir.y=(float)(math::sin(camera->rot.x)); -+ dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x)); - dir.ANormalize(); - - pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f); -diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp ---- spring_89.0/rts/Game/Camera/SmoothController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -55,7 +55,7 @@ - move.y = -move.y; - } - -- move *= sqrt(move.z) * 200.0f; -+ move *= math::sqrt(move.z) * 200.0f; - - const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed); - -@@ -103,7 +103,7 @@ - move.x = -move.x; - move.y = -move.y; - } -- move *= sqrt(move.z) * 200.0f; -+ move *= math::sqrt(move.z) * 200.0f; - - const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed); - -diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp ---- spring_89.0/rts/Game/Camera/TWController.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -35,7 +35,7 @@ - flatForward.y=0; - flatForward.ANormalize(); - -- move *= sqrt(move.z) * 200; -+ move *= math::sqrt(move.z) * 200; - pos += (camera->right * move.x + flatForward * move.y) * scrollSpeed; - UpdateVectors(); - } -@@ -79,9 +79,9 @@ - - camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f); - -- dir.x = sin(camera->rot.y) * cos(camera->rot.x); -- dir.y = sin(camera->rot.x); -- dir.z = cos(camera->rot.y) * cos(camera->rot.x); -+ dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x); -+ dir.y = math::sin(camera->rot.x); -+ dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x); - dir.ANormalize(); - } - -diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp ---- spring_89.0/rts/Game/Camera.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -89,7 +89,7 @@ - up.UnsafeANormalize(); - - const float aspect = globalRendering->aspectRatio; -- const float viewx = tan(aspect * halfFov); -+ const float viewx = math::tan(aspect * halfFov); - const float viewy = tanHalfFov; - - if (globalRendering->viewSizeY <= 0) { -@@ -218,9 +218,9 @@ - - void CCamera::UpdateForward() - { -- forward.z = cos(rot.y) * cos(rot.x); -- forward.x = sin(rot.y) * cos(rot.x); -- forward.y = sin(rot.x); -+ forward.z = math::cos(rot.y) * math::cos(rot.x); -+ forward.x = math::sin(rot.y) * math::cos(rot.x); -+ forward.y = math::sin(rot.x); - forward.Normalize(); - } - -@@ -229,7 +229,7 @@ - { - fov = myfov; - halfFov = (fov * 0.5f) * (PI / 180.f); -- tanHalfFov = tan(halfFov); -+ tanHalfFov = math::tan(halfFov); - } - - -@@ -330,7 +330,7 @@ - float3 pInt; - - // prevent DIV0 when calculating line.dir -- if (fabs(xdir.z) < 0.001f) -+ if (math::fabs(xdir.z) < 0.001f) - xdir.z = 0.001f; - - if (ydir.y != 0.0f) { -diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp ---- spring_89.0/rts/Game/CameraHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -139,7 +139,7 @@ - cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime)); - const float nextTime = cameraTimeLeft; - const float exp = cameraTimeExponent; -- const float ratio = 1.0f - (float)pow((nextTime / currTime), exp); -+ const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp); - - const float deltaFOV = wantedCamFOV - camera->GetFov(); - const float3 deltaPos = wantedCamPos - camera->pos; -diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp ---- spring_89.0/rts/Game/GameServer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp 2012-07-13 06:34:42.936060485 +0200 -@@ -253,7 +253,7 @@ - // Something in CGameServer::CGameServer borks the FPU control word - // maybe the threading, or something in CNet::InitServer() ?? - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - } - -diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp ---- spring_89.0/rts/Game/SelectedUnitsAI.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp 2012-07-13 06:34:43.086060494 +0200 -@@ -179,7 +179,7 @@ - const float3 sideDir = frontdir.cross(UpVector); - - // calculate so that the units form in an aproximate square -- float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f); -+ float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f); - - // push back some extra params so it confer with a front move - c.params.push_back(pos.x + (sideDir.x * length)); -diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp ---- spring_89.0/rts/Game/TraceRay.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -75,7 +75,7 @@ - if (closeFlatLength > length) - closeFlatLength = length; - -- if (fabs(linear - quadratic * closeFlatLength) < 0.15f) { -+ if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) { - // relatively flat region -> use approximation - dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength; - -diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp ---- spring_89.0/rts/Game/UI/EndGameBox.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -29,11 +29,11 @@ - - if (num == 0) { - sprintf(c, "0"); -- } else if (fabs(num) < 10 * mul) { -+ } else if (math::fabs(num) < 10 * mul) { - sprintf(c, "%.1f", num); -- } else if (fabs(num) < 10000 * mul) { -+ } else if (math::fabs(num) < 10000 * mul) { - sprintf(c, "%.0f", num); -- } else if (fabs(num) < 10000000 * mul) { -+ } else if (math::fabs(num) < 10000000 * mul) { - sprintf(c, "%.0fk", num / 1000); - } else { - sprintf(c, "%.0fM", num / 1000000); -@@ -165,7 +165,7 @@ - if (dispMode > 0 ) { - if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) && - (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) { -- int sel = (int) floor(-(my - box.y1 - 0.57f) * 50); -+ int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50); - - if (button == 1) { - stat1 = sel; -@@ -341,7 +341,7 @@ - - if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) && - (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) { -- const int sel = (int) floor(50 * -(my - box.y1 - 0.57f)); -+ const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f)); - - glColor4f(0.7f, 0.2f, 0.2f, guiAlpha); - glDisable(GL_TEXTURE_2D); -diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h ---- spring_89.0/rts/Game/UI/EndGameBox.h 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h 2012-07-13 06:34:43.066060493 +0200 -@@ -60,8 +60,8 @@ - if (team >= 0 && static_cast<size_t>(team) >= values.size()) { - values.resize(team + 1); - } -- if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) { -- maxdif = fabs(value-values[team].back()); -+ if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) { -+ maxdif = math::fabs(value-values[team].back()); - } - - values[team].push_back(value); -diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp ---- spring_89.0/rts/Game/UI/MouseCursor.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -355,7 +355,7 @@ - return; - } - -- animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod); -+ animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod); - - if (animTime < frames[currentFrame].startTime) { - currentFrame = 0; -diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp ---- spring_89.0/rts/Game/UI/ResourceBar.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -48,11 +48,11 @@ - - if (num == 0) - sprintf(c, "0"); -- if ( fabs(num) < (10 * mul)) { -+ if ( math::fabs(num) < (10 * mul)) { - sprintf(c, "%.1f", num); -- } else if (fabs(num) < (10000 * mul)) { -+ } else if (math::fabs(num) < (10000 * mul)) { - sprintf(c, "%.0f", num); -- } else if (fabs(num) < (10000000 * mul)) { -+ } else if (math::fabs(num) < (10000000 * mul)) { - sprintf(c, "%.0fk", num / 1000); - } else { - sprintf(c, "%.0fM", num / 1000000); -@@ -180,11 +180,11 @@ - - smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses - smallFont->glFormat(metalx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)", -- FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(), -- FloatToSmallString(fabs(myTeam->metalSent)).c_str()); -+ FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(), -+ FloatToSmallString(math::fabs(myTeam->metalSent)).c_str()); - smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)", -- FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(), -- FloatToSmallString(fabs(myTeam->energySent)).c_str()); -+ FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(), -+ FloatToSmallString(math::fabs(myTeam->energySent)).c_str()); - - smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income - smallFont->glFormat(metalx + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s", -diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp ---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -367,9 +367,9 @@ - camera->rot.x=-1; - - float3 wantedCamDir; -- wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x)); -- wantedCamDir.y=(float)(sin(camera->rot.x)); -- wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x)); -+ wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x)); -+ wantedCamDir.y=(float)(math::sin(camera->rot.x)); -+ wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x)); - wantedCamDir.ANormalize(); - - camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800); -diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp ---- spring_89.0/rts/Game/UI/UnitTracker.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -297,8 +297,8 @@ - modPlanePos.y = minHeight; - } - -- trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime)); -- trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime)); -+ trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime)); -+ trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime)); - trackDir.ANormalize(); - - camera->pos = trackPos; -diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h ---- spring_89.0/rts/lib/gml/gmlsrv.h 2012-07-10 00:10:09.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h 2012-07-13 06:34:43.209393834 +0200 -@@ -361,7 +361,7 @@ - if (gmlShareLists) { - ogc[thr]->WorkerThreadPost(); - } -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - while(dorun) { - gmlClientSub(); - } -@@ -452,7 +452,7 @@ - Threading::SetThreadName("sim"); - Watchdog::RegisterThread(WDT_SIM, true); - set_threadnum(GML_SIM_THREAD_NUM); -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - while(dorun) { - gmlClientAuxSub(); - } -diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp ---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp 2012-07-10 00:10:09.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp 2012-07-13 06:35:00.626061514 +0200 -@@ -12,10 +12,16 @@ - extern "C" { - #endif - -+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_ -+ #define SPRING_UTCTIME boost::TIME_UTC_ -+#else -+ #define SPRING_UTCTIME boost::TIME_UTC -+#endif -+ - int stub_sdl_getSystemMilliSeconds() { - - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, SPRING_UTCTIME); - const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000); - return milliSeconds; - } -@@ -23,7 +29,7 @@ - void stub_sdl_sleepMilliSeconds(int milliSeconds) { - - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, SPRING_UTCTIME); - t.nsec += 1000000 * milliSeconds; - boost::thread::sleep(t); - } -diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp ---- spring_89.0/rts/lib/streflop/streflopC.cpp 2012-07-10 00:10:10.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -9,16 +9,16 @@ - #endif - - void streflop_init_Simple() { -- streflop_init<Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void streflop_init_Double() { -- streflop_init<Double>(); -+ streflop::streflop_init<streflop::Double>(); - } - - #if defined(Extended) - void streflop_init_Extended() { -- streflop_init<Extended>(); -+ streflop::streflop_init<streflop::Extended>(); - } - #endif // defined(Extended) - -diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h ---- spring_89.0/rts/lib/streflop/streflop_cond.h 2012-07-10 00:10:10.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h 2012-07-13 06:34:42.906060483 +0200 -@@ -11,8 +11,6 @@ - - #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT) - #include "streflop.h" --using namespace streflop; -- - namespace math { - using namespace streflop; - } -@@ -20,6 +18,7 @@ - #include <cmath> - namespace math { - using std::fabs; -+ // We are using fastmath::sqrt_sse instead! - // using std::sqrt; - using std::sin; - using std::cos; -diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp ---- spring_89.0/rts/Map/BasicMapDamage.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -33,7 +33,7 @@ - - for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) { - const float r = a / float(CRATER_TABLE_SIZE); -- const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI)); -+ const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI)); - craterTable[a] = d; - } - -@@ -83,7 +83,7 @@ - const float* curHeightMap = readmap->GetCornerHeightMapSynced(); - const float* orgHeightMap = readmap->GetOriginalHeightMapSynced(); - const unsigned char* typeMap = readmap->GetTypeMapSynced(); -- const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness; -+ const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness; - const float invRadius = 1.0f / radius; - - for (int y = e->y1; y <= e->y2; ++y) { -@@ -111,7 +111,7 @@ - orgHeightMap[y * gs->mapxp1 + x]; - - if (prevDif * dif > 0.0f) { -- dif /= fabs(prevDif) * 0.1f + 1; -+ dif /= math::fabs(prevDif) * 0.1f + 1; - } - - e->squares.push_back(dif); -@@ -148,7 +148,7 @@ - orgHeightMap[z * gs->mapxp1 + x]; - - if (prevDif * dif > 0.0f) { -- dif /= fabs(prevDif) * 0.1f + 1; -+ dif /= math::fabs(prevDif) * 0.1f + 1; - } - - totalDif += dif; -diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp ---- spring_89.0/rts/Map/Ground.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp 2012-07-13 06:34:43.086060494 +0200 -@@ -433,8 +433,8 @@ - - float3 CGround::GetSmoothNormal(float x, float y, bool synced) const - { -- int sx = (int) floor(x / SQUARE_SIZE); -- int sy = (int) floor(y / SQUARE_SIZE); -+ int sx = (int) math::floor(x / SQUARE_SIZE); -+ int sy = (int) math::floor(y / SQUARE_SIZE); - - if (sy < 1) - sy = 1; -diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp ---- spring_89.0/rts/Map/SM3/Plane.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp 2012-07-13 06:34:43.066060493 +0200 -@@ -15,7 +15,7 @@ - a = ry1*rz2 - ry2*rz1; - b = rz1*rx2 - rz2*rx1; - c = rx1*ry2 - rx2*ry1; -- float len = (float)sqrt(a*a + b*b + c*c); -+ float len = (float)math::sqrt(a*a + b*b + c*c); - a /= len; - b /= len; - c /= len; -@@ -37,10 +37,10 @@ - bool Plane::EpsilonCompare(const Plane& pln, float epsilon) - { - Plane t; -- t.a = fabs(a - pln.a); -- t.b = fabs(b - pln.b); -- t.c = fabs(c - pln.c); -- t.d = fabs(d - pln.d); -+ t.a = math::fabs(a - pln.a); -+ t.b = math::fabs(b - pln.b); -+ t.c = math::fabs(c - pln.c); -+ t.d = math::fabs(d - pln.d); - if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) { - return false; - } -diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp ---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -197,7 +197,7 @@ - continue; - } - -- float len = sqrt(dx*dx + dy*dy); -+ float len = math::sqrt(dx*dx + dy*dy); - const float step = 5.0f; - float invLength2d = step / len; - dx *= invLength2d; -diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp ---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -248,7 +248,7 @@ - } - - // flatness=dotproduct of surface normal with up vector -- float slope = 1.0f - fabs(norm_y); -+ float slope = 1.0f - math::fabs(norm_y); - - if (slope < gi->minSlope - gi->minSlopeFuzzy) { - bm->at(x,y) = 0.0f; -@@ -307,7 +307,7 @@ - Vector3 n; - - if (sx*sx + sy*sy < 32*32) { -- const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy)); -+ const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy)); - n = Vector3(sx, sy, sz); - n.ANormalize(); - } -diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp ---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -99,7 +99,7 @@ - const int minz = bty * smfReadMap->bigTexSize; - const int maxz = minz + smfReadMap->bigTexSize; - const float miny = readmap->currMinHeight; -- const float maxy = fabs(cam->pos.y); -+ const float maxy = math::fabs(cam->pos.y); - - const float3 mins( 0, miny, minz); - const float3 maxs(smfReadMap->mapSizeX, maxy, maxz); -diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp ---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -405,7 +405,7 @@ - - // Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height. - // Use values passed on the stack instead of re-accessing the Height Field. -- float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2)); -+ float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2)); - - if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0) - myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy -diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp ---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -385,7 +385,7 @@ - smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB); - smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1); - smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1); -- smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0); -+ smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0); - smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1); - smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB); - smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1); -diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp ---- spring_89.0/rts/Rendering/Env/AdvSky.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -65,8 +65,8 @@ - memset(thicknessTransform, 0, 1024); - memset(covers, 0, 4 * 32 * sizeof(float)); - -- domeheight = cos(PI / 16) * 1.01f; -- domeWidth = sin(2 * PI / 32) * 400 * 1.7f; -+ domeheight = math::cos(PI / 16) * 1.01f; -+ domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f; - - UpdateSkyDir(); - InitSun(); -@@ -383,7 +383,7 @@ - case 0: { - for(int a=0; a<CLOUD_DETAIL; a++) { - float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a))); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - if(fade>1) { - fade = 2 - fade; - if(!cloudDown[a]) { -@@ -417,11 +417,11 @@ - int qcda=(4<<CLOUD_DETAIL)>>a; - int *pkernel=kernel; - for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) { -- float ydist=fabs(1.0f+y-cs8a)/cs8a; -+ float ydist=math::fabs(1.0f+y-cs8a)/cs8a; - ydist=ydist*ydist*(3-2*ydist); - int *pkrn=pkernel; - for(int x=0; x<cs4a; ++x) { -- float xdist=fabs(1.0f+x-cs8a)/cs8a; -+ float xdist=math::fabs(1.0f+x-cs8a)/cs8a; - xdist=xdist*xdist*(3-2*xdist); - - float contrib=(1-xdist)*(1-ydist); -@@ -533,7 +533,7 @@ - unsigned char *tt=thicknessTransform; - for(int a=0;a<1024;++a){ - float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f; -- float alpha=pow(f*2,3); -+ float alpha=math::pow(f*2,3); - if(alpha>1) - alpha=1; - *at=(int) (alpha*255); -@@ -560,11 +560,11 @@ - - float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256; - float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f; -- int baseY=int(floor(fy))&CLOUD_MASK; -- fy-=floor(fy); -+ int baseY=int(math::floor(fy))&CLOUD_MASK; -+ fy-=math::floor(fy); - float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f; -- int baseX=int(floor(fx))&CLOUD_MASK; -- fx-=floor(fx); -+ int baseX=int(math::floor(fx))&CLOUD_MASK; -+ fx-=math::floor(fx); - - float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3]; - if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){ -@@ -622,8 +622,8 @@ - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - glBegin(GL_TRIANGLE_STRIP); - for(int x=0;x<257;++x){ -- float dx = sin(x*2*PI/256.0f); -- float dy = cos(x*2*PI/256.0f); -+ float dx = math::sin(x*2*PI/256.0f); -+ float dy = math::cos(x*2*PI/256.0f); - - glTexCoord2f(x/256.0f,0.125f); - glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f); -@@ -646,7 +646,7 @@ - mem[(y*128+x)*4+0]=255; - mem[(y*128+x)*4+1]=255; - mem[(y*128+x)*4+2]=255; -- float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); -+ float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); - if(dist>60) - mem[(y*128+x)*4+3]=0; - else -@@ -749,7 +749,7 @@ - - for(int a=0;a<5;++a){ - float fade = gs->frameNum / float(30<<a); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - int size = std::min(32,256>>a); - - if(fade>1){ -@@ -770,7 +770,7 @@ - - } - float tSize = std::max(1,8>>a); -- float c = pow(2.0f,a)*6/255.0f; -+ float c = math::pow(2.0f,a)*6/255.0f; - CVertexArray* va = GetVertexArray(); - va->Initialize(); - va->CheckInitSize(4*VA_SIZE_T); -@@ -867,10 +867,10 @@ - - const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z); - const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle; -- const float fy = asin(hdist / 400); -+ const float fy = math::asin(hdist / 400); - -- dir.x = hdist * cos(ang); -- dir.z = hdist * sin(ang); -+ dir.x = hdist * math::cos(ang); -+ dir.z = hdist * math::sin(ang); - dir.y = (fastmath::cos(fy) - domeheight) * 400; - - dir.ANormalize(); -@@ -903,7 +903,7 @@ - const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f); - - const float sunInt = skyLight->GetLightIntensity(); -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50; - const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist)); - - const float green = std::min(1.0f, (0.55f + sunMod)); -@@ -918,7 +918,7 @@ - void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) { - const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f); - -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70; - const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist); - - const float red = std::min(skyColor.x + sunMod * sunColor.x, 1.0f); -diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp ---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -229,7 +229,7 @@ - std::list<FallingTree>::iterator prev = fti++; - fallingTrees.erase(prev); - } else { -- fti->speed += (sin(fti->fallPos) * 0.04f); -+ fti->speed += (math::sin(fti->fallPos) * 0.04f); - ++fti; - } - } -@@ -616,7 +616,7 @@ - if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) { - const float ang = fti->fallPos * PI; - -- const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang)); -+ const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang)); - const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize()); - const float3 xvec(yvec.cross(zvec)); - -@@ -957,7 +957,7 @@ - if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) { - const float ang = fti->fallPos * PI; - -- const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang)); -+ const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang)); - const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize()); - const float3 xvec(zvec.cross(yvec)); - -diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp ---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -159,9 +159,9 @@ - int numIter=(int)max(3.0f,size*10); - for(int a=0;a<=numIter;a++){ - float angle=a/(float)numIter*2*PI; -- float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f; -- barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col)); -- barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col)); -+ float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f; -+ barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col)); -+ barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col)); - } - barkva->EndStrip(); - } -@@ -176,18 +176,18 @@ - - for (int a = 0; a < numBranch; ++a) { - const float angle = baseAngle + (a * 3.88f) + fRand(0.5f); -- float3 dir = orto1 * sin(angle) + orto2 * cos(angle); -+ float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle); - dir.y = 0.3f + fRand(0.4f); - dir.ANormalize(); - const float3 start(0, (a + 5) * height / (numBranch + 5), 0); -- const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch); -+ const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch); - - TrunkIterator(start, dir, length, length * 0.05f, 1); - } - - for (int a = 0; a < 3; ++a) { - const float angle = (a * 3.88f) + fRand(0.5f); -- float3 dir = orto1*sin(angle)+orto2*cos(angle); -+ float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle); - dir.y = 0.8f; - dir.ANormalize(); - const float3 start(0, height - 0.3f, 0); -@@ -225,7 +225,7 @@ - const float newLength = length * (float(numTrunks - a) / (numTrunks + 1)); - - float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1)); -- float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif; -+ float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif; - newDir.ANormalize(); - - TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1); -@@ -245,8 +245,8 @@ - - float3 pos = start + dir * length * (0.7f + fRand(0.3f)); - pos += -- (orto1 * sin(angle) + orto2 * cos(angle)) * -- (sqrt((float) a + 1) * 0.6f + fRand(0.4f)) * -+ (orto1 * math::sin(angle) + orto2 * math::cos(angle)) * -+ (math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) * - 0.1f * MAX_TREE_HEIGHT; - - if (pos.y < 0.2f * MAX_TREE_HEIGHT) -@@ -538,12 +538,12 @@ - float baseAngle=fRand(2*PI); - for(int a=0;a<numBranch;++a){ - float sh = 0.2f + fRand(0.2f); -- float h = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f); -+ float h = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f); - float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI; -- float3 dir(orto1 * sin(angle) + orto2 * cos(angle)); -+ float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle)); - dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f)); - dir.ANormalize(); -- float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT; -+ float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT; - DrawPineBranch(float3(0,h,0),dir,size); - } - //create the top -@@ -569,16 +569,16 @@ - for(int a=0;a<numIter;a++){ - float angle=a/(float)numIter*2*PI; - float angle2=(a+1)/(float)numIter*2*PI; -- float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f; -- float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f; -+ float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f; -+ float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f; - -- va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size, angle/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col)); -- va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -- va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -- -- va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -- va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -- va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2)); -+ va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size, angle/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col)); -+ va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -+ va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -+ -+ va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size, angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2)); -+ va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f, angle/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col)); -+ va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2)); - } - } - -diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp ---- spring_89.0/rts/Rendering/Env/AdvWater.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -48,7 +48,7 @@ - for (int y = 0; y < 64; ++y) { - for (int x = 0; x < 64; ++x) { - scrap[(y*64 + x)*4 + 0] = 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128); -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128); - scrap[(y*64 + x)*4 + 2] = 0; - scrap[(y*64 + x)*4 + 3] = 255; - } -@@ -62,8 +62,8 @@ - for (int x = 0; x < 64; ++x) { - const float ang = 26.5f*PI/180.0f; - const float pos = y*2+x; -- scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128; -+ scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128; -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128; - } - } - glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]); -@@ -75,8 +75,8 @@ - for (int x = 0; x < 64; ++x) { - const float ang = -19*PI/180.0f; - const float pos = 3*y - x; -- scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128; -- scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128; -+ scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128; -+ scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128; - } - } - glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]); -@@ -192,14 +192,14 @@ - dir = xbase + dv; - dir.ANormalize(); - zpos = camera->pos + dir*(camera->pos.y / -dir.y); -- zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; -+ zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; - col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255); - va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col); - - dir = xbase; - dir.ANormalize(); - zpos = camera->pos + dir*(camera->pos.y / -dir.y); -- zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; -+ zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f; - col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255); - va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col); - -diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp ---- spring_89.0/rts/Rendering/Env/BasicSky.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -67,8 +67,8 @@ - rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE); - blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32); - -- domeheight=cos(PI/16)*1.01f; -- domeWidth=sin(PI/16)*400*1.7f; -+ domeheight=math::cos(PI/16)*1.01f; -+ domeWidth=math::sin(PI/16)*400*1.7f; - - UpdateSkyDir(); - InitSun(); -@@ -369,7 +369,7 @@ - case 0: { - for(int a=0; a<CLOUD_DETAIL; a++) { - float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a))); -- fade -= floor(fade/2)*2; -+ fade -= math::floor(fade/2)*2; - if(fade>1) { - fade = 2 - fade; - if(!cloudDown[a]) { -@@ -403,11 +403,11 @@ - int qcda=(4<<CLOUD_DETAIL)>>a; - int *pkernel=kernel; - for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) { -- float ydist=fabs(1.0f+y-cs8a)/cs8a; -+ float ydist=math::fabs(1.0f+y-cs8a)/cs8a; - ydist=ydist*ydist*(3-2*ydist); - int *pkrn=pkernel; - for(int x=0; x<cs4a; ++x) { -- float xdist=fabs(1.0f+x-cs8a)/cs8a; -+ float xdist=math::fabs(1.0f+x-cs8a)/cs8a; - xdist=xdist*xdist*(3-2*xdist); - - float contrib=(1-xdist)*(1-ydist); -@@ -506,7 +506,7 @@ - unsigned char *tt=thicknessTransform; - for(int a=0;a<1024;++a){ - float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f; -- float alpha=pow(f*2,3); -+ float alpha=math::pow(f*2,3); - if(alpha>1) - alpha=1; - *at=(unsigned char)(alpha*255); -@@ -533,11 +533,11 @@ - - float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256; - float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f; -- int baseY=int(floor(fy))&CLOUD_MASK; -- fy-=floor(fy); -+ int baseY=int(math::floor(fy))&CLOUD_MASK; -+ fy-=math::floor(fy); - float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f; -- int baseX=int(floor(fx))&CLOUD_MASK; -- fx-=floor(fx); -+ int baseX=int(math::floor(fx))&CLOUD_MASK; -+ fx-=math::floor(fx); - - float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3]; - if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){ -@@ -589,8 +589,8 @@ - glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE); - glBegin(GL_TRIANGLE_STRIP); - for(int x=0;x<257;++x){ -- float dx=sin(x*2*PI/256.0f); -- float dy=cos(x*2*PI/256.0f); -+ float dx=math::sin(x*2*PI/256.0f); -+ float dy=math::cos(x*2*PI/256.0f); - - glTexCoord2f(x/256.0f,0.25f); - glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f); -@@ -613,7 +613,7 @@ - mem[(y*128+x)*4+0]=255; - mem[(y*128+x)*4+1]=255; - mem[(y*128+x)*4+2]=255; -- float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); -+ float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64)); - if(dist>60) - mem[(y*128+x)*4+3]=0; - else -@@ -764,10 +764,10 @@ - - const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z); - const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle; -- const float fy = asin(hdist / 400); -+ const float fy = math::asin(hdist / 400); - -- dir.x = hdist * cos(ang); -- dir.z = hdist * sin(ang); -+ dir.x = hdist * math::cos(ang); -+ dir.z = hdist * math::sin(ang); - dir.y = (fastmath::cos(fy) - domeheight) * 400; - - dir.ANormalize(); -@@ -800,7 +800,7 @@ - const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f); - - const float sunInt = skyLight->GetLightIntensity(); -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50; - const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist); - - const float green = std::min(1.0f, (0.55f + sunMod)); -@@ -814,7 +814,7 @@ - void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) { - const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f); - -- const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70; -+ const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70; - const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist); - - const float red = std::min(skyColor.x + sunMod * sunColor.x, 1.0f); -diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp ---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -269,7 +269,7 @@ - for (int x = 0; x < size; ++x) { - const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize(); - const float dot = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir())); -- const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f); -+ const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f); - - buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255); - buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255); -diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp ---- spring_89.0/rts/Rendering/Env/DynWater.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -88,9 +88,9 @@ - - for (int y = 0; y < 64; ++y) { - for (int x = 0; x < 64; ++x) { -- temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f; -+ temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f; - temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0]; -- temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f; -+ temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f; - temp[(y*64 + x)*4 + 3] = 0; - } - } -@@ -197,7 +197,7 @@ - const float dy = y - 31.5f; - for (int x = 0; x < 64; ++x) { - const float dx = x-31.5f; -- const float dist = sqrt(dx*dx + dy*dy); -+ const float dist = math::sqrt(dx*dx + dy*dy); - temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f); - temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f); - temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f); -@@ -425,8 +425,8 @@ - - oldCamPosBig = camPosBig; - -- camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -- camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); - - glDisable(GL_DEPTH_TEST); - glDepthMask(0); -@@ -835,8 +835,8 @@ - va = GetVertexArray(); - va->Initialize(); - -- camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -- camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16); -+ camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16); - - // FIXME: - // 1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty -@@ -1132,8 +1132,8 @@ - // hovercraft - const float3& pos = unit->pos; - -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -- (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -+ (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -@@ -1144,7 +1144,7 @@ - if ((pos.y > -4.0f) && (pos.y < 4.0f)) { - const float3 frontAdd = unit->frontdir * unit->radius * 0.75f; - const float3 sideAdd = unit->rightdir * unit->radius * 0.75f; -- const float depth = sqrt(sqrt(unit->mass)) * 0.4f; -+ const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f; - const float3 n(depth, 0.05f * depth, depth); - - va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n); -@@ -1156,8 +1156,8 @@ - // surface ship - const float3& pos = unit->pos; - -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -- (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) || -+ (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -@@ -1171,7 +1171,7 @@ - - const float3 frontAdd = unit->frontdir * unit->radius * 0.75f; - const float3 sideAdd = unit->rightdir * unit->radius * 0.18f; -- const float depth = sqrt(sqrt(unit->mass)); -+ const float depth = math::sqrt(math::sqrt(unit->mass)); - const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth); - - va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n); -@@ -1249,8 +1249,8 @@ - for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) { - Explosion& explo = *ei; - float3 pos = explo.pos; -- if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) -- || (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) -+ if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) -+ || (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50))) - { - continue; - } -diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp ---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -75,11 +75,11 @@ - } - - // TODO: get rid of the magic constants -- maxGrassDist = 800 + sqrt((float) detail) * 240; -+ maxGrassDist = 800 + math::sqrt((float) detail) * 240; - maxDetailedDist = 146 + detail * 24; - detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1; - numTurfs = 3 + int(detail * 0.5f); -- strawPerTurf = 50 + int(sqrt((float) detail) * 10); -+ strawPerTurf = 50 + int(math::sqrt((float) detail) * 10); - - blocksX = gs->mapx / grassSquareSize /grassBlockSize; - blocksY = gs->mapy / grassSquareSize / grassBlockSize; -@@ -641,7 +641,7 @@ - const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize(); - const float3 billboardDirY = billboardDirX.cross(billboardDirZ); - -- const float ang = acos(billboardDirZ.y); -+ const float ang = math::acos(billboardDirZ.y); - const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30)))); - - if (globalRendering->haveGLSL) { -@@ -673,7 +673,7 @@ - const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize(); - const float3 billboardDirY = billboardDirX.cross(billboardDirZ); - -- const float ang = acos(billboardDirZ.y); -+ const float ang = math::acos(billboardDirZ.y); - const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30)))); - - if (globalRendering->haveGLSL) { -@@ -820,7 +820,7 @@ - float3 forwardVect = sideVect.cross(UpVector); - sideVect *= mapInfo->grass.bladeWidth; - -- const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length; -+ const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length; - float3 basePos(30.0f, 0.0f, 30.0f); - - while (basePos.SqLength2D() > (turfSize * turfSize / 4)) { -@@ -837,10 +837,10 @@ - - const float3 edgePosL = - -sideVect * (1 - h) + -- (UpVector * cos(ang) + forwardVect * sin(ang)) * length * h; -+ (UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h; - const float3 edgePosR = - sideVect * (1.0f - h) + -- (UpVector * cos(ang) + forwardVect * sin(ang)) * length * h; -+ (UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h; - - if (b == 0) { - va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h); -diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp ---- spring_89.0/rts/Rendering/Env/SkyLight.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -72,7 +72,7 @@ - bool DynamicSkyLight::SetLightDir(const float4& newLightDir) { - if (newLightDir != lightDir) { - static float4 lastUpdate = ZeroVector; -- static const float minCosAngle = cos(1.5f * (PI/180.f)); -+ static const float minCosAngle = math::cos(1.5f * (PI/180.f)); - - if (lastUpdate.dot(newLightDir) < minCosAngle) { - lastUpdate = newLightDir; -@@ -92,7 +92,7 @@ - const float angularVelocity = 2.0f * PI / sunOrbitTime; - - const float sunAng = startAngle - initialSunAngle - angularVelocity * gameSeconds; -- const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng))); -+ const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng))); - - return sunPos; - } -@@ -108,18 +108,18 @@ - if (newLightDir.w == FLT_MAX) { - // old: newLightDir is position where sun reaches highest altitude - const float sunLen = newLightDir.Length2D(); -- const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen); -- const float sunHeight = tan(sunAzimuth - 0.001f); -+ const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen); -+ const float sunHeight = math::tan(sunAzimuth - 0.001f); - -- float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle)); -+ float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle)); - v1.ANormalize(); - - if (v1.y <= orbitMinSunHeight) { - newLightDir = UpVector; - sunOrbitHeight = v1.y; -- sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); -+ sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); - } else { -- float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI)); -+ float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI)); - v2.ANormalize(); - float3 v3 = v2 - v1; - sunOrbitRad = v3.Length() / 2.0f; -@@ -137,7 +137,7 @@ - } else { - // new: newLightDir is center position of orbit, and newLightDir.w is orbit height - sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f)); -- sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); -+ sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight); - } - - sunRotation.LoadIdentity(); -diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp ---- spring_89.0/rts/Rendering/GL/glExtra.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -83,7 +83,7 @@ - float adjustment = rad/2; - float ydiff = 0; - int j; -- for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){ -+ for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){ - if(adjRadius > rad) { - rad += adjustment; - } else { -@@ -93,7 +93,7 @@ - pos.x = center.x + (sinR * rad); - pos.z = center.z + (cosR * rad); - float newY = ground->GetHeightAboveWater(pos.x, pos.z, false); -- ydiff = fabs(pos.y - newY); -+ ydiff = math::fabs(pos.y - newY); - pos.y = newY; - heightDiff = (pos.y - center.y); - adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad; -diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp ---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp 2012-07-13 06:34:43.082727161 +0200 -@@ -963,7 +963,7 @@ - radius = damage * 0.25f; - - if (damage > 400) -- damage = 400 + sqrt(damage - 399); -+ damage = 400 + math::sqrt(damage - 399); - - pos.ClampInBounds(); - -diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp ---- spring_89.0/rts/Rendering/InMapDrawView.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -38,7 +38,7 @@ - for (int y = 0; y < 64; y++) { - // circular thingy - for (int x = 0; x < 64; x++) { -- float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32)); -+ float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32)); - if (dist > 31.0f) { - // do nothing - leave transparent - } else if (dist > 30.0f) { -diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp ---- spring_89.0/rts/Rendering/LineDrawer.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -29,7 +29,7 @@ - void CLineDrawer::UpdateLineStipple() - { - stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed()); -- stippleTimer = fmod(stippleTimer, (16.0f / 20.0f)); -+ stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f)); - } - - -diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp ---- spring_89.0/rts/Rendering/Models/S3OParser.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -319,7 +319,7 @@ - float3& t = tTangents[vrtIdx]; - int h = 1; - -- if (isnan(n.x) || isnan(n.y) || isnan(n.z)) { -+ if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) { - n = float3(0.0f, 0.0f, 1.0f); - } - if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); } -diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp ---- spring_89.0/rts/Sim/Misc/LosMap.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -182,7 +182,7 @@ - - y = (int)i; - x = 1; -- y = (int) (sqrt((float)r2 - 1) + 0.5f); -+ y = (int) (math::sqrt((float)r2 - 1) + 0.5f); - while (x < y) { - if(!PaintTable[x+y*Radius]) { - DrawLine(PaintTable, x, y, Radius); -@@ -198,7 +198,7 @@ - } - - x += 1; -- y = (int) (sqrt((float)r2 - x*x) + 0.5f); -+ y = (int) (math::sqrt((float)r2 - x*x) + 0.5f); - } - if (x == y) { - if(!PaintTable[x+y*Radius]) { -diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp ---- spring_89.0/rts/Sim/Misc/QuadField.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -329,12 +329,12 @@ - float zp = start.z; - const float invQuadSize = 1.0f / QUAD_SIZE; - -- if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) && -- (floor(start.z * invQuadSize) == floor(to.z * invQuadSize))) -+ if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) && -+ (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize))) - { - *endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX); - ++endQuad; -- } else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) { -+ } else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) { - const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX); - const int last = (int)(to.x * invQuadSize) + ((int)(to.z * invQuadSize) * numQuadsX); - -@@ -347,7 +347,7 @@ - *endQuad = a; ++endQuad; - } - } -- } else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) { -+ } else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) { - const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX); - const int last = (int)(to.x * invQuadSize) + ((int)(to.z * invQuadSize) * numQuadsX); - -@@ -369,14 +369,14 @@ - ++endQuad; - - if (dx > 0) { -- xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx; -+ xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx; - } else { -- xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx; -+ xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx; - } - if (dz > 0) { -- zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz; -+ zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz; - } else { -- zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz; -+ zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz; - } - - if (xn < zn) { -@@ -388,8 +388,8 @@ - } - - keepgoing = -- (fabs(xp - start.x) < fabs(to.x - start.x)) && -- (fabs(zp - start.z) < fabs(to.z - start.z)); -+ (math::fabs(xp - start.x) < math::fabs(to.x - start.x)) && -+ (math::fabs(zp - start.z) < math::fabs(to.z - start.z)); - } - } - -diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp 2012-07-13 06:34:43.256060504 +0200 -@@ -386,7 +386,7 @@ - - const float dif = wSpeed - currentSpeed; - -- if (fabs(dif) < 0.05f) { -+ if (math::fabs(dif) < 0.05f) { - deltaSpeed = dif * 0.125f; - nextDeltaSpeedUpdate = gs->frameNum + 8; - } else if (dif > 0.0f) { -@@ -529,7 +529,7 @@ - skidRotSpeed = 0.0f; - owner->physicalState = oldPhysState; - owner->moveType->useHeading = true; -- float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f); -+ float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f); - skidRotSpeed2 = (rp - skidRotPos2) * 0.5f; - ChangeHeading(owner->heading); - } else { -@@ -545,10 +545,10 @@ - } - - float remTime=speedf/speedReduction-1; -- float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f); -+ float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f); - skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1); - -- if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){ -+ if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){ - skidRotPos2=0; - skidRotSpeed2=0; - } -@@ -571,7 +571,7 @@ - speed*=0.95f; - } - else { -- speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f; -+ speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f; - speed*=.8; - } - } -@@ -625,7 +625,7 @@ - float totRad = owner->radius + u->radius; - - if (sqDist < totRad * totRad && sqDist != 0) { -- float dist = sqrt(sqDist); -+ float dist = math::sqrt(sqDist); - float3 dif = midPos - u->midPos; - dif /= std::max(dist, 1.f); - -@@ -682,7 +682,7 @@ - float sqDist=(midPos-u->midPos).SqLength(); - float totRad=owner->radius+u->radius; - if(sqDist<totRad*totRad && sqDist!=0){ -- float dist=sqrt(sqDist); -+ float dist=math::sqrt(sqDist); - float3 dif=midPos-u->midPos; - dif/=std::max(dist, 1.f); - float impactSpeed = -owner->speed.dot(dif); -@@ -721,8 +721,8 @@ - - skidRotPos2 += skidRotSpeed2; - -- float cosp = cos(skidRotPos2 * PI * 2.0f); -- float sinp = sin(skidRotPos2 * PI * 2.0f); -+ float cosp = math::cos(skidRotPos2 * PI * 2.0f); -+ float sinp = math::sin(skidRotPos2 * PI * 2.0f); - - float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir); - float3 f2 = owner->frontdir - f1; -@@ -812,7 +812,7 @@ - float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid); - - if (objectToUnit.dot(avoidanceDir) < radiusSum && -- fabs(objectDistToAvoidDirCenter) < radiusSum && -+ math::fabs(objectDistToAvoidDirCenter) < radiusSum && - (o->moveDef || Distance2D(owner, o) >= 0)) { - - if (objectDistToAvoidDirCenter > 0.0f) { -@@ -824,7 +824,7 @@ - rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f)); - } else { - avoidLeft += -- (radiusSum - fabs(objectDistToAvoidDirCenter)) * -+ (radiusSum - math::fabs(objectDistToAvoidDirCenter)) * - AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq); - avoidanceDir -= (rightOfAvoid * avoidLeft); - avoidanceDir.Normalize(); -@@ -952,7 +952,7 @@ - if (!decRate) { - return 0.0f; - } -- return fabs(speed*speed / decRate); -+ return math::fabs(speed*speed / decRate); - } - - float3 CClassicGroundMoveType::Here() -@@ -1043,7 +1043,7 @@ - const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE; - const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE; - -- if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) { -+ if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) { - if (newmp.y < owner->mapPos.y) { - haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1, zmove - 3.99f, owner->mapPos.y); - newmp = owner->GetMapPos(); -@@ -1261,20 +1261,20 @@ - float xp = start.x; - float zp = start.z; - -- if (floor(start.x) == floor(to.x)) { -+ if (math::floor(start.x) == math::floor(to.x)) { - if (dz > 0.0f) { -- for (int a = 1; a < floor(to.z); ++a) -+ for (int a = 1; a < math::floor(to.z); ++a) - lineTable[yt][xt].push_back(int2(0, a)); - } else { -- for (int a = -1; a > floor(to.z); --a) -+ for (int a = -1; a > math::floor(to.z); --a) - lineTable[yt][xt].push_back(int2(0, a)); - } -- } else if (floor(start.z) == floor(to.z)) { -+ } else if (math::floor(start.z) == math::floor(to.z)) { - if (dx > 0.0f) { -- for (int a = 1; a < floor(to.x); ++a) -+ for (int a = 1; a < math::floor(to.x); ++a) - lineTable[yt][xt].push_back(int2(a, 0)); - } else { -- for (int a = -1; a > floor(to.x); --a) -+ for (int a = -1; a > math::floor(to.x); --a) - lineTable[yt][xt].push_back(int2(a, 0)); - } - } else { -@@ -1283,14 +1283,14 @@ - - while (keepgoing) { - if (dx > 0.0f) { -- xn = (floor(xp) + 1.0f - xp) / dx; -+ xn = (math::floor(xp) + 1.0f - xp) / dx; - } else { -- xn = (floor(xp) - xp) / dx; -+ xn = (math::floor(xp) - xp) / dx; - } - if (dz > 0.0f) { -- zn = (floor(zp) + 1.0f - zp) / dz; -+ zn = (math::floor(zp) + 1.0f - zp) / dz; - } else { -- zn = (floor(zp) - zp) / dz; -+ zn = (math::floor(zp) - zp) / dz; - } - - if (xn < zn) { -@@ -1302,10 +1302,10 @@ - } - - keepgoing = -- fabs(xp - start.x) < fabs(to.x - start.x) && -- fabs(zp - start.z) < fabs(to.z - start.z); -+ math::fabs(xp - start.x) < math::fabs(to.x - start.x) && -+ math::fabs(zp - start.z) < math::fabs(to.z - start.z); - -- lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) ); -+ lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) ); - } - - lineTable[yt][xt].pop_back(); -@@ -1335,7 +1335,7 @@ - const MoveDef& md = *(owner->unitDef->moveDef); - const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2); - -- if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) { -+ if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) { - if (newMoveSquareX > moveSquareX) { - const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2); - if (cmod > 0.01f && nmod <= 0.01f) { -diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp 2012-07-13 06:34:43.249393836 +0200 -@@ -1808,20 +1808,20 @@ - float xp = start.x; - float zp = start.z; - -- if (floor(start.x) == floor(to.x)) { -+ if (math::floor(start.x) == math::floor(to.x)) { - if (dz > 0.0f) { -- for (int a = 1; a <= floor(to.z); ++a) -+ for (int a = 1; a <= math::floor(to.z); ++a) - lineTable[yt][xt].push_back(int2(0, a)); - } else { -- for (int a = -1; a >= floor(to.z); --a) -+ for (int a = -1; a >= math::floor(to.z); --a) - lineTable[yt][xt].push_back(int2(0, a)); - } -- } else if (floor(start.z) == floor(to.z)) { -+ } else if (math::floor(start.z) == math::floor(to.z)) { - if (dx > 0.0f) { -- for (int a = 1; a <= floor(to.x); ++a) -+ for (int a = 1; a <= math::floor(to.x); ++a) - lineTable[yt][xt].push_back(int2(a, 0)); - } else { -- for (int a = -1; a >= floor(to.x); --a) -+ for (int a = -1; a >= math::floor(to.x); --a) - lineTable[yt][xt].push_back(int2(a, 0)); - } - } else { -@@ -1830,14 +1830,14 @@ - - while (keepgoing) { - if (dx > 0.0f) { -- xn = (floor(xp) + 1.0f - xp) / dx; -+ xn = (math::floor(xp) + 1.0f - xp) / dx; - } else { -- xn = (floor(xp) - xp) / dx; -+ xn = (math::floor(xp) - xp) / dx; - } - if (dz > 0.0f) { -- zn = (floor(zp) + 1.0f - zp) / dz; -+ zn = (math::floor(zp) + 1.0f - zp) / dz; - } else { -- zn = (floor(zp) - zp) / dz; -+ zn = (math::floor(zp) - zp) / dz; - } - - if (xn < zn) { -@@ -1851,7 +1851,7 @@ - keepgoing = - math::fabs(xp - start.x) <= math::fabs(to.x - start.x) && - math::fabs(zp - start.z) <= math::fabs(to.z - start.z); -- int2 pt(int(floor(xp)), int(floor(zp))); -+ int2 pt(int(math::floor(xp)), int(math::floor(zp))); - - static const int MIN_IDX = -int(LINETABLE_SIZE / 2); - static const int MAX_IDX = -MIN_IDX; -diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -325,7 +325,7 @@ - { - #define NOZERO(x) std::max(x, 0.0001f) - -- const float driftSpeed = fabs(owner->unitDef->dlHoverFactor); -+ const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor); - float3 deltaVec = goalPos - owner->pos; - float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z); - float l = NOZERO(deltaDir.Length2D()); -@@ -342,7 +342,7 @@ - deltaDir -= owner->speed; - l = deltaDir.SqLength2D(); - if (l > (maxSpeed * maxSpeed)) { -- deltaDir *= maxSpeed / NOZERO(sqrt(l)); -+ deltaDir *= maxSpeed / NOZERO(math::sqrt(l)); - } - wantedSpeed = owner->speed + deltaDir; - -diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp ---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -412,7 +412,7 @@ - } - } - -- if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) { -+ if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) { - elevator = 1; - } - UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir); -@@ -528,13 +528,13 @@ - if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f) - maneuver = 1; - -- if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) { -+ if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) { - maneuver = 2; - maneuverSubState = 0; - } - - // roll -- if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) { -+ if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) { - const float goalBankDif = goalDotRight + rightdir.y * 0.2f; - if (goalBankDif > maxAileron * speedf * 4.0f) { - aileron = 1; -@@ -706,7 +706,7 @@ - } else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) { - aileron = -1; - } else { -- if (fabs(rightdir.y) < maxBank) { -+ if (math::fabs(rightdir.y) < maxBank) { - aileron = goalBankDif / (maxAileron * speedf * 4); - } else { - if (rightdir.y < 0.0f && goalBankDif < 0.0f) { -@@ -762,7 +762,7 @@ - } else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) { - elevator = 1; - } else { -- if (fabs(frontdir.y) < maxPitch) -+ if (math::fabs(frontdir.y) < maxPitch) - elevator = hdif / (maxElevator * speedf * speedf * 20); - } - } -diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp ---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -201,7 +201,7 @@ - - void CPathEstimator::CalcOffsetsAndPathCosts(int thread) { - //! reset FPU state for synced computations -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - // NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A], - // A must be completely finished before B_i can be safely called. This means we cannot -diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp ---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp 2012-07-13 06:34:43.016060490 +0200 -@@ -251,7 +251,7 @@ - - - void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) { -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - char loadMsg[512] = {'\0'}; - const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)"; -@@ -310,7 +310,7 @@ - } - #endif - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void QTPFS::PathManager::InitNodeLayersThread( -@@ -360,7 +360,7 @@ - - - void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) { -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - #ifdef QTPFS_OPENMP_ENABLED - { -@@ -375,7 +375,7 @@ - } - #endif - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - } - - void QTPFS::PathManager::UpdateNodeLayersThread( -@@ -569,7 +569,7 @@ - SCOPED_TIMER("PathManager::Update"); - - #ifdef QTPFS_ENABLE_THREADED_UPDATE -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - - // allow ThreadUpdate to run one iteration - condThreadUpdate->notify_one(); -@@ -579,7 +579,7 @@ - // wait for the ThreadUpdate iteration to finish - condThreadUpdated->wait(lock); - -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #else - ThreadUpdate(); - #endif -diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp ---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp 2012-07-13 06:34:43.082727161 +0200 -@@ -262,7 +262,7 @@ - damage *= gfxMod; - damage = std::max(damage, 0.0f); - -- const float sqrtDmg = sqrt(damage); -+ const float sqrtDmg = math::sqrt(damage); - const float camLength = camVect.Length(); - float moveLength = radius * 0.03f; - -@@ -283,7 +283,7 @@ - if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; } - - if (smokeDamage > 0.01f) { -- smokeDamageSQRT = sqrt(smokeDamage); -+ smokeDamageSQRT = math::sqrt(smokeDamage); - smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f); - } - -@@ -507,17 +507,17 @@ - } - case OP_SAWTOOTH: { - // this translates to modulo except it works with floats -- val -= (*(float*) code) * floor(val / (*(float*) code)); -+ val -= (*(float*) code) * math::floor(val / (*(float*) code)); - code += 4; - break; - } - case OP_DISCRETE: { -- val = (*(float*) code) * floor(val / (*(float*) code)); -+ val = (*(float*) code) * math::floor(val / (*(float*) code)); - code += 4; - break; - } - case OP_SINE: { -- val = (*(float*) code) * sin(val); -+ val = (*(float*) code) * math::sin(val); - code += 4; - break; - } -@@ -538,12 +538,12 @@ - break; - } - case OP_POW: { -- val = pow(val, (*(float*) code)); -+ val = math::pow(val, (*(float*) code)); - code += 4; - break; - } - case OP_POWBUFF: { -- val = pow(val, buffer[(*(int*) code)]); -+ val = math::pow(val, buffer[(*(int*) code)]); - code += 4; - break; - } -diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp 2012-07-13 06:34:43.069393827 +0200 -@@ -111,7 +111,7 @@ - oldSmokeDir.Normalize(); - const float3 camDir = (pos - camera->pos).Normalize(); - -- if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) { -+ if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) { - drawTrail = false; - } - -@@ -334,7 +334,7 @@ - - if (!drawTrail) { - float3 camDir = (pos - camera->pos).Normalize(); -- if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) { -+ if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) { - drawTrail = true; - } - } -@@ -373,7 +373,7 @@ - const float3 dif2 = (oldSmokePos - camera->pos).Normalize(); - const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize(); - -- float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir))); -+ float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir))); - float alpha = std::min(255.0f, std::max(0.f, a1)); - col[0] = (unsigned char) (color * alpha); - col[1] = (unsigned char) (color * alpha); -@@ -381,7 +381,7 @@ - col[3] = (unsigned char) (alpha); - - unsigned char col2[4]; -- float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir))); -+ float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir))); - - if (age < 8) - a2 = 0; -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -188,7 +188,7 @@ - particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread; - particles[i].pos = pos; - -- particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); -+ particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); - } - - drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread); -@@ -232,7 +232,7 @@ - const float az = gu->usRandFloat() * 2 * PI; - const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0); - -- float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); -+ float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread)); - - CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner); - -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -124,7 +124,7 @@ - if (lastSegment) { - a1 = 0; - } -- a1 *= 0.7f + fabs(dif1.dot(dir1)); -+ a1 *= 0.7f + math::fabs(dif1.dot(dir1)); - float alpha = std::min(255.f, std::max(0.f, a1)); - col[0] = (unsigned char) (color * alpha); - col[1] = (unsigned char) (color * alpha); -@@ -136,7 +136,7 @@ - if (firstSegment) { - a2 = 0; - } -- a2 *= 0.7f + fabs(dif2.dot(dir2)); -+ a2 *= 0.7f + math::fabs(dif2.dot(dir2)); - alpha = std::min(255.f, std::max(0.0f, a2)); - col2[0] = (unsigned char) (color * alpha); - col2[1] = (unsigned char) (color * alpha); -@@ -153,7 +153,7 @@ - - unsigned char col3[4]; - float a2 = (1 - (float)(age + 4) / lifeTime) * 255; -- a2 *= 0.7f + fabs(dif3.dot(middir)); -+ a2 *= 0.7f + math::fabs(dif3.dot(middir)); - alpha = std::min(255.0f, std::max(0.0f, a2)); - col3[0] = (unsigned char) (color * alpha); - col3[1] = (unsigned char) (color * alpha); -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -49,7 +49,7 @@ - const float yp = (y + ypart) / 16.0f*PI - PI/2; - for (int x = 0; x < 5; ++x) { - float xp = (x + xpart) / 32.0f*2*PI; -- vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp)); -+ vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp)); - } - } - pos = centerPos+vectors[12] * sphereSize; -@@ -86,7 +86,7 @@ - float alpha = - baseAlpha * - (1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) * -- (1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f); -+ (1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f); - - col[0] = (unsigned char) (color.x * 255.0f * alpha); - col[1] = (unsigned char) (color.y * 255.0f * alpha); -@@ -94,7 +94,7 @@ - col[3] = ((unsigned char) (40 * alpha)) + 1; - va->AddVertexQTC(centerPos + vectors[y*5 + x] * interSize, texx, texy, col); - va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col); -- alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f); -+ alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f); - - col[0] = (unsigned char) (color.x * 255.0f * alpha); - col[1] = (unsigned char) (color.y * 255.0f * alpha); -diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -79,7 +79,7 @@ - float interSize = size + sizeExpansion * globalRendering->timeOffset; - float interRot = rotation + rotSpeed * globalRendering->timeOffset; - -- const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize; -+ const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize; - const float3 dir2 = dir1.cross(UpVector); - - #define wt projectileDrawer->waketex -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -96,7 +96,7 @@ - drawRadius = radius + maxSpeed * 8; - - float3 camDir = (pos - camera->pos).ANormalize(); -- if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) { -+ if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) { - drawTrail = false; - } - -@@ -229,8 +229,8 @@ - // is too close or height difference too large) - const float horDiff = (targPos - pos).Length2D() + 0.01f; - const float verDiff = (targPos.y - pos.y) + 0.01f; -- const float dirDiff = fabs(targetDir.y - dir.y); -- const float ratio = fabs(verDiff / horDiff); -+ const float dirDiff = math::fabs(targetDir.y - dir.y); -+ const float ratio = math::fabs(verDiff / horDiff); - - dir.y -= (dirDiff * ratio); - } else { -@@ -295,7 +295,7 @@ - if (!drawTrail) { - const float3 camDir = (pos - camera->pos).ANormalize(); - -- if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) { -+ if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) { - drawTrail = true; - } - } -@@ -343,7 +343,7 @@ - dir2.ANormalize(); - - float a1 = (1.0f / (SMOKE_TIME)) * 255; -- a1 *= 0.7f + fabs(dif.dot(dir)); -+ a1 *= 0.7f + math::fabs(dif.dot(dir)); - const float alpha1 = std::min(255.0f, std::max(0.0f, a1)); - col[0] = (unsigned char) (color * alpha1); - col[1] = (unsigned char) (color * alpha1); -@@ -357,7 +357,7 @@ - a2 = 0; - } - -- a2 *= 0.7f + fabs(dif2.dot(oldDir)); -+ a2 *= 0.7f + math::fabs(dif2.dot(oldDir)); - const float alpha2 = std::min(255.0f, std::max(0.0f, a2)); - col2[0] = (unsigned char) (color * alpha2); - col2[1] = (unsigned char) (color * alpha2); -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -90,13 +90,13 @@ - } - } - -- maxGoodDif = cos(tracking * 0.6f); -+ maxGoodDif = math::cos(tracking * 0.6f); - curSpeed = speed.Length(); - dir = speed / curSpeed; - oldSmokeDir = dir; - - const float3 camDir = (pos - camera->pos).ANormalize(); -- const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000); -+ const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000); - - drawTrail = (camDist >= 200.0f); - drawRadius = maxSpeed * 8.0f; -@@ -304,7 +304,7 @@ - - if (!drawTrail) { - const float3 camDir = (pos - camera->pos).ANormalize(); -- const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000); -+ const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000); - - drawTrail = (camDist > 300.0f); - } -@@ -335,11 +335,11 @@ - - const float a1 = - ((1.0f - (0.0f / SMOKE_TIME)) * 255) * -- (0.7f + fabs(dif1.dot(dir))); -+ (0.7f + math::fabs(dif1.dot(dir))); - const float a2 = - (age < 8)? 0.0f: - ((1.0f - (age2 / SMOKE_TIME)) * 255) * -- (0.7f + fabs(dif2.dot(oldSmokeDir))); -+ (0.7f + math::fabs(dif2.dot(oldSmokeDir))); - const int alpha1 = std::min(255, (int) std::max(0.0f, a1)); - const int alpha2 = std::min(255, (int) std::max(0.0f, a2)); - -diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp ---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp 2012-07-10 00:10:07.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp 2012-07-13 06:34:43.249393836 +0200 -@@ -252,8 +252,8 @@ - const float dot = speed.dot(normal); - - pos -= speed; -- speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip); -- speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound); -+ speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip); -+ speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound); - pos += speed; - - if (weaponDef->bounceExplosionGenerator) { -diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp ---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp 2012-07-13 06:34:43.079393827 +0200 -@@ -770,7 +770,7 @@ - b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE); - b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos)); - b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget); -- edgeFactor = fabs(w->targetBorder); -+ edgeFactor = math::fabs(w->targetBorder); - } - - const float diffLength2D = diff.Length2D(); -diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp ---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp 2012-07-13 06:34:43.079393827 +0200 -@@ -349,7 +349,7 @@ - if (rx <= spread) - continue; - -- rx = sqrt(rx); -+ rx = math::sqrt(rx); - - const float minx = std::max( spread, center.x - rx); - const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx); -@@ -676,7 +676,7 @@ - am->ForceHeading(unloadHeading); - am->maxDrift = 1; - if ((owner->pos.SqDistance(pos) < 64) && -- (owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) { -+ (owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) { - if (!SpotIsClearIgnoreSelf(pos, unit)) { - // chosen spot is no longer clear to land, choose a new one - // if a new spot cannot be found, don't unload at all -diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp ---- spring_89.0/rts/Sim/Units/UnitDef.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -399,9 +399,9 @@ - selfDCountdown = udTable.GetInt("selfDestructCountdown", 5); - - speed = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED; -- speed = fabs(speed); -+ speed = math::fabs(speed); - rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED; -- rSpeed = fabs(rSpeed); -+ rSpeed = math::fabs(rSpeed); - - fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL); - fireState = std::min(fireState, int(FIRESTATE_FIREATWILL)); -@@ -462,8 +462,8 @@ - useSmoothMesh = udTable.GetBool("useSmoothMesh", true); - - -- maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values -- maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values -+ maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values -+ maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values - - turnRate = udTable.GetFloat("turnRate", 0.0f); - turnInPlace = udTable.GetBool("turnInPlace", true); -@@ -709,7 +709,7 @@ - seismicSignature = udTable.GetFloat("seismicSignature", -1.0f); - if (seismicSignature == -1.0f) { - if (!canFloat && !canHover && !canfly) { -- seismicSignature = sqrt(mass / 100.0f); -+ seismicSignature = math::sqrt(mass / 100.0f); - } else { - seismicSignature = 0.0f; - } -diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp ---- spring_89.0/rts/Sim/Units/UnitHandler.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp 2012-07-13 06:34:43.076060493 +0200 -@@ -419,8 +419,8 @@ - // look for a nearby geothermal feature if we need one - for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) { - if ((*fi)->def->geoThermal -- && fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4) -- && fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) { -+ && math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4) -+ && math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) { - canBuild = BUILDSQUARE_OPEN; - break; - } -@@ -589,7 +589,7 @@ - BuildInfo bi(cmd); - tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos; - -- if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) { -+ if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) { - return cmd; - } - } -diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp ---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -62,7 +62,7 @@ - const float s = -owner->speed.y; - const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)); - if (sq > 0) { -- predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq); -+ predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq); - } else { - predict = 0; - } -diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp ---- spring_89.0/rts/Sim/Weapons/Cannon.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -169,7 +169,7 @@ - - int ttl = 0; - float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed; -- int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity) -+ int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity) - : math::sqrt(diff.SqLength2D() / sqSpeed2D)); - if(weaponDef->flighttime > 0) { - ttl = weaponDef->flighttime; -@@ -216,9 +216,9 @@ - // try to cache results, sacrifice some (not much too much even for a pewee) accuracy - // it saves a dozen or two expensive calculations per second when 5 guardians - // are shooting at several slow- and fast-moving targets -- if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) && -- fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) && -- fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) { -+ if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) && -+ math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) && -+ math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) { - return lastDir; - } - -@@ -237,7 +237,7 @@ - // FIXME: temporary safeguards against FP overflow - // (introduced by extreme off-map unit positions; the term - // DFsq * Dsq * ... * dy should never even approach 1e38) -- if (Dsq < 1e12f && fabs(dy) < 1e6f) { -+ if (Dsq < 1e12f && math::fabs(dy) < 1e6f) { - const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq; - - if (root1 >= 0.0f) { -diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp ---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -126,9 +126,9 @@ - - // should really be tan but TA seem to cap it somehow - // should also be 7fff or ffff theoretically but neither seems good -- wd.accuracy = sin((accuracy) * PI / 0xafff); -- wd.sprayAngle = sin((sprayAngle) * PI / 0xafff); -- wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff); -+ wd.accuracy = math::sin((accuracy) * PI / 0xafff); -+ wd.sprayAngle = math::sin((sprayAngle) * PI / 0xafff); -+ wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff); - - wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f); - wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f); -@@ -375,7 +375,7 @@ - - - const float gd = max(30.0f, wd.damages[0] / 20.0f); -- const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f; -+ const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f; - wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed); - - // Dynamic Damage -@@ -461,7 +461,7 @@ - wd.hitSound.setVolume(0, 5.0f); - wd.hitSound.setVolume(1, 5.0f); - } else { -- float fireSoundVolume = sqrt(wd.damages[0] * 0.5f); -+ float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f); - - if (wd.type == "LaserCannon") { - fireSoundVolume *= 0.5f; -@@ -472,7 +472,7 @@ - if ((fireSoundVolume > 100.0f) && - ((wd.type == "MissileLauncher") || - (wd.type == "StarburstLauncher"))) { -- fireSoundVolume = 10.0f * sqrt(hitSoundVolume); -+ fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume); - } - - if (wd.damageAreaOfEffect > 8.0f) { -@@ -564,7 +564,7 @@ - - if (inverted == true) { - for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) { -- dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i]; -+ dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i]; - - if (damageMin > 0) - dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]); -@@ -577,7 +577,7 @@ - } - else { - for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) { -- dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i]; -+ dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i]; - - if (damageMin > 0) - dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]); -diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp ---- spring_89.0/rts/System/Matrix44f.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -72,8 +72,8 @@ - - *this=Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[4]; - m[4] = cr*a - sr*m[8]; -@@ -107,8 +107,8 @@ - - *this = Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[0]; - m[0] = cr*a + sr*m[8]; -@@ -142,8 +142,8 @@ - - *this = Mul(rm); - */ -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - float a=m[0]; - m[0] = cr*a - sr*m[4]; -@@ -165,8 +165,8 @@ - - void CMatrix44f::Rotate(float rad, const float3& axis) - { -- const float sr = sin(rad); -- const float cr = cos(rad); -+ const float sr = math::sin(rad); -+ const float cr = math::cos(rad); - - for(int a=0;a<3;++a){ - float3 v(m[a*4],m[a*4+1],m[a*4+2]); -diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp ---- spring_89.0/rts/System/myMath.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/myMath.cpp 2012-07-13 06:34:43.072727160 +0200 -@@ -44,7 +44,7 @@ - } - - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif -@@ -58,7 +58,7 @@ - #pragma omp parallel - { - //good_fpu_control_registers("OMP-Init"); -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif -@@ -77,8 +77,8 @@ - for (int a = 0; a < NUM_HEADINGS; ++a) { - float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS; - float2 v; -- v.x = sin(ang); -- v.y = cos(ang); -+ v.x = math::sin(ang); -+ v.y = math::cos(ang); - headingToVectorTable[a] = v; - } - -@@ -107,9 +107,9 @@ - float3 ret; - float h = heading * TAANG2RAD; - float p = pitch * TAANG2RAD; -- ret.x = sin(h) * cos(p); -- ret.y = sin(p); -- ret.z = cos(h) * cos(p); -+ ret.x = math::sin(h) * math::cos(p); -+ ret.y = math::sin(p); -+ ret.z = math::cos(h) * math::cos(p); - return ret; - } - -@@ -138,7 +138,7 @@ - float3 dir(l2-l1); - float3 pdir(p-l1); - float length = dir.Length(); -- if (fabs(length) < 1e-4f) -+ if (math::fabs(length) < 1e-4f) - return l1; - float c = dir.dot(pdir) / length; - if (c < 0) c = 0; -diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp ---- spring_89.0/rts/System/Net/Socket.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -73,7 +73,7 @@ - //! (date of note: 08/05/10) - //! something in from_string() is invalidating the FPU flags - //! tested on win2k and linux (not happening there) -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - return addr; -@@ -94,7 +94,7 @@ - #ifdef STREFLOP_H - //! (date of note: 08/22/10) - //! something in resolve() is invalidating the FPU flags -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - return resolveIt; -diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp ---- spring_89.0/rts/System/OffscreenGLContext.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -259,7 +259,7 @@ - #ifdef STREFLOP_H - // init streflop to make it available for synced computations, too - // redundant? threads copy the FPU state of their parent. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - try { -diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h ---- spring_89.0/rts/System/Sound/SoundSource.h 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h 2012-07-13 06:34:42.836060480 +0200 -@@ -7,7 +7,6 @@ - - #include <al.h> - #include <boost/noncopyable.hpp> --#include <boost/thread/recursive_mutex.hpp> - - class IAudioChannel; - class float3; -diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp ---- spring_89.0/rts/System/SpringApp.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp 2012-07-13 06:34:42.982727155 +0200 -@@ -385,7 +385,7 @@ - #ifdef STREFLOP_H - //! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word. - //! Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #endif - - //! setup GL smoothing -@@ -1009,7 +1009,7 @@ - SDL_Event event; - - while (SDL_PollEvent(&event)) { -- streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags -+ streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags - input.PushEvent(event); - } - } -diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp ---- spring_89.0/rts/System/Sync/FPUCheck.cpp 2012-07-10 00:10:08.000000000 +0200 -+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp 2012-07-13 06:34:42.939393819 +0200 -@@ -85,7 +85,7 @@ - LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text); - - // Set single precision floating point math. -- streflop_init<streflop::Simple>(); -+ streflop::streflop_init<streflop::Simple>(); - #if defined(__SUPPORT_SNAN__) && !defined(USE_GML) - streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW)); - #endif diff --git a/community-testing/spring/spring.install b/community-testing/spring/spring.install deleted file mode 100644 index 41f09f887..000000000 --- a/community-testing/spring/spring.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/springlobby/PKGBUILD b/community-testing/springlobby/PKGBUILD deleted file mode 100644 index 697e4d62e..000000000 --- a/community-testing/springlobby/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 73776 2012-07-15 13:20:59Z ibiru $ -# 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-testing/springlobby/springlobby.desktop b/community-testing/springlobby/springlobby.desktop deleted file mode 100644 index 1dce96b90..000000000 --- a/community-testing/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-testing/springlobby/springlobby.install b/community-testing/springlobby/springlobby.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community-testing/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-testing/springlobby/springlobby.png b/community-testing/springlobby/springlobby.png Binary files differdeleted file mode 100644 index 89c7ab0ac..000000000 --- a/community-testing/springlobby/springlobby.png +++ /dev/null diff --git a/community-testing/stone-soup/PKGBUILD b/community-testing/stone-soup/PKGBUILD deleted file mode 100644 index 17177714b..000000000 --- a/community-testing/stone-soup/PKGBUILD +++ /dev/null @@ -1,68 +0,0 @@ -# Maintainer: Jakob Gruber <jakob.gruber@gmail.com> - -pkgname=stone-soup -pkgver=0.11.0 -pkgrel=2 -pkgdesc='Open-source, single-player, role-playing roguelike game of exploration and treasure-hunting' -arch=('i686' 'x86_64') -url='http://crawl.develz.org/' -depends=('lua' 'ncurses' 'sdl_image' 'sqlite' 'libgl' 'mesa' 'glu' 'freetype2' 'ttf-dejavu') -makedepends=('bison' 'flex' 'gendesk') -conflicts=('crawl' 'stone-soup-tile' 'stone-soup-git') -license=('custom') -install=stone-soup.install -source=("http://downloads.sourceforge.net/sourceforge/crawl-ref/stone_soup-${pkgver}-nodeps.tar.xz") - -# used by gendesk to create .desktop file -_exec=('crawl-tiles') -_name=('Dungeon Crawl Stone Soup') - -build() { - cd "$srcdir" - gendesk -n - - cd "stone_soup-${pkgver}/source" - - # adjust makefile to use /usr/bin, owner root:root, - # disable setgid on executable - - sed -i 's|bin_prefix := bin|bin_prefix := usr/bin|' Makefile - sed -i 's/INSTALL_UGRP := games:games/INSTALL_UGRP := root:root/' Makefile - sed -i 's|MCHMOD := 2755|MCHMOD := 755|' Makefile - - # first build and install tiles version - - make DESTDIR="${pkgdir}" \ - SAVEDIR="~/.crawl/" \ - DATADIR="/usr/share/${pkgname}/data" \ - USE_UNICODE=y \ - TILES=y \ - install - - # rename tiles executable to avoid clashing with console crawl - - mv "${pkgdir}/usr/bin/crawl" "${pkgdir}/usr/bin/crawl-tiles" - - # then build and install console version - - make DESTDIR="${pkgdir}" \ - SAVEDIR="~/.crawl/" \ - DATADIR="/usr/share/${pkgname}/data" \ - USE_UNICODE=y \ - install - - # install crawl license - - install -D -m644 ../licence.txt \ - "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" - - # install icon and .desktop file - - install -D -m644 dat/tiles/stone_soup_icon-32x32.png \ - "${pkgdir}/usr/share/pixmaps/${pkgname}.png" - install -D -m644 "${srcdir}/${pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${pkgname}.desktop" - -} - -md5sums=('715d800410a7251499bf8efcc8675ca6') diff --git a/community-testing/stone-soup/stone-soup.install b/community-testing/stone-soup/stone-soup.install deleted file mode 100644 index 2320123e2..000000000 --- a/community-testing/stone-soup/stone-soup.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - - # return if old pkgver >= 0.9.0-2 - [[ $(vercmp $2 0.9.0-2) -ge 0 ]] && return - - echo "--------------------------------------------------------------------- - stone-soup saves have moved to ~/.crawl. - If you want to keep your old saves, move ~/.stone-soup to - ~/.crawl. ----------------------------------------------------------------------" -} diff --git a/community-testing/supertux/PKGBUILD b/community-testing/supertux/PKGBUILD deleted file mode 100644 index 3a0774e73..000000000 --- a/community-testing/supertux/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 74523 2012-07-29 21:16:37Z ebelanger $ -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Eric Bélanger <eric@archlinux.org> -# Contributor: vande198 -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=supertux -pkgver=0.3.3 -pkgrel=6 -pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario games" -arch=('i686' 'x86_64') -url="http://super-tux.sourceforge.net/" -license=('GPL') -depends=('sdl_image' 'curl' 'physfs' 'openal' 'libvorbis' 'libgl' 'glew') -makedepends=('cmake' 'boost') -source=(http://download.berlios.de/supertux/${pkgname}-${pkgver}.tar.bz2 - supertux2-0.3.3-squirrel-gcc47.patch) -md5sums=('f3f803e629ee51a9de0b366a036e393d' - 'eb06315514be4f200428f14b927beb66') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -p1 -i "${srcdir}/supertux2-0.3.3-squirrel-gcc47.patch" - sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp - sed -i '/types\.h/d' src/addon/addon_manager.cpp - cmake -D CMAKE_INSTALL_PREFIX=/usr -D INSTALL_SUBDIR_BIN=bin . - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} diff --git a/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch b/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch deleted file mode 100644 index 16781b610..000000000 --- a/community-testing/supertux/supertux2-0.3.3-squirrel-gcc47.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h supertux2-0.3.3/external/squirrel/squirrel/sqmem.h ---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqmem.h 1970-01-01 01:00:00.000000000 +0100 -+++ supertux2-0.3.3/external/squirrel/squirrel/sqmem.h 2012-05-01 11:59:37.000000000 +0200 -@@ -0,0 +1,8 @@ -+/* see copyright notice in squirrel.h */ -+#ifndef _SQMEM_H_ -+#define _SQMEM_H_ -+ -+void *sq_vm_malloc(SQUnsignedInteger size); -+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); -+void sq_vm_free(void *p,SQUnsignedInteger size); -+#endif //_SQMEM_H_ -diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h supertux2-0.3.3/external/squirrel/squirrel/sqstate.h ---- supertux2-0.3.3.orig/external/squirrel/squirrel/sqstate.h 2010-03-01 13:40:58.000000000 +0100 -+++ supertux2-0.3.3/external/squirrel/squirrel/sqstate.h 2012-05-01 11:59:37.000000000 +0200 -@@ -136,8 +136,4 @@ - extern SQObjectPtr _minusone_; - - bool CompileTypemask(SQIntVec &res,const SQChar *typemask); -- --void *sq_vm_malloc(SQUnsignedInteger size); --void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size); --void sq_vm_free(void *p,SQUnsignedInteger size); - #endif //_SQSTATE_H_ -diff -Naur supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h supertux2-0.3.3/external/squirrel/squirrel/squtils.h ---- supertux2-0.3.3.orig/external/squirrel/squirrel/squtils.h 2010-03-01 13:40:58.000000000 +0100 -+++ supertux2-0.3.3/external/squirrel/squirrel/squtils.h 2012-05-01 11:59:37.000000000 +0200 -@@ -2,6 +2,8 @@ - #ifndef _SQUTILS_H_ - #define _SQUTILS_H_ - -+#include "sqmem.h" -+ - #define sq_new(__ptr,__type) {__ptr=(__type *)sq_vm_malloc(sizeof(__type));new (__ptr) __type;} - #define sq_delete(__ptr,__type) {__ptr->~__type();sq_vm_free(__ptr,sizeof(__type));} - #define SQ_MALLOC(__size) sq_vm_malloc((__size)); 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/tagpy/PKGBUILD b/community-testing/tagpy/PKGBUILD deleted file mode 100644 index 0a7ae1a26..000000000 --- a/community-testing/tagpy/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 74159 2012-07-22 13:24:09Z jelle $ -# 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=9 -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" -} - -check(){ - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py test -} diff --git a/community-testing/tdfsb/PKGBUILD b/community-testing/tdfsb/PKGBUILD deleted file mode 100644 index a219a2d99..000000000 --- a/community-testing/tdfsb/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 77588 2012-10-13 02:40:19Z ebelanger $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=tdfsb -pkgver=0.0.10 -pkgrel=6 -pkgdesc="SDL based graphical file browser" -arch=('i686' 'x86_64') -url="http://www.determinate.net/webdata/seg/tdfsb.html" -license=('GPL') -depends=('smpeg' 'freeglut' 'sdl_image' 'libxmu' 'glu') -source=("http://www.determinate.net/webdata/data/${pkgname}-${pkgver}.tar.gz" - 'tdfsb.desktop' - 'tdfsb.png') -md5sums=('8162994a7e882dc7074a5f628d2ac076' - '4070a7de1153c00df875384a1817e43b' - 'ecabb39597a3c17f9541300869873e50') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - sed -i -e "s:-O2:${CFLAGS} ${LDFLAGS}:g" compile.sh - ./compile.sh -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -D -m755 tdfsb "${pkgdir}/usr/bin/tdfsb" - - # Install desktop file - install -D -m755 "${srcdir}/tdfsb.desktop" "${pkgdir}/usr/share/applications/tdfsb.desktop" - # Install icon - install -D -m644 "${srcdir}/tdfsb.png" "${pkgdir}/usr/share/pixmaps/tdfsb.png" -} diff --git a/community-testing/tdfsb/tdfsb.desktop b/community-testing/tdfsb/tdfsb.desktop deleted file mode 100644 index 7167e022a..000000000 --- a/community-testing/tdfsb/tdfsb.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Tdfsb -Comment=SDL based graphical file browser -Icon=/usr/share/pixmaps/tdfsb.png -Exec=tdfsb -Terminal=false -Type=Application -Categories=System;Application; -StartupNotify=true diff --git a/community-testing/tdfsb/tdfsb.png b/community-testing/tdfsb/tdfsb.png Binary files differdeleted file mode 100644 index 5ac3a5fe4..000000000 --- a/community-testing/tdfsb/tdfsb.png +++ /dev/null diff --git a/community-testing/teeworlds/PKGBUILD b/community-testing/teeworlds/PKGBUILD deleted file mode 100644 index 51ee46ff9..000000000 --- a/community-testing/teeworlds/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Armin 'IsSuE' Praher [issue.at.gmx.dot.at] -# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=teeworlds -pkgver=0.6.1 -pkgrel=3 -pkgdesc="A multiplayer 2D shooter" -arch=('i686' 'x86_64') -url="http://teeworlds.com" -license=('custom') -depends=('alsa-lib' 'glu' 'sdl' 'freetype2') -makedepends=('python2' 'bam' 'mesa') -replaces=('teewars') -source=(http://www.teeworlds.com/files/${pkgname}-${pkgver}-source.tar.gz - teeworlds.desktop - teeworlds.png) -md5sums=('00de7195ecd1f23596dc3237341af512' - '3944aaf7a8c19a83510b2b39c4cddf5f' - '44f39e398409232a0e0a431ed46d8cc8') - -build() { - # Build teeworlds - cd ${srcdir}/${pkgname}-*-source - - # Use Python 2 - sed -i 's/python /python2 /' bam.lua - - bam server_release client_release -} - -package() { - cd ${srcdir}/${pkgname}-*-source - - # Install data files - mkdir -p ${pkgdir}/usr/share/${pkgname}/data - cp -r data/* ${pkgdir}/usr/share/${pkgname}/data - - install -Dm755 ${pkgname} ${pkgdir}/usr/bin/${pkgname} - install -Dm755 ${pkgname}_srv ${pkgdir}/usr/bin/${pkgname}_srv - - install -Dm644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop - install -Dm644 ${srcdir}/${pkgname}.png \ - ${pkgdir}/usr/share/pixmaps/${pkgname}.png - - install -Dm644 license.txt \ - ${pkgdir}/usr/share/licenses/${pkgname}/license.txt -} diff --git a/community-testing/teeworlds/teeworlds.desktop b/community-testing/teeworlds/teeworlds.desktop deleted file mode 100644 index ddfb8994d..000000000 --- a/community-testing/teeworlds/teeworlds.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Icon=teeworlds -Exec=teeworlds -Terminal=false -StartupNotify=false - -Name=TeeWorlds -GenericName=Arcade Game -Comment=is a multiplayer 2D FPS shooter -Comment[pl_PL]=wieloosobowa strzelanka FTP w 2D - -Categories=Game;ArcadeGame; diff --git a/community-testing/teeworlds/teeworlds.png b/community-testing/teeworlds/teeworlds.png Binary files differdeleted file mode 100644 index 890baaff3..000000000 --- a/community-testing/teeworlds/teeworlds.png +++ /dev/null diff --git a/community-testing/tellico/PKGBUILD b/community-testing/tellico/PKGBUILD deleted file mode 100644 index b60a29ac7..000000000 --- a/community-testing/tellico/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 74668 2012-08-01 17:04:35Z andrea $ -# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Ray Rashif <schiv@archlinux.org -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org> - -pkgname=tellico -pkgver=2.3.6 -pkgrel=2 -pkgdesc="A collection manager for KDE" -arch=('i686' 'x86_64') -url="http://tellico-project.org/" -license=('GPL') -depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'libkcddb' 'poppler-qt' 'qjson') -makedepends=('automoc4' 'cmake') -install=$pkgname.install -source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('62bafaea733ce3b108322623e866b8659ab2644cc80ee06f0fc7fe974ec5d1c3') - -build() { - cd ${srcdir} - - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd ${srcdir}/build - - make DESTDIR=${pkgdir} install - -# fix python 2.7 path - find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' -} diff --git a/community-testing/tellico/tellico.install b/community-testing/tellico/tellico.install deleted file mode 100644 index 3b3aff7d9..000000000 --- a/community-testing/tellico/tellico.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/community-testing/tix/PKGBUILD b/community-testing/tix/PKGBUILD deleted file mode 100644 index e5a35e2b2..000000000 --- a/community-testing/tix/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 78122 2012-10-16 11:54:26Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Brice Méalier <mealier_brice@yahoo.fr> - -pkgname=tix -pkgver=8.4.3 -pkgrel=4 -pkgdesc="Tk Interface eXtension, a powerful set of user interface components" -arch=(i686 'x86_64') -url="http://tix.sourceforge.net/" -license=("BSD") -depends=('tk' 'libx11') -source=(http://downloads.sourceforge.net/tix/Tix$pkgver-src.tar.gz - tcl-tk-path.patch) -md5sums=('2b8bf4b10a852264678182652f477e59' - 'd4df48da39dd51872d58706a51bab505') - -build() { - cd $srcdir/Tix$pkgver - - patch -p1 <$srcdir/tcl-tk-path.patch - - export CFLAGS="$CFLAGS -DERR_IN_PROGRESS=2" - - ./configure --prefix=/usr - make - make DESTDIR=$pkgdir install - # move things around - - install -m755 tools/tixindex $pkgdir/usr/bin/tixindex - rm -rf $pkgdir/usr/lib/Tix8.4/html - rm -f $pkgdir/usr/lib/Tix8.4/{README.txt,license.terms} - ln -s Tix$pkgver/libTix$pkgver.so $pkgdir/usr/lib/libTix$pkgver.so - - mkdir -p $pkgdir/usr/share/man/man1 - mkdir -p $pkgdir/usr/share/man/man3 - cp -p man/tixwish.1 $pkgdir/usr/share/man/man1 - cd $srcdir/Tix$pkgver/man - for i in *.n; do - cp -p $i $pkgdir/usr/share/man/man3/${i%n}3 - done - - mkdir -p $pkgdir/usr/share/licenses/tix - cp $srcdir/Tix$pkgver/license.terms $pkgdir/usr/share/licenses/tix/ -} - diff --git a/community-testing/tix/tcl-tk-path.patch b/community-testing/tix/tcl-tk-path.patch deleted file mode 100644 index 2fc12671e..000000000 --- a/community-testing/tix/tcl-tk-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -wbBur Tix8.4.3/configure Tix8.4.3.my/configure ---- Tix8.4.3/configure 2008-02-28 04:35:01.000000000 +0000 -+++ Tix8.4.3.my/configure 2009-12-28 10:57:33.000000000 +0000 -@@ -6645,7 +6645,7 @@ - ;; - esac - else -- if test ! -f "${TCL_SRC_DIR}/generic/tclInt.h" ; then -+ if test ! -f "${TCL_SRC_DIR}/tclInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&5 - echo "$as_me: error: Cannot find private header tclInt.h in ${TCL_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } -@@ -6700,7 +6700,7 @@ - ;; - esac - else -- if test ! -f "${TK_SRC_DIR}/generic/tkInt.h" ; then -+ if test ! -f "${TK_SRC_DIR}/tk-private/generic/tkInt.h" ; then - { { echo "$as_me:$LINENO: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&5 - echo "$as_me: error: Cannot find private header tkInt.h in ${TK_SRC_DIR}" >&2;} - { (exit 1); exit 1; }; } - diff --git a/community-testing/tmw/PKGBUILD b/community-testing/tmw/PKGBUILD deleted file mode 100644 index 09fe4712c..000000000 --- a/community-testing/tmw/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 75740 2012-08-30 16:55:56Z heftig $ -# Contributor: Bjorn Lindeijer <bjorn lindeijer nl> -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=tmw -pkgver=0.6.1 -pkgrel=1 -pkgdesc="The Mana World (TMW) is a serious effort to create an innovative free and open source MMORPG." -arch=('i686' 'x86_64') -url="http://themanaworld.org" -license=('GPL') -depends=('curl' 'guichan' 'sdl_image' 'libgl' 'libxml2' 'physfs' - 'sdl_mixer' 'sdl_net' 'sdl_gfx' 'sdl_ttf') -makedepends=('cmake' 'mesa') -#source=(http://downloads.sourceforge.net/sourceforge/themanaworld/$pkgname-$pkgver.tar.bz2) -source=($pkgname-$pkgver.tar.gz::https://github.com/mana/mana/tarball/v$pkgver) -md5sums=('b021e368c813fb95bea00bbf02e6d607') - -build() { - cd $srcdir/mana-mana-* - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make -} - -package() { - cd $srcdir/mana-mana-* - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/tor/PKGBUILD b/community-testing/tor/PKGBUILD deleted file mode 100644 index 91d4f0112..000000000 --- a/community-testing/tor/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 72700 2012-06-20 10:57:00Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: simo <simo@archlinux.org> - -pkgname=tor -pkgver=0.2.2.37 -pkgrel=1 -pkgdesc='Anonymizing overlay network.' -arch=('i686' 'x86_64') -url='http://www.torproject.org/' -license=('BSD') -depends=('openssl' 'libevent' 'tsocks' 'bash') -makedepends=('ca-certificates') -backup=('etc/tor/torrc' - 'etc/tor/torrc-dist' - 'etc/tor/tor-tsocks.conf' - 'etc/conf.d/tor') -install='tor.install' -source=("http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz"{,.asc} - 'torrc' - 'tor' - 'tor.conf.d' - 'tor.service') -md5sums=('5aafdca4fb6af6e12b503d32b03f14a7' - '8d3adf70109d16e860dbf414f9d70eac' - '56c75d4e8a66f34167d31e38c43793dd' - 'f8e6868a389877346e7eebaacd1078bb' - '5c7c6834064b3530c442def6079ac3aa' - 'cf23b97a1da09670214da6229a3ecb09') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -dm0700 "${pkgdir}/var/lib/tor" - - mv "${pkgdir}/etc/tor/torrc.sample" "${pkgdir}/etc/tor/torrc-dist" - install -Dm0644 "${srcdir}/torrc" "${pkgdir}/etc/tor/torrc" - install -Dm0755 "${srcdir}/tor" "${pkgdir}/etc/rc.d/tor" - install -Dm0644 "${srcdir}/tor.conf.d" "${pkgdir}/etc/conf.d/tor" - - install -Dm0644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - - install -Dm0644 "${srcdir}/tor.service" "${pkgdir}/usr/lib/systemd/system/tor.service" -} diff --git a/community-testing/tor/tor b/community-testing/tor/tor deleted file mode 100644 index 522c498ce..000000000 --- a/community-testing/tor/tor +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -# source application-specific settings -[ -f /etc/conf.d/tor ] && . /etc/conf.d/tor - -PID=`pidof -o %PPID /usr/bin/tor` -case "$1" in - start) - stat_busy "Starting Tor Daemon" - if [ -z "${TOR_MAX_FD}" ] || ulimit -n "${TOR_MAX_FD}"; then - [ -z "$PID" ] && /usr/bin/tor -f ${TOR_CONF} ${TOR_ARGS} &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon tor - stat_done - fi - else - stat_fail - fi - ;; - stop) - stat_busy "Stopping Tor Daemon" - [ ! -z "$PID" ] && kill -INT $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon tor - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -# vim: ft=sh ts=2 sw=2 diff --git a/community-testing/tor/tor.conf.d b/community-testing/tor/tor.conf.d deleted file mode 100644 index e9fa098e0..000000000 --- a/community-testing/tor/tor.conf.d +++ /dev/null @@ -1,9 +0,0 @@ -# Location of the config file. -TOR_CONF='/etc/tor/torrc' - -# Custom ulimit for maximum number of open files. -TOR_MAX_FD= - -# Additional arguments. -TOR_ARGS="--quiet" - diff --git a/community-testing/tor/tor.install b/community-testing/tor/tor.install deleted file mode 100644 index 2c448d28e..000000000 --- a/community-testing/tor/tor.install +++ /dev/null @@ -1,24 +0,0 @@ -post_install() { - echo "-> Tor has been preconfigured to run as a client only." - echo "-> Tor is experimental software. Do not rely on it for strong anonymity." - echo '-> ' - echo '-> You can set custom file descriptor ulimits for Tor in' - echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.' - groupadd -g 43 tor &>/dev/null - useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null - chown tor:tor var/lib/tor &> /dev/null - chmod 700 var/lib/tor &> /dev/null -} - -post_upgrade() { - echo '-> You can now set custom file descriptor ulimits for Tor in' - echo '-> "/etc/conf.d/tor" using the "TOR_MAX_FD" variable.' - getent group tor &>/dev/null || groupadd -g 43 tor &>/dev/null - getent passwd tor &>/dev/null || useradd -u 43 -g tor -d /var/lib/tor -s /bin/false tor &> /dev/null - chown tor:tor var/lib/tor &> /dev/null -} - -pre_remove() { - getent passwd tor &>/dev/null && userdel tor &> /dev/null - getent group tor &>/dev/null && groupdel tor &> /dev/null -} diff --git a/community-testing/tor/tor.service b/community-testing/tor/tor.service deleted file mode 100644 index eb9b556b5..000000000 --- a/community-testing/tor/tor.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Anonymizing Overlay Network - -[Service] -Type=forking -GuessMainPID=yes -EnvironmentFile=/etc/conf.d/tor -ExecStart=/usr/bin/tor -f $TOR_CONF $TOR_ARGS -ExecReload=/bin/kill -HUP $MAINPID -KillSignal=SIGINT - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/tor/torrc b/community-testing/tor/torrc deleted file mode 100644 index 3505653ab..000000000 --- a/community-testing/tor/torrc +++ /dev/null @@ -1,143 +0,0 @@ -## CONFIGURED FOR ARCHLINUX - -## Last updated 22 July 2005 for Tor 0.1.0.13. -## (May or may not work for older or newer versions of Tor.) -# -## See the man page, or http://tor.eff.org/tor-manual.html, for more -## options you can use in this file. -# -# On Unix, Tor will look for this file in someplace like "~/.tor/torrc" or -# "/etc/torrc" -# -# On Windows, Tor will look for the configuration file in someplace like -# "Application Data\tor\torrc" or "Application Data\<username>\tor\torrc" -# -# With the default Mac OS X installer, Tor will look in ~/.tor/torrc or -# /Library/Tor/torrc - - -## Replace this with "SocksPort 0" if you plan to run Tor only as a -## server, and not make any local application connections yourself. -SocksPort 9050 # what port to open for local application connections -SocksBindAddress 127.0.0.1 # accept connections only from localhost -#SocksBindAddress 192.168.0.1:9100 # listen on a chosen IP/port too - -## Entry policies to allow/deny SOCKS requests based on IP address. -## First entry that matches wins. If no SocksPolicy is set, we accept -## all (and only) requests from SocksBindAddress. -#SocksPolicy accept 192.168.0.1/16 -#SocksPolicy reject * - -## Allow no-name routers (ones that the dirserver operators don't -## know anything about) in only these positions in your circuits. -## Other choices (not advised) are entry,exit,introduction. -AllowUnverifiedNodes middle,rendezvous - -## Logs go to stdout at level "notice" unless redirected by something -## else, like one of the below lines. You can have as many log lines as -## you want. -## -## Send all messages of level 'notice' or higher to /var/log/tor/notices.log -#Log notice file /var/log/tor/notices.log -## Send only debug and info messages to /var/log/tor/debug.log -#Log debug-info file /var/log/tor/debug.log -## Send ONLY debug messages to /var/log/tor/debug.log -#Log debug-debug file /var/log/tor/debug.log -## To use the system log instead of Tor's logfiles, uncomment these lines: -Log notice syslog -## To send all messages to stderr: -#Log debug stderr - -## Uncomment this to start the process in the background... or use -## --runasdaemon 1 on the command line. -RunAsDaemon 1 -User tor -Group tor - -## Tor only trusts directories signed with one of these keys, and -## uses the given addresses to connect to the trusted directory -## servers. If no DirServer lines are specified, Tor uses the built-in -## defaults (moria1, moria2, tor26), so you can leave this alone unless -## you need to change it. -#DirServer 18.244.0.188:9031 FFCB 46DB 1339 DA84 674C 70D7 CB58 6434 C437 0441 -#DirServer 18.244.0.114:80 719B E45D E224 B607 C537 07D0 E214 3E2D 423E 74CF -#DirServer 86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D - -## The directory for keeping all the keys/etc. By default, we store -## things in $HOME/.tor on Unix, and in Application Data\tor on Windows. -DataDirectory /var/lib/tor - -## The port on which Tor will listen for local connections from Tor controller -## applications, as documented in control-spec.txt. NB: this feature is -## currently experimental. -#ControlPort 9051 - -############### This section is just for location-hidden services ### - -## Look in .../hidden_service/hostname for the address to tell people. -## HiddenServicePort x y:z says to redirect a port x request from the -## client to y:z. - -#HiddenServiceDir /var/lib/tor/hidden_service/ -#HiddenServicePort 80 127.0.0.1:80 - -#HiddenServiceDir /var/lib/tor/other_hidden_service/ -#HiddenServicePort 80 127.0.0.1:80 -#HiddenServicePort 22 127.0.0.1:22 -#HiddenServiceNodes moria1,moria2 -#HiddenServiceExcludeNodes bad,otherbad - -################ This section is just for servers ##################### - -## NOTE: If you enable these, you should consider mailing your identity -## key fingerprint to the tor-ops, so we can add you to the list of -## servers that clients will trust. See -## http://tor.eff.org/doc/tor-doc.html#server for details. - -## Required: A unique handle for this server -#Nickname ididnteditheconfig - -## The IP or fqdn for this server. Leave commented out and Tor will guess. -#Address noname.example.com - -## Contact info that will be published in the directory, so we can -## contact you if you need to upgrade or if something goes wrong. -## This is optional but recommended. -#ContactInfo Random Person <nobody AT example dot com> -## You might also include your PGP or GPG fingerprint if you have one: -#ContactInfo 1234D/FFFFFFFF Random Person <nobody AT example dot com> - -## Required: what port to advertise for tor connections -#ORPort 9001 -## If you want to listen on a port other than the one advertised -## in ORPort (e.g. to advertise 443 but bind to 9090), uncomment -## the line below. You'll need to do ipchains or other port forwarding -## yourself to make this work. -#ORBindAddress 0.0.0.0:9090 - -## Uncomment this to mirror the directory for others (please do) -#DirPort 9030 # what port to advertise for directory connections -## If you want to listen on a port other than the one advertised -## in DirPort (e.g. to advertise 80 but bind 9091), uncomment the line -## below. You'll need to do ipchains or other port forwarding yourself -## to make this work. -#DirBindAddress 0.0.0.0:9091 - -## A comma-separated list of exit policies. They're considered first -## to last, and the first match wins. If you want to *replace* -## the default exit policy, end this with either a reject *:* or an -## accept *:*. Otherwise, you're *augmenting* (prepending to) the -## default exit policy. Leave commented to just use the default, which is -## available in the man page or at http://tor.eff.org/documentation.html -## -## Look at http://tor.eff.org/faq-abuse.html#TypicalAbuses -## for issues you might encounter if you use the default exit policy. -## -## If certain IPs and ports are blocked externally, e.g. by your firewall, -## you should update your exit policy to reflect this -- otherwise Tor -## users will be told that those destinations are down. -## -#ExitPolicy accept *:6660-6667,reject *:* # allow irc ports but no more -#ExitPolicy accept *:119 # accept nntp as well as default exit policy -#ExitPolicy reject *:* # middleman only -- no exits allowed - diff --git a/community-testing/torcs/PKGBUILD b/community-testing/torcs/PKGBUILD deleted file mode 100644 index e81cc5d25..000000000 --- a/community-testing/torcs/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 77306 2012-10-08 15:41:06Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Shahar Weiss <sweiss4@gmx.net> - -pkgname=torcs -pkgver=1.3.3 -pkgrel=2 -pkgdesc="A 3D racing cars simulator using OpenGL" -url="http://torcs.sourceforge.net" -license=("GPL") -arch=('i686' 'x86_64') -depends=('freeglut' 'libpng' 'freealut' 'libxi' 'libxmu' 'libxrandr' 'libvorbis' 'glu') -makedepends=('plib') -options=('!makeflags') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver/_/-}.tar.bz2 - torcs.desktop - torcs-gcc.patch) -md5sums=('0319c996dac4480f1182c03d2331b14a' - '328e419e9f985c3e7b69924fe299330d' - '5ae7e903df37300d3b8744328c756bff') - -build() { - cd $srcdir/$pkgname-${pkgver/_/-} - unset LDFLAGS - ./configure --prefix=/usr --x-includes=/usr/include --x-libraries=/usr/lib - make -} - -package() { - depends=(${depends[@]} "torcs-data=$pkgver") - cd $srcdir/$pkgname-${pkgver/_/-} - make DESTDIR=${pkgdir} install - install -D -m644 Ticon.png ${pkgdir}/usr/share/pixmaps/torcs.png - install -D -m644 ../torcs.desktop ${pkgdir}/usr/share/applications/torcs.desktop - find ${pkgdir} -type d -exec chmod 755 {} \; -} diff --git a/community-testing/torcs/torcs-gcc.patch b/community-testing/torcs/torcs-gcc.patch deleted file mode 100644 index fcc5604e7..000000000 --- a/community-testing/torcs/torcs-gcc.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -aur src.old/drivers/olethros/Trajectory.cpp src/drivers/olethros/Trajectory.cpp ---- src.old/drivers/olethros/Trajectory.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/drivers/olethros/Trajectory.cpp 2008-04-06 22:28:52.000000000 +0200 -@@ -10,8 +10,10 @@ - ***************************************************************************/ - #include <cstdio> - #include <cstdlib> -+#include <cstring> - #include <cmath> - #include <cassert> -+#include <ctime> - #include <list> - #include <vector> - #include "Trajectory.h" -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/BBoxTree.cpp 2008-04-06 22:22:57.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "Transform.h" - - #include <algorithm> --#include <new.h> -+#include <new> - - class BBoxCompAxis { - public: -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Complex.cpp 2008-04-06 22:23:11.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "Transform.h" - #include "BBoxTree.h" - --#include <new.h> -+#include <new> - - BBoxInternal *free_node; - -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Endpoint.cpp 2008-04-06 22:22:29.000000000 +0200 -@@ -32,7 +32,7 @@ - #include "Object.h" - #include "Encounter.h" - --#include <new.h> -+#include <new> - - void addPair(ObjectPtr object1, ObjectPtr object2); - void removePair(ObjectPtr object1, ObjectPtr object2); -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Object.cpp 2008-04-06 22:22:40.000000000 +0200 -@@ -33,7 +33,7 @@ - #include "Convex.h" - #include "Complex.h" - --#include <new.h> -+#include <new> - - Object::Object(DtObjectRef obj, ShapePtr shape) : - ref(obj), -diff -aur src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp ---- src.old/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp 2008-04-06 22:21:31.000000000 +0200 -+++ src/modules/simu/simuv2/SOLID-2.0/src/Polyhedron.cpp 2008-04-06 22:22:12.000000000 +0200 -@@ -37,7 +37,7 @@ - } - - #include <vector> --#include <new.h> -+#include <new> - - typedef vector<unsigned int> IndexBuf; - diff --git a/community-testing/torcs/torcs.desktop b/community-testing/torcs/torcs.desktop deleted file mode 100644 index 03d1ba010..000000000 --- a/community-testing/torcs/torcs.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=TORCS -Comment=The Open Racing Car Simulator -Exec=torcs -Icon=torcs.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;Game; diff --git a/community-testing/torcs/torcs.sh b/community-testing/torcs/torcs.sh deleted file mode 100644 index 0f1b4fe8d..000000000 --- a/community-testing/torcs/torcs.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -export PATH=$PATH:/opt/torcs/bin diff --git a/community-testing/tp_smapi/PKGBUILD b/community-testing/tp_smapi/PKGBUILD deleted file mode 100644 index e80492955..000000000 --- a/community-testing/tp_smapi/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: xduugu -# Contributor: nh2 -# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com> -# Contributor: Nick B <Shirakawasuna ð gmail đ com> -# Contributor: Christof Musik <christof ð senfdax đ de> -# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de> -# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com> - -pkgname=tp_smapi -pkgver=0.41 -pkgrel=5 -pkgdesc="Modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') -url='https://github.com/evgeni/tp_smapi' -license=('GPL') -depends=('linux>=3.5' 'linux<3.6') -makedepends=('linux-headers>=3.5' 'linux-headers<3.6') -install="${pkgname}.install" -source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('63c683415c764568f6bf17c7eabe4752') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - _kernver=${_kernver:-$(uname -r)} - _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) - _kernver=$(< "${_extramodules}/version") - - sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ - -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile - - make HDAPS=1 -} - -package() { - _kernver=${_kernver:-$(uname -r)} - _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true) - _kernver=$(< "${_extramodules}/version") - - make -C "${_extramodules%/*}/${_kernver}/build" \ - INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \ - M="${srcdir}/${pkgname}-${pkgver}" modules_install - - cd "${pkgdir}/${_extramodules%/*}" - mv "${_kernver}/extra" "${_extramodules##*/}" - rmdir "${_kernver}" - - # compress kernel modules - find "${pkgdir}" -name "*.ko" -exec gzip -9 {} + - - # load module on startup - echo tp_smapi > "${srcdir}/${pkgname}.conf" - install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf" - - # update kernel version in install file - sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install" -} diff --git a/community-testing/tp_smapi/tp_smapi.install b/community-testing/tp_smapi/tp_smapi.install deleted file mode 100644 index 5fe1bab90..000000000 --- a/community-testing/tp_smapi/tp_smapi.install +++ /dev/null @@ -1,13 +0,0 @@ -extramodules=/usr/lib/modules/extramodules-3.5-ARCH - -post_install() { - depmod -v $(< "$extramodules/version") &>/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/ubuntuone-client/1339_1338.diff b/community-testing/ubuntuone-client/1339_1338.diff deleted file mode 100644 index cbd966a70..000000000 --- a/community-testing/ubuntuone-client/1339_1338.diff +++ /dev/null @@ -1,57 +0,0 @@ -=== modified file 'tests/platform/sync_menu/test_linux.py' ---- tests/platform/sync_menu/test_linux.py 2012-10-10 14:54:49 +0000 -+++ tests/platform/sync_menu/test_linux.py 2012-10-11 12:01:27 +0000 -@@ -124,6 +124,7 @@ - """Check that the dummy has the proper methods required by the API.""" - dummy = linux.DummySyncMenu('random', 'args') - self.assertIsInstance(dummy.update_transfers, Callable) -+ self.assertIsInstance(dummy.sync_status_changed, Callable) - - - class SyncMenuTestCase(TestCase): - -=== modified file 'ubuntuone/platform/sync_menu/linux.py' ---- ubuntuone/platform/sync_menu/linux.py 2012-10-10 17:06:14 +0000 -+++ ubuntuone/platform/sync_menu/linux.py 2012-10-11 13:00:10 +0000 -@@ -183,7 +183,7 @@ - self.timer.addCallback(self._timeout) - - --class TransfersMenu(Dbusmenu.Menuitem): -+class TransfersMenu(Dbusmenu.Menuitem if use_syncmenu else object): - """Menu that handles the recent and current transfers.""" - - def __init__(self, status_frontend): -@@ -227,7 +227,7 @@ - items_added = 0 - remove = [] - for item in self._uploading_items: -- if item in uploading_data: -+ if item in uploading_data.keys(): - size, written = uploading_data[item] - percentage = written * 100 / size - upload_item = self._uploading_items[item] -@@ -243,7 +243,7 @@ - for item in remove: - self._uploading_items.pop(item) - if items_added < 5: -- for item in uploading_data: -+ for item in uploading_data.keys(): - if item not in self._uploading_items and items_added < 5: - size, written = uploading_data[item] - percentage = written * 100 / size -@@ -270,4 +270,12 @@ - def update_transfers(self): - """Do nothing.""" - --UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux if use_syncmenu else DummySyncMenu -+ def sync_status_changed(self): -+ """Do nothing.""" -+ -+ -+if use_syncmenu: -+ UbuntuOneSyncMenu = UbuntuOneSyncMenuLinux -+else: -+ UbuntuOneSyncMenu = DummySyncMenu -+ TransfersMenu = None - diff --git a/community-testing/ubuntuone-client/PKGBUILD b/community-testing/ubuntuone-client/PKGBUILD deleted file mode 100644 index e2f8b8b43..000000000 --- a/community-testing/ubuntuone-client/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 78124 2012-10-16 11:54:37Z allan $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> - -pkgname=ubuntuone-client -pkgver=4.0.0 -pkgrel=2 -pkgdesc="Ubuntu One helps you store, sync and share files between your computers" -arch=('i686' 'x86_64') -url="https://launchpad.net/ubuntuone-client" -license=('GPL') -depends=('dbus-glib' 'python2-configglue' 'python2-distribute' 'libnotify' 'python2-gobject2' 'python2-pyinotify' 'python2-simplejson' 'ubuntu-sso-client' 'python2-ubuntuone-storageprotocol' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('intltool' 'imake' 'gobject-introspection') -options=('!libtool') -install=$pkgname.install -source=(http://launchpad.net/ubuntuone-client/stable-4-0/$pkgver/+download/$pkgname-$pkgver.tar.gz - 1339_1338.diff - fix-notify-hint.patch) -md5sums=('738039703d4dcf54518a725f8ffbc4de' - 'e82e80c229de06692988c1f938a34fb9' - '54dfeb2be011f0a12ea7cfa0f0c19bec') - -build() { - cd "$srcdir/$pkgname-$pkgver" - sed -i 's@^#!.*python$@#!/usr/bin/python2@' bin/* - - # Improve TransfersMenu declaration to avoid problems - patch -Np0 -i "$srcdir/1339_1338.diff" - - # Workaround for crash in notification-daemon - # https://bugzilla.gnome.org/show_bug.cgi?id=665166 - patch -Np1 -i "$srcdir/fix-notify-hint.patch" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ - --disable-static \ - PYTHON=python2 - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install - - # We don't have Apport in Arch Linux - rm -r "$pkgdir"/{etc/apport,usr/share/apport} -} diff --git a/community-testing/ubuntuone-client/fix-notify-hint.patch b/community-testing/ubuntuone-client/fix-notify-hint.patch deleted file mode 100644 index f32280de9..000000000 --- a/community-testing/ubuntuone-client/fix-notify-hint.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py ---- ubuntuone-client-4.0.0.orig/ubuntuone/platform/notification/linux.py 2012-06-19 15:51:01.000000000 +0200 -+++ ubuntuone-client-4.0.0/ubuntuone/platform/notification/linux.py 2012-10-15 01:14:01.019476818 +0200 -@@ -40,7 +40,7 @@ - - if 'gi' in sys.modules and sys.modules['gi'] is not None: - try: -- from gi.repository import Notify -+ from gi.repository import GLib, Notify - Notify # pyflakes - NOTIFY_MODULE = 'gi' - except ImportError: -@@ -85,5 +85,6 @@ - if append: - self.notification.set_hint_string('x-canonical-append', '') - -- self.notification.set_hint_int32('transient', int(True)) -+ if NOTIFY_MODULE == 'gi': -+ self.notification.set_hint('transient', GLib.Variant.new_boolean(1)) - self.notification.show() diff --git a/community-testing/ubuntuone-client/ubuntuone-client.install b/community-testing/ubuntuone-client/ubuntuone-client.install deleted file mode 100644 index 2c455e952..000000000 --- a/community-testing/ubuntuone-client/ubuntuone-client.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} diff --git a/community-testing/uniconvertor/PKGBUILD b/community-testing/uniconvertor/PKGBUILD deleted file mode 100644 index 6c15816af..000000000 --- a/community-testing/uniconvertor/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 78126 2012-10-16 11:54:43Z allan $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Roberto Alsina <ralsina@kde.org> - -pkgname=uniconvertor -pkgver=1.1.5 -pkgrel=6 -pkgdesc="A universal vector graphics translator using sK1 engine." -arch=('i686' 'x86_64') -url="http://sk1project.org/modules.php?name=Products&product=uniconvertor" -license=('GPL') -depends=('python2' 'python2-imaging' 'python2-reportlab' 'sk1libs') -makedepends=('gcc') -source=(http://uniconvertor.googlecode.com/files/uniconvertor-$pkgver.tar.gz) -md5sums=('d1272315a58304ece2ff588834e23f72') - -build() { - cd "$srcdir/uniconvertor-$pkgver" - - # python2 fix - sed -i 's_#! /usr/bin/python_#! /usr/bin/python2_' src/__init__.py - - python2 setup.py build -} - -package() { - cd "$srcdir/uniconvertor-$pkgver" - python2 setup.py install --root="$pkgdir" -} diff --git a/community-testing/uptimed/PKGBUILD b/community-testing/uptimed/PKGBUILD deleted file mode 100644 index a1b63299e..000000000 --- a/community-testing/uptimed/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 72563 2012-06-16 17:11:23Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Tom Killian <tomk@runbox.com> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=uptimed -pkgver=0.3.17 -pkgrel=2 -pkgdesc="A system uptime record daemon" -arch=(i686 x86_64) -url="http://podgorny.cz/uptimed/" -license=('GPL') -depends=('glibc' 'bash') -backup=(etc/uptimed.conf) -options=('!libtool') -install=$pkgname.install -source=(http://podgorny.cz/$pkgname/releases/$pkgname-$pkgver.tar.bz2 - rc.d - service) -md5sums=('528b62c33454b33537c3bf2366977bdb' - '4ae90bee9fc78014a889a5072effb735' - '657102b06613ddb9811427bee1973c6b') - -build() { - cd $srcdir/$pkgname-$pkgver - - # Change log path to Arch standard - for M in `ls M*`; do - sed -i "s|/var/spool/uptimed|$pkgdir/var/log/uptimed|" $M - done - sed -i 's|spool|log|' libuptimed/urec.h - - autoreconf - libtoolize --force - - ./configure --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make prefix=$pkgdir/usr sysconfdir=$pkgdir/etc install - - mv $pkgdir/etc/uptimed.conf-dist $pkgdir/etc/uptimed.conf - install -Dm755 $srcdir/rc.d $pkgdir/etc/rc.d/uptimed - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/uptimed.service -} diff --git a/community-testing/uptimed/rc.d b/community-testing/uptimed/rc.d deleted file mode 100644 index 6fe9ec3e3..000000000 --- a/community-testing/uptimed/rc.d +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/uptimed` -case "$1" in - start) - stat_busy "Starting Uptimed Daemon" - [ -z "$PID" ] && /usr/sbin/uptimed -b # create the boot record - if [ $? -gt 0 ] ; then - stat_fail - else - add_daemon uptimed # create the 'state' dir - /usr/sbin/uptimed # fire up the daemon - if [ $? -gt 0 ]; then - stat_fail - fi - stat_done - fi - ;; - stop) - stat_busy "Stopping Uptimed Daemon" - [ "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon uptimed # remove the 'state' dir - stat_done - fi - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/uptimed/service b/community-testing/uptimed/service deleted file mode 100644 index 2fd785318..000000000 --- a/community-testing/uptimed/service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=System uptime record daemon - -[Service] -Type=forking -PIDFile=/var/run/uptimed -ExecStartPre=/usr/sbin/uptimed -b -ExecStart=/usr/sbin/uptimed - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/uptimed/uptimed.install b/community-testing/uptimed/uptimed.install deleted file mode 100644 index 178061706..000000000 --- a/community-testing/uptimed/uptimed.install +++ /dev/null @@ -1,7 +0,0 @@ -# arg 1: the old package version -pre_remove() { - # clean up after ourselves - # - /bin/rm -rf /var/log/uptimed -} - diff --git a/community-testing/vdrift/PKGBUILD b/community-testing/vdrift/PKGBUILD deleted file mode 100644 index d869dfaa5..000000000 --- a/community-testing/vdrift/PKGBUILD +++ /dev/null @@ -1,61 +0,0 @@ -# $Id: PKGBUILD 75741 2012-08-30 16:56:01Z heftig $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: Lone_Wolf lonewolf@xs4all.nl - -pkgname=vdrift -pkgver=2012.07.22 -pkgrel=1 -pkgdesc="Open source driving simulation made with drift racing in mind" -arch=('i686' 'x86_64') -url="http://vdrift.net/" -license=('GPL') -depends=('bullet' 'curl' 'sdl_gfx' 'sdl_image' 'glew' 'libvorbis' 'vdrift-data' - 'gtk-update-icon-cache' 'hicolor-icon-theme' 'libarchive') -makedepends=('scons' 'boost' 'asio') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}.tar.bz2 - http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver//./-}c_patch.diff) -md5sums=('fcfd6b65724d32dfe383df216d7afb74' - '981cd26709f97cdf85100b720290177f') - -build() { - cd VDrift - - # select arch - if [ `uname -m` = "x86_64" ]; then - _sconsarch="a64" - else - _sconsarch="686" - fi - - patch -Np0 < $srcdir/$pkgname-${pkgver//./-}c_patch.diff - - # build and install - scons $MAKEFLAGS \ - "destdir"="$pkgdir" \ - "arch"=$_sconsarch \ - "release"=1 \ - "force_feedback"=1 \ - "prefix"=/usr \ - "datadir"=share/$pkgname/ \ - "extbullet"=1 -} - -package() { - cd VDrift - - scons install - - # install .desktop file - install -Dm644 $pkgname.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop - sed -i '1 s/^\xef\xbb\xbf//' "$pkgdir"/usr/share/applications/$pkgname.desktop # remove BOM (WHY IS THERE?) - - # install icons - install -Dm644 data/textures/icons/vdrift-16x16.png "$pkgdir"/usr/share/icons/hicolor/16x16/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-32x32.png "$pkgdir"/usr/share/icons/hicolor/32x32/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir"/usr/share/icons/hicolor/64x64/apps/vdrift.png - install -Dm644 data/textures/icons/vdrift-64x64.png "$pkgdir/usr/share/pixmaps/$pkgname.png" - - rm -r "$pkgdir"/usr/share/vdrift -} -# vim: sw=2:ts=2 et: diff --git a/community-testing/vdrift/vdrift.install b/community-testing/vdrift/vdrift.install deleted file mode 100644 index 868f6717b..000000000 --- a/community-testing/vdrift/vdrift.install +++ /dev/null @@ -1,11 +0,0 @@ -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_remove() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community-testing/vhba-module/60-vhba.rules b/community-testing/vhba-module/60-vhba.rules deleted file mode 100644 index e4de1dca7..000000000 --- a/community-testing/vhba-module/60-vhba.rules +++ /dev/null @@ -1,13 +0,0 @@ -ACTION=="remove", GOTO="vhba_end" -KERNEL!="vhba_ctl", GOTO="vhba_end" - -NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" - -TEST=="/sys/fs/cgroup/systemd", GOTO="vhba_uaccess" -TAG+="udev-acl" -GOTO="vhba_end" - -LABEL="vhba_uaccess" -TAG+="uaccess" - -LABEL="vhba_end" diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD deleted file mode 100644 index fbe5b31a7..000000000 --- a/community-testing/vhba-module/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 74539 2012-07-30 09:22:20Z heftig $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: Charles Lindsay <charles@chaoslizard.org> - -pkgname=vhba-module -pkgver=20120422 -_extramodules=extramodules-3.5-ARCH -pkgrel=6 -pkgdesc="Kernel module that emulates SCSI devices" -arch=('i686' 'x86_64') -url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('linux>=3.5' 'linux<3.6') -makedepends=('linux-headers') -options=(!makeflags) -install=$pkgname.install -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" - '60-vhba.rules') -md5sums=('d97372da1d270d1605742b2995fb6678' - 'b5e82d0160e7a181219b67c1794d5c27') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - _kernver="$(cat /usr/lib/modules/$_extramodules/version)" - - make KDIR=/usr/lib/modules/$_kernver/build -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm644 vhba.ko \ - "$pkgdir/usr/lib/modules/$_extramodules/vhba.ko" - - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ - "$startdir/vhba-module.install" - - install -Dm644 "$srcdir/60-vhba.rules" \ - "$pkgdir/usr/lib/udev/rules.d/60-vhba.rules" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install deleted file mode 100644 index 3704282a7..000000000 --- a/community-testing/vhba-module/vhba-module.install +++ /dev/null @@ -1,21 +0,0 @@ -_updatemod() { - echo " > Updating module dependencies..." - EXTRAMODULES='extramodules-3.5-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_install() { - post_upgrade -} - -post_upgrade() { - getent group cdemu &>/dev/null || groupadd cdemu - _updatemod -} - -post_remove() { - _updatemod - groupdel cdemu -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/virtkey/PKGBUILD b/community-testing/virtkey/PKGBUILD deleted file mode 100644 index 7d350b553..000000000 --- a/community-testing/virtkey/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: codl <codl@aquageek.net> -# Contributor: Megamixman <Megamixman@gmail.com> - -pkgbase=virtkey -pkgname=('python2-virtkey' 'python-virtkey') -pkgver=0.61.0 -pkgrel=2 -arch=('i686' 'x86_64') -url="https://launchpad.net/virtkey" -license=('LGPL') -makedepends=('python2' 'python' 'libxtst' 'gtk2') -source=(http://launchpad.net/$pkgbase/${pkgver%.*}/$pkgver/+download/$pkgbase-$pkgver.tar.gz) -md5sums=('536d30acb2c8ddadc6b4a26fc01e8390') - -build() { - cd "$srcdir" - - cp -a {,python2-}$pkgbase-$pkgver - - # Build python 2 module - cd "$srcdir/python2-$pkgbase-$pkgver" - python2 setup.py build - - # Build python 3 module - cd "$srcdir/$pkgbase-$pkgver" - python setup.py build -} - -package_python2-virtkey() { - pkgdesc="Python 2 extension for emulating keypresses and getting layout information from the X server" - depends=('python2' 'libxtst' 'gtk2') - - cd "$srcdir/python2-$pkgbase-$pkgver" - - python2 setup.py install --root=$pkgdir/ --optimize=1 -} - -package_python-virtkey() { - pkgdesc="Python extension for emulating keypresses and getting layout information from the X server" - depends=('python' 'libxtst' 'gtk2') - - cd "$srcdir/$pkgbase-$pkgver" - - python3 setup.py install --root=$pkgdir/ --optimize=1 -} diff --git a/community-testing/virtualbox-modules-lts/PKGBUILD b/community-testing/virtualbox-modules-lts/PKGBUILD deleted file mode 100644 index 493f7cc3a..000000000 --- a/community-testing/virtualbox-modules-lts/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 77089 2012-10-04 16:56:39Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=virtualbox-modules-lts -pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts') -pkgver=4.2.0 -pkgrel=3 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL') -makedepends=('linux-lts-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" - 'expac') - -build() { - # current kernel version - _kernver=$(expac -Q '%v' linux-lts-headers)-lts - # dkms need modification to be run as user - cp -r /var/lib/dkms . - echo "dkms_tree='$srcdir/dkms'" > dkms.conf - # build host modules - msg2 'Host modules' - dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" - # build guest modules - msg2 'Guest modules' - dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" -} - -package_virtualbox-host-modules-lts(){ - pkgdesc='Host kernel modules for VirtualBox' - depends=('linux-lts>=3.0' 'linux-lts<3.1') - replaces=('virtualbox-modules-lts') - conflicts=('virtualbox-modules-lts') - provides=("virtualbox-host-modules=$pkgver") - install=virtualbox-host-modules-lts.install - - _kernver=$(expac -Q '%v' linux-lts-headers)-lts - _extraver=extramodules-${_kernver%.*}-lts - - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" - cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install" -} - -package_virtualbox-guest-modules-lts(){ - pkgdesc='Guest kernel modules for VirtualBox' - license=('GPL') - depends=('linux-lts>=3.0' 'linux-lts<3.1') - replaces=('virtualbox-archlinux-modules-lts') - conflicts=('virtualbox-archlinux-modules-lts') - provides=("virtualbox-host-modules=$pkgver") - install=virtualbox-guest-modules-lts.install - - _kernver=$(expac -Q '%v' linux-lts-headers)-lts - _extraver=extramodules-${_kernver%.*}-lts - - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" - cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/virtualbox-modules-lts/build.sh b/community-testing/virtualbox-modules-lts/build.sh deleted file mode 100755 index 828448cab..000000000 --- a/community-testing/virtualbox-modules-lts/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if (( $# != 1 )); then - echo "usage: $0 extra" - echo " $0 testing" - exit 1 -fi - -$1-i686-build -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 - -$1-x86_64-build -makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -r /var/lib/archbuild/$1-x86_64 - - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install deleted file mode 100644 index d2984a743..000000000 --- a/community-testing/virtualbox-modules-lts/virtualbox-guest-modules-lts.install +++ /dev/null @@ -1,16 +0,0 @@ -EXTRAMODULES='extramodules-3.0-lts' - -post_install() { -cat << EOF -===> You may want to load vboxguest, vboxsf and vboxvideo -EOF - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install deleted file mode 100644 index 07ecf7311..000000000 --- a/community-testing/virtualbox-modules-lts/virtualbox-host-modules-lts.install +++ /dev/null @@ -1,18 +0,0 @@ -EXTRAMODULES='extramodules-3.0-lts' - -post_install() { -cat << EOF -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -EOF - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' -} - -post_remove() { - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD deleted file mode 100644 index 5cb7fc64d..000000000 --- a/community-testing/virtualbox-modules/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 78656 2012-10-22 13:29:39Z tpowa $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=virtualbox-modules -pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') -pkgver=4.2.2 -pkgrel=2 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL') -makedepends=('linux-headers' - "virtualbox-host-source>=$pkgver" - "virtualbox-guest-source>=$pkgver" - 'expac') - -build() { - # current kernel version - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH - # dkms need modification to be run as user - cp -r /var/lib/dkms . - echo "dkms_tree='$srcdir/dkms'" > dkms.conf - # build host modules - msg2 'Host modules' - dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" - # build guest modules - msg2 'Guest modules' - dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" -} - -package_virtualbox-host-modules(){ - pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.6' 'linux<3.7') - replaces=('virtualbox-modules') - conflicts=('virtualbox-modules') - install=virtualbox-host-modules.install - - _kernver=$(expac -Q '%v' linux-headers)-ARCH - # _kernver=3.6.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH - - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" - cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" -} - -package_virtualbox-guest-modules(){ - pkgdesc='Guest kernel modules for VirtualBox' - license=('GPL') - depends=('linux>=3.6' 'linux<3.7') - replaces=('virtualbox-archlinux-modules') - conflicts=('virtualbox-archlinux-modules') - install=virtualbox-guest-modules.install - - _kernver=$(expac -Q '%v' linux-headers)-ARCH - #_kernver=3.6.0-1-ARCH - _extraver=extramodules-${_kernver%.*}-ARCH - - install -dm755 "$pkgdir/usr/lib/modules/$_extraver" - cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" - install -m644 * "$pkgdir/usr/lib/modules/$_extraver" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" -} - -# vim:set ts=2 sw=2 et: diff --git a/community-testing/virtualbox-modules/build.sh b/community-testing/virtualbox-modules/build.sh deleted file mode 100755 index 828448cab..000000000 --- a/community-testing/virtualbox-modules/build.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -if (( $# != 1 )); then - echo "usage: $0 extra" - echo " $0 testing" - exit 1 -fi - -$1-i686-build -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 -linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 - -$1-x86_64-build -makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 -makechrootpkg -r /var/lib/archbuild/$1-x86_64 - - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/virtualbox-modules/virtualbox-guest-modules.install b/community-testing/virtualbox-modules/virtualbox-guest-modules.install deleted file mode 100644 index e5d1038af..000000000 --- a/community-testing/virtualbox-modules/virtualbox-guest-modules.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() { -cat << EOF -===> You may want to load vboxguest, vboxsf and vboxvideo -EOF - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/virtualbox-modules/virtualbox-host-modules.install b/community-testing/virtualbox-modules/virtualbox-host-modules.install deleted file mode 100644 index 3f2ed4a10..000000000 --- a/community-testing/virtualbox-modules/virtualbox-host-modules.install +++ /dev/null @@ -1,19 +0,0 @@ -post_install() { -cat << EOF -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -EOF - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_upgrade() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) - echo 'In order to use the new version, reload all virtualbox modules manually.' -} - -post_remove() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} diff --git a/community-testing/vnstat/PKGBUILD b/community-testing/vnstat/PKGBUILD deleted file mode 100644 index 773763a24..000000000 --- a/community-testing/vnstat/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 72564 2012-06-16 17:11:28Z dreisner $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Thorsten Töpper <atsutane-tu@freethoughts.de> - -pkgname=vnstat -pkgver=1.11 -pkgrel=3 -pkgdesc="A console-based network traffic monitor" -arch=('i686' 'x86_64') -url="http://humdi.net/vnstat/" -license=('GPL') -depends=('bash') -makedepends=('gd') -optdepends=('gd: image output') -backup=(etc/vnstat.conf) -source=(http://humdi.net/vnstat/$pkgname-$pkgver.tar.gz - http://humdi.net/vnstat/init.d/arch/vnstat - service) -md5sums=('a5a113f9176cd61fb954f2ba297f5fdb' - 'e89a566dd7514ff0d2d3fc77b2d4ca7e' - 'fcc189e3dee616ff414dac72637c1a19') - -build() { - cd $srcdir/$pkgname-$pkgver - make all -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - - install -D -m0755 $srcdir/vnstat $pkgdir/etc/rc.d/vnstat - install -Dm644 $srcdir/service $pkgdir/usr/lib/systemd/system/vnstat.service - - install -D -m0644 examples/vnstat.cron $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron - install -D -m0755 examples/vnstat.cgi $pkgdir/usr/share/doc/vnstat/examples/vnstat.cgi - sed -i 's#root##' $pkgdir/usr/share/doc/vnstat/examples/vnstat.cron -} diff --git a/community-testing/vnstat/service b/community-testing/vnstat/service deleted file mode 100644 index f312351ea..000000000 --- a/community-testing/vnstat/service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Network traffic monitor - -[Service] -ExecStart=/usr/sbin/vnstatd -n -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/vsftpd/PKGBUILD b/community-testing/vsftpd/PKGBUILD deleted file mode 100644 index c4208743b..000000000 --- a/community-testing/vsftpd/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 72565 2012-06-16 17:11:45Z dreisner $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Andreas Radke <andyrtr@archlinux.org> -# Contributor: judd <jvinet@zeroflux.org> - -pkgname=vsftpd -pkgver=3.0.0 -pkgrel=3 -pkgdesc="Very Secure FTP daemon" -arch=('i686' 'x86_64') -url="https://security.appspot.com/vsftpd.html" -license=('GPL2') -depends=('openssl') -backup=('etc/vsftpd.conf' 'etc/xinetd.d/vsftpd') -install=vsftpd.install -source=(https://security.appspot.com/downloads/${pkgname}-${pkgver}.tar.gz{,.asc} - vsftpd.xinetd vsftpd.d vsftpd-ssl.socket vsftpd.socket - vsftpd.service vsftpd@.service vsftpd-ssl.service vsftpd-ssl@.service) -sha1sums=('436da30cefa33e22a0266077ab95397e9432e297' - '2142ac8a84f18ecc1ebac21b9ac07858c35ae6af' - 'c87b4ce56dac15223694a6e86c01ea813b877596' - '24f268956c24e78be0c234c6d31f41487922eafe' - 'f81dab50243f7e82dc9722ca79b2b24de0882eb2' - '5b7a7a1e0c04acfcc2dba1346557f1193b9905ba' - 'f1fa8cfaab1541c1ce3bb4dab4f4b302e5c44b03' - '3a040a18893a5103a1d4a22e631ee247bde8c8d3' - '08b2938dc81ee200b6d733a32f5565b9dbe170a3' - 'e5bd183664008bb0cc0353d4efb2e8e92a365798') - -build() { - cd $srcdir/$pkgname-$pkgver - - # build-time config - sed \ - -e 's|^#undef VSF_BUILD_SSL$|#define VSF_BUILD_SSL|' \ - -i builddefs.h - - CFLAGS+=' -fPIE' LINK='' LDFLAGS="-fPIE -pie ${LDFLAGS} -Wl,-z,now" make -} - -package() { - cd $srcdir/$pkgname-$pkgver - - install -D -m755 vsftpd $pkgdir/usr/sbin/vsftpd - install -D -m644 vsftpd.conf $pkgdir/etc/vsftpd.conf - install -D -m644 vsftpd.8 $pkgdir/usr/share/man/man8/vsftpd.8 - install -D -m644 vsftpd.conf.5 $pkgdir/usr/share/man/man5/vsftpd.conf.5 - install -D -m644 $srcdir/vsftpd.xinetd $pkgdir/etc/xinetd.d/vsftpd - install -D -m755 $srcdir/vsftpd.d $pkgdir/etc/rc.d/vsftpd - - install -D -m644 $srcdir/vsftpd.service $pkgdir/usr/lib/systemd/system/vsftpd.service - install -D -m644 $srcdir/vsftpd@.service $pkgdir/usr/lib/systemd/system/vsftpd@.service - install -D -m644 $srcdir/vsftpd-ssl.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl.service - install -D -m644 $srcdir/vsftpd-ssl@.service $pkgdir/usr/lib/systemd/system/vsftpd-ssl@.service - install -D -m644 $srcdir/vsftpd.socket $pkgdir/usr/lib/systemd/system/vsftpd.socket - install -D -m644 $srcdir/vsftpd-ssl.socket $pkgdir/usr/lib/systemd/system/vsftpd-ssl.socket - - install -d -m755 $pkgdir/usr/share/empty -} diff --git a/community-testing/vsftpd/vsftpd-ssl.service b/community-testing/vsftpd/vsftpd-ssl.service deleted file mode 100644 index f46b05fcd..000000000 --- a/community-testing/vsftpd/vsftpd-ssl.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=vsftpd daemon (legacy implicit SSL) - -[Service] -ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes -oimplicit_ssl=yes -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/vsftpd/vsftpd-ssl.socket b/community-testing/vsftpd/vsftpd-ssl.socket deleted file mode 100644 index b18b639c1..000000000 --- a/community-testing/vsftpd/vsftpd-ssl.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Conflicts=vsftpd.service - -[Socket] -ListenStream=990 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/community-testing/vsftpd/vsftpd-ssl@.service b/community-testing/vsftpd/vsftpd-ssl@.service deleted file mode 100644 index e53fad324..000000000 --- a/community-testing/vsftpd/vsftpd-ssl@.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=vsftpd per-connection server (legacy implicit SSL) - -[Service] -ExecStart=-/usr/sbin/vsftpd -oimplicit_ssl=yes -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -StandardOutput=socket -StandardError=syslog diff --git a/community-testing/vsftpd/vsftpd.d b/community-testing/vsftpd/vsftpd.d deleted file mode 100644 index 27310855c..000000000 --- a/community-testing/vsftpd/vsftpd.d +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/bash - -daemon_name=vsftpd - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof -o %PPID $daemon_name -} - -case "$1" in - start) - stat_busy "Starting $daemon_name daemon" - - PID=$(get_pid) - if [ -z "$PID" ]; then - [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid - # RUN - $daemon_name & - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo $(get_pid) > /var/run/$daemon_name.pid - add_daemon $daemon_name - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping $daemon_name daemon" - PID=$(get_pid) - # KILL - [ ! -z "$PID" ] && kill $PID &> /dev/null - # - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/$daemon_name.pid &> /dev/null - rm_daemon $daemon_name - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $daemon_name status"; - ck_status $daemon_name - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" -esac - -exit 0 diff --git a/community-testing/vsftpd/vsftpd.install b/community-testing/vsftpd/vsftpd.install deleted file mode 100644 index 48f134e24..000000000 --- a/community-testing/vsftpd/vsftpd.install +++ /dev/null @@ -1,17 +0,0 @@ -# arg 1: the new package version -post_install() { - if [ -f lib/modules/`uname -r`/kernel/security/capability.ko ]; then - echo ">>> It appears that your current kernel has linux security" - echo ">>> capabilities built as a module. vsftpd requires this" - echo ">>> functionality to operate." - echo ">>>" - echo ">>> To activate the module, please load it now (modprobe capability)." - echo ">>> Also, you should add it to your MODULES array in rc.conf, so" - echo ">>> it will be activated automatically at boot-up." - fi -} - -post_upgrade() { - post_install $1 -} - diff --git a/community-testing/vsftpd/vsftpd.service b/community-testing/vsftpd/vsftpd.service deleted file mode 100644 index d4f7251ba..000000000 --- a/community-testing/vsftpd/vsftpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=vsftpd daemon - -[Service] -ExecStart=/usr/sbin/vsftpd -olisten_ipv6=yes -ExecReload=/bin/kill -HUP $MAINPID -KillMode=process - -[Install] -WantedBy=multi-user.target diff --git a/community-testing/vsftpd/vsftpd.socket b/community-testing/vsftpd/vsftpd.socket deleted file mode 100644 index cdc0d337e..000000000 --- a/community-testing/vsftpd/vsftpd.socket +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Conflicts=vsftpd.service - -[Socket] -ListenStream=21 -Accept=yes - -[Install] -WantedBy=sockets.target diff --git a/community-testing/vsftpd/vsftpd.xinetd b/community-testing/vsftpd/vsftpd.xinetd deleted file mode 100644 index eff2eb3db..000000000 --- a/community-testing/vsftpd/vsftpd.xinetd +++ /dev/null @@ -1,10 +0,0 @@ -service ftp -{ - socket_type = stream - wait = no - user = root - server = /usr/sbin/vsftpd - log_on_success += HOST DURATION - log_on_failure += HOST - disable = yes -} diff --git a/community-testing/vsftpd/vsftpd@.service b/community-testing/vsftpd/vsftpd@.service deleted file mode 100644 index 353f95f82..000000000 --- a/community-testing/vsftpd/vsftpd@.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=vsftpd per-connection server - -[Service] -ExecStart=-/usr/sbin/vsftpd -ExecReload=/bin/kill -HUP $MAINPID -StandardInput=socket -StandardError=syslog diff --git a/community-testing/warmux/PKGBUILD b/community-testing/warmux/PKGBUILD deleted file mode 100644 index 901d43506..000000000 --- a/community-testing/warmux/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 75742 2012-08-30 16:56:08Z heftig $ -# Contributor: Eric Belanger <eric@archlinux.org> -# Contributor: pukyxd -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> - -pkgname=warmux -pkgver=11.04.1 -pkgrel=5 -pkgdesc="A clone of the worms game" -arch=('i686' 'x86_64') -url="http://www.wormux.org/" -license=('GPL') -makedepends=('pkgconfig' 'libxml++' 'sdl_image' 'sdl_gfx>=2.0.24' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2') -replaces=('wormux') -source=(http://download.gna.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2 - include-zlib.patch - gcc-fix.patch) -md5sums=('26ff65c43a9bb61a3f0529c98b943e35' - 'c8285955e880f80e3c68312715a3061c' - 'ab50d613d3fa3f71262b1d2fc71641b1') - -build() { - cd "${srcdir}/${pkgname}-${pkgver/.1/}" - - # libpng 1.5 fix - patch -Np1 -i ../include-zlib.patch - # gcc fix - patch -Np1 -i ../gcc-fix.patch - - ./configure --prefix=/usr - make -} - -package() { - depends=('libxml++' 'sdl_image' 'sdl_gfx>=2.0.19' 'sdl_ttf' 'sdl_mixer' 'sdl_net' 'curl>=7.16.2' 'gcc-libs' 'libxml2' "warmux-data>=${pkgver/.1/}") - - cd "${srcdir}/${pkgname}-${pkgver/.1/}" - - make DESTDIR="${pkgdir}" install - rm -r ${pkgdir}/usr/share/warmux -} diff --git a/community-testing/warmux/gcc-fix.patch b/community-testing/warmux/gcc-fix.patch deleted file mode 100644 index 1ac476b92..000000000 --- a/community-testing/warmux/gcc-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -## i-love-you-lordheavy.patch [diff] -diff -ru warmux-11.04/lib/warmux/action/action.cpp warmux-11.04-new/lib/warmux/action/action.cpp ---- warmux-11.04/lib/warmux/action/action.cpp 2011-04-28 21:03:14.000000000 +0200 -+++ warmux-11.04-new/lib/warmux/action/action.cpp 2012-01-29 09:51:16.680251815 +0100 -@@ -81,7 +81,7 @@ - } - - // Build an action from a network packet --Action::Action(const char *buffer, DistantComputer* _creator) -+Action::Action(char *buffer, DistantComputer* _creator) - { - m_creator = _creator; - -diff -ru warmux-11.04/lib/warmux/include/WARMUX_action.h warmux-11.04-new/lib/warmux/include/WARMUX_action.h ---- warmux-11.04/lib/warmux/include/WARMUX_action.h 2011-04-28 21:03:13.000000000 +0200 -+++ warmux-11.04-new/lib/warmux/include/WARMUX_action.h 2012-01-29 09:52:14.246921833 +0100 -@@ -168,7 +168,7 @@ - Action(Action_t type, Double value1, Double value2); - - // Build an action from a network packet -- Action(const char* buffer, DistantComputer* _creator); -+ Action(char* buffer, DistantComputer* _creator); - - ~Action(); - -Description: Fix FTBFS with gcc 4.7. -Author: Felix Geyer <debfx-pkg@fobos.de> - ---- warmux-11.04.1+repack.orig/tools/list_games/main.cpp -+++ warmux-11.04.1+repack/tools/list_games/main.cpp -@@ -1,4 +1,5 @@ - #include <stdio.h> -+#include <unistd.h> - #include <WARMUX_types.h> - #include <WARMUX_network.h> - #include <WARMUX_index_server.h> diff --git a/community-testing/warmux/include-zlib.patch b/community-testing/warmux/include-zlib.patch deleted file mode 100644 index c7e77aba1..000000000 --- a/community-testing/warmux/include-zlib.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp ---- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 -+++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 -@@ -25,6 +25,7 @@ - #include <SDL_image.h> - #include <SDL_rotozoom.h> - #include <png.h> -+#include <zlib.h> - - #include "graphic/surface.h" - #include "tool/math_tools.h" diff --git a/community-testing/warzone2100/PKGBUILD b/community-testing/warzone2100/PKGBUILD deleted file mode 100644 index 0fbaa7e37..000000000 --- a/community-testing/warzone2100/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 77388 2012-10-09 14:04:20Z lcarlier $ -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: Angelo Theodorou <encelo@users.sourceforge.net> - -pkgname=warzone2100 -pkgver=2.3.9 -pkgrel=3 -pkgdesc="3D realtime strategy game on a future Earth" -url="http://wz2100.net/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('sdl' 'openal' 'libpng' 'libvorbis' 'libtheora' 'physfs' 'quesoglc' 'popt' 'ttf-dejavu') -makedepends=('gawk' 'bison' 'flex' 'zip' 'unzip' 'asciidoc') -source=(#"http://downloads.sourceforge.net/project/warzone2100/releases/${pkgver}/${pkgname}-${pkgver}.tar.gz" - "http://downloads.sourceforge.net/project/warzone2100/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz") -md5sums=('7185090a089c9c0e0eca7535a8f25dca') - -build() { - cd ${pkgname}-${pkgver} - - ./configure --prefix=/usr --with-distributor="Arch linux" - - make -} - -package() { - cd ${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install -} diff --git a/community-testing/wesnoth/PKGBUILD b/community-testing/wesnoth/PKGBUILD deleted file mode 100644 index 7dd4f3584..000000000 --- a/community-testing/wesnoth/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 73779 2012-07-15 13:21:13Z ibiru $ -# 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-testing/wesnoth/boost_foreach.patch b/community-testing/wesnoth/boost_foreach.patch deleted file mode 100644 index 95b98828e..000000000 --- a/community-testing/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-testing/wesnoth/wesnoth.install b/community-testing/wesnoth/wesnoth.install deleted file mode 100644 index 4f1e419ae..000000000 --- a/community-testing/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-testing/wesnoth/wesnoth.tmpfiles.conf b/community-testing/wesnoth/wesnoth.tmpfiles.conf deleted file mode 100644 index 3ec0f6013..000000000 --- a/community-testing/wesnoth/wesnoth.tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -D /run/wesnothd 0700 root root - diff --git a/community-testing/wesnoth/wesnothd.rc.d b/community-testing/wesnoth/wesnothd.rc.d deleted file mode 100755 index 95e312b7b..000000000 --- a/community-testing/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-testing/widelands/6233_6232.diff b/community-testing/widelands/6233_6232.diff deleted file mode 100644 index f82477607..000000000 --- a/community-testing/widelands/6233_6232.diff +++ /dev/null @@ -1,59 +0,0 @@ -=== modified file 'src/graphic/graphic.cc' ---- src/graphic/graphic.cc 2011-11-30 21:38:37 +0000 -+++ src/graphic/graphic.cc 2012-02-19 17:10:12 +0000 -@@ -725,6 +725,18 @@ - if (!png_ptr) - throw wexception("Graphic::save_png: could not create png struct"); - -+ png_infop info_ptr = png_create_info_struct(png_ptr); -+ if (!info_ptr) { -+ png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); -+ throw wexception("Graphic::save_png: could not create png info struct"); -+ } -+ -+ // Set jump for error -+ if (setjmp(png_jmpbuf(png_ptr))) { -+ png_destroy_write_struct(&png_ptr, &info_ptr); -+ throw wexception("Graphic::save_png: Error writing PNG!"); -+ } -+ - // Set another write function. This is potentially dangerouse because the - // flush function is internally called by png_write_end(), this will crash - // on newer libpngs. See here: -@@ -736,35 +748,14 @@ - sw, - &Graphic::m_png_write_function, &Graphic::m_png_flush_function); - -- png_infop info_ptr = png_create_info_struct(png_ptr); -- -- if (!info_ptr) { -- png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(0)); -- throw wexception("Graphic::save_png: could not create png info struct"); -- } -- -- // Set jump for error -- if (setjmp(png_jmpbuf(png_ptr))) { -- png_destroy_write_struct(&png_ptr, &info_ptr); -- throw wexception("Graphic::save_png: could not set png setjmp"); -- } -- - // Fill info struct - png_set_IHDR - (png_ptr, info_ptr, pix.get_w(), pix.get_h(), - 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - -- // png_set_strip_16(png_ptr) ; -- - // Start writing - png_write_info(png_ptr, info_ptr); -- -- // Strip data down -- png_set_filler(png_ptr, 0, PNG_FILLER_AFTER); -- -- png_set_packing(png_ptr); -- - { - uint32_t surf_w = pix.get_w(); - uint32_t surf_h = pix.get_h(); - diff --git a/community-testing/widelands/PKGBUILD b/community-testing/widelands/PKGBUILD deleted file mode 100644 index fad42b7a9..000000000 --- a/community-testing/widelands/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 75743 2012-08-30 16:56:23Z heftig $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Arkham <arkham at archlinux dot us> -# Contributor: Christoph Zeiler <rabyte*gmail> - -pkgname=widelands -pkgver=17 -_realver=build17 -pkgrel=4 -pkgdesc="A realtime strategy game with emphasis on economy and transport" -arch=('i686' 'x86_64') -url="http://widelands.org/" -license=('GPL') -depends=('sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'sdl_gfx' 'lua' 'glew' 'python2' 'widelands-data') -makedepends=('cmake' 'boost') -source=("https://launchpad.net/widelands/build17/build-17/+download/$pkgname-$_realver-src.tar.bz2" - $pkgname.desktop - $pkgname.png - $pkgname.sh) -md5sums=('bdc9bc0aa631af1aa7fb450507611a58' - '15820bf099fd6f16251fe70a75c534bb' - '3dfda7e9ca76ca00dd98d745d0ceb328' - '7cae50aba5ed0cd2cfeea79124637b46') - -build() { - cd $srcdir/$pkgname-$_realver-src - - sed -i "1 i #include <unistd.h>" src/main.cc - - mkdir -p build/compile && cd build/compile - - cmake ../.. -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_PREFIX=/usr \ - -DWL_INSTALL_DATADIR=share/$pkgname \ - -DWL_INSTALL_BINDIR=bin - make -} - -package() { - cd $srcdir/$pkgname-$_realver-src/build/compile - - make DESTDIR="$pkgdir" install - - rm -r $pkgdir/usr/share/widelands/{campaigns,fonts,global,locale,maps,music,pics,scripting,sound,tribes,txts,worlds} - - # Install bin, icon and desktop file - #install -Dm 755 src/$pkgname $pkgdir/usr/share/$pkgname/$pkgname - #install -Dm 755 $srcdir/$pkgname.sh $pkgdir/usr/bin/$pkgname - install -Dm644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png - install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop -} diff --git a/community-testing/widelands/widelands-0.16-libpng15.patch b/community-testing/widelands/widelands-0.16-libpng15.patch deleted file mode 100644 index 9f733e7b9..000000000 --- a/community-testing/widelands/widelands-0.16-libpng15.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- src/graphic/SDL_mng.cc -+++ src/graphic/SDL_mng.cc -@@ -276,7 +276,7 @@ - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in png_create_read_struct() earlier. - */ -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - SDL_SetError("Error reading the PNG file."); - goto done; - } -@@ -356,9 +356,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int const s = (info_ptr->channels == 4) ? 0 : 8; -+ int const s = (png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -369,7 +369,7 @@ - SDL_AllocSurface - (SDL_SWSURFACE, - width, height, -- bit_depth * info_ptr->channels, -+ bit_depth * png_get_channels(png_ptr, info_ptr), - Rmask, Gmask, Bmask, Amask); - if (not surface) { - SDL_SetError("Out of memory"); -@@ -407,6 +407,9 @@ - /* read rest of file, get additional chunks in info_ptr - REQUIRED */ - png_read_end(png_ptr, info_ptr); - -+ png_colorp png_palette; -+ int png_num_palette; -+ - /* Load the palette, if any */ - if ((palette = surface->format->palette)) { - if (color_type == PNG_COLOR_TYPE_GRAY) { -@@ -416,12 +419,12 @@ - palette->colors[i].g = i; - palette->colors[i].b = i; - } -- } else if (info_ptr->num_palette > 0) { -- palette->ncolors = info_ptr->num_palette; -- for (uint32_t i = 0; i < info_ptr->num_palette; ++i) { -- palette->colors[i].b = info_ptr->palette[i].blue; -- palette->colors[i].g = info_ptr->palette[i].green; -- palette->colors[i].r = info_ptr->palette[i].red; -+ } else if (png_num_palette > 0) { -+ palette->ncolors = png_num_palette; -+ for (uint32_t i = 0; i < png_num_palette; ++i) { -+ palette->colors[i].b = png_palette[i].blue; -+ palette->colors[i].g = png_palette[i].green; -+ palette->colors[i].r = png_palette[i].red; - } - } - } diff --git a/community-testing/widelands/widelands-build15-gcc-4.5-patch b/community-testing/widelands/widelands-build15-gcc-4.5-patch deleted file mode 100644 index 6ba313358..000000000 --- a/community-testing/widelands/widelands-build15-gcc-4.5-patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-07-01 21:15:56.000000000 +0000 -@@ -113,7 +113,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Map::button_clicked, *this, 4, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -142,7 +142,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name - ()); - break; - } -diff -Naur widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc ---- widelands-from/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-16 15:41:22.000000000 +0000 -+++ widelands-to/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-07-01 21:17:39.000000000 +0000 -@@ -272,7 +272,7 @@ - posx, posy, width, height, - g_gr->get_picture(PicMod_UI, "pics/but1.png"), - &Main_Menu_New_Random_Map::button_clicked, *this, 8, -- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - posy += height + spacing + spacing + spacing; - -@@ -343,7 +343,7 @@ - if (m_currentworld == m_worlds.size()) - m_currentworld = 0; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - break; - case 9: - break; -@@ -476,7 +476,7 @@ - (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str())) - ++m_currentworld; - m_world->set_title -- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name()); -+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name()); - - button_clicked(-1); // Update other values in UI as well - diff --git a/community-testing/widelands/widelands.desktop b/community-testing/widelands/widelands.desktop deleted file mode 100644 index 9715d816c..000000000 --- a/community-testing/widelands/widelands.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=Widelands -GenericName=Widelands -Comment=Realtime strategy game -Icon=widelands -Exec=widelands -Type=Application -Categories=Game;StrategyGame; diff --git a/community-testing/widelands/widelands.png b/community-testing/widelands/widelands.png Binary files differdeleted file mode 100644 index c329cf667..000000000 --- a/community-testing/widelands/widelands.png +++ /dev/null diff --git a/community-testing/widelands/widelands.sh b/community-testing/widelands/widelands.sh deleted file mode 100644 index 0b21a1694..000000000 --- a/community-testing/widelands/widelands.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /usr/share/widelands -./widelands $* diff --git a/community-testing/wt/PKGBUILD b/community-testing/wt/PKGBUILD deleted file mode 100644 index 237931b50..000000000 --- a/community-testing/wt/PKGBUILD +++ /dev/null @@ -1,57 +0,0 @@ -# $Id: PKGBUILD 73780 2012-07-15 13:21:16Z ibiru $ -# 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/wxgtk2.9/PKGBUILD b/community-testing/wxgtk2.9/PKGBUILD deleted file mode 100644 index fe95f3850..000000000 --- a/community-testing/wxgtk2.9/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 74023 2012-07-18 04:18:41Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=wxgtk2.9 -pkgver=2.9.4 -pkgrel=1 -pkgdesc="GTK+ implementation of wxWidgets API for GUI" -arch=('i686' 'x86_64') -url="http://wxwidgets.org" -license=('custom:wxWindows') -depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm') -makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa') -source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch) -sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1' - 'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3') - -build() { - cd "${srcdir}/wxWidgets-${pkgver}" - patch -p1 -i ../wxGTK-2.9.4-collision.patch - ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \ - --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \ - --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \ - --disable-precomp-headers - make - make -C locale allmo -} - -package() { - cd "${srcdir}/wxWidgets-${pkgver}" - make DESTDIR="${pkgdir}" install - rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo" - install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community-testing/wxgtk2.9/wxGTK-2.9.4-collision.patch b/community-testing/wxgtk2.9/wxGTK-2.9.4-collision.patch deleted file mode 100644 index 4b1fb395e..000000000 --- a/community-testing/wxgtk2.9/wxGTK-2.9.4-collision.patch +++ /dev/null @@ -1,77 +0,0 @@ -Prevent file collisions between multiple installed SLOTs. - - - Don't install wxwin.m4. It is installed with app-admin/eselect-wxwidgets. - - Version the bakefile preset filenames. Unversioned symlinks to these files - are handled by eselect. - - Version wx-config and wxrc. The unversioned forms are wrapper scripts - installed with eselect-wxwidgets. - - Version wxstd.mo and modify AddStdCatalog to use it. - ---- a/Makefile.in -+++ b/Makefile.in -@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \ - all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname) - - install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) -- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal -- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) - $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets -- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) -+ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \ -+ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \ -+ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done) - $(DYLIB_RPATH_INSTALL) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx - for f in setup.h $(RCDEFS_H); do \ -@@ -14964,15 +14964,16 @@ install-wxconfig: - $(INSTALL_DIR) $(DESTDIR)$(bindir) - $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config -- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) -- -+ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \ -+ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE)) - locale_install: - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale - for l in $(LOCALE_LINGUAS) ; do \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ - $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ - if test -f $(srcdir)/locale/$$l.mo ; then \ -- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ -+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \ -+ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ - fi ; \ - done - ---- a/build/bakefiles/wx.bkl -+++ b/build/bakefiles/wx.bkl -@@ -138,7 +138,7 @@ - <using module="gettext"/> - <gettext-catalogs id="locale"> - <srcdir>$(SRCDIR)/locale</srcdir> -- <catalog-name>wxstd</catalog-name> -+ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name> - <linguas> - ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk - zh zh_CN zh_TW ---- a/src/common/translation.cpp -+++ b/src/common/translation.cpp -@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c - - bool wxTranslations::AddStdCatalog() - { -- if ( !AddCatalog(wxS("wxstd")) ) -+ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) ) - return false; - - // there may be a catalog with toolkit specific overrides, it is not ---- a/utils/wxrc/Makefile.in -+++ b/utils/wxrc/Makefile.in -@@ -124,7 +124,6 @@ distclean: clean - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) - @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir) - @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE) --@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT)) - - @COND_USE_XRC_1@uninstall_wxrc: - @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) diff --git a/community-testing/xbmc/ChangeLog b/community-testing/xbmc/ChangeLog deleted file mode 100644 index 66ae97e3b..000000000 --- a/community-testing/xbmc/ChangeLog +++ /dev/null @@ -1,69 +0,0 @@ -2010-04-10 BlackEagle <ike DOT devolder AT gmail DOT com> - * 9.11-15 : - Made it back compliant with FHS ( thx pierre for pointing that out ) - namcap checked and modified to fit its needs as far as it was possible - -2009-03-07 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-10 : - Try and fix some autoconf issues (thanks Gentoo ebuild). - -2009-02-08 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-9 : - Replace some libtool 'ltmain.sh' scripts with the one from libtool - installed with Arch. - Make sure XBMCTex isn't linked to OpenGL libraries or it will segfault - on systems using the nvidia driver. - -2009-01-30 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-8 : - Fix some include's so that gcc 4.3.x is happy, shouldn't complain about - undefined '::realloc' anymore. - Remove Mac OS X specific files. - -2009-01-25 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-7 : - Moved libcdio, pmount, smbclient and unrar to optdepends. - Removed unneeded dependency on sdl_gfx. - Removed dependency on libpng as sdl_image depends on it. - -2008-12-14 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-6 : - Added libpng to dependency list. - Added gawk to dependency list. - Removed '--disable-mms' and '--enable-halmount' configure flags as they - are not mentioned as supported in the configure script. - -2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-5 : - Added libmad to the dependency list. - Streamripper 1.64.0+ does not include tre anymore, removed streamripper - and added tre instead. - Removed subversion from makedepends. - -2008-12-06 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-4 : - Fix permissions for some more scripts, ffmpeg/texi2doc.pl should not - fail any longer. - -2008-12-05 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-3 : - Added lirc to the optdepends array. - -2008-11-26 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-2 : - Added install file which informs users that a display depth of at - least 24-bit is required. - -2008-11-17 [vEX] <niechift.dot.vex.at.gmail.dot.com> - - * 8.10-1 : - Initial package, based on previous work by Zeqadious. diff --git a/community-testing/xbmc/PKGBUILD b/community-testing/xbmc/PKGBUILD deleted file mode 100644 index 1cefe9cee..000000000 --- a/community-testing/xbmc/PKGBUILD +++ /dev/null @@ -1,107 +0,0 @@ -# $Id: PKGBUILD 77308 2012-10-08 15:42:04Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Brad Fanella <bradfanella@archlinux.us> -# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com> -# Contributor: Zeqadious <zeqadious.at.gmail.dot.com> -# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com > - -_prefix=/usr - -pkgname=xbmc -pkgver=11.0 -pkgrel=8 -pkgdesc="A software media player and entertainment hub for digital media" -arch=('i686' 'x86_64') -url="http://xbmc.org" -license=('GPL' 'custom') -depends=('libpulse' 'hicolor-icon-theme' 'fribidi' 'lzo2' 'smbclient' 'libtiff' 'libva' - 'libpng' 'libcdio' 'yajl' 'libmysqlclient' 'libjpeg-turbo' 'libsamplerate' - 'glew' 'libssh' 'libmicrohttpd' 'libxrandr' 'sdl_mixer' 'sdl_image' 'python2' - 'libass' 'libmpeg2' 'libmad' 'libmodplug' 'jasper' 'rtmpdump' 'unzip' 'mesa-demos' - 'xorg-xdpyinfo' 'libbluray' 'libnfs' 'afpfs-ng' 'libshairport' 'avahi' 'bluez' 'glu') -makedepends=('boost' 'cmake' 'gperf' 'nasm' 'libxinerama' 'zip' 'vdpau-video' 'libcec' - 'udisks' 'upower' 'bluez') -optdepends=('libcec: support for Pulse-Eight USB-CEC adapter' - 'vdpau-video: accelerated video playback for nvidia cards' - 'xvba-video: accelerated video playback for amd cards' - 'pulseaudio: pulseaudio support' - 'lirc: remote controller support' - 'udisks: automount external drives' - 'upower: used to trigger suspend functionality' - 'unrar: access compressed files without unpacking them') -install="${pkgname}.install" -source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz") -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') -sha256sums=('1fe5d310c16138f26e2b13bc545604e95f48ace6c8636f23e77da402cd7b0b19') - -build() { - cd "${srcdir}/xbmc-$pkgver" - - # fix lsb_release dependency - sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp - - # Bootstrapping XBMC - ./bootstrap - - # Configuring XBMC - export PYTHON_VERSION=2 # external python v2 - ./configure --prefix=$_prefix --exec-prefix=$_prefix \ - --disable-debug \ - --enable-optimizations \ - --enable-gl \ - --enable-sdl \ - --enable-vaapi \ - --enable-vdpau \ - --enable-xvba \ - --enable-joystick \ - --enable-xrandr \ - --enable-rsxs \ - --enable-projectm \ - --enable-x11 \ - --enable-pulse \ - --enable-rtmp \ - --enable-samba \ - --enable-nfs \ - --enable-afpclient \ - --enable-airplay \ - --enable-airtunes \ - --enable-ffmpeg-libvorbis \ - --enable-dvdcss \ - --disable-hal \ - --enable-avahi \ - --enable-webserver \ - --enable-optical-drive \ - --enable-libbluray \ - --enable-texturepacker \ - --enable-udev \ - --enable-libusb \ - --enable-libcec \ - --enable-external-libraries \ - --disable-external-ffmpeg - # Now (finally) build - make -} - -package() { - cd "${srcdir}/xbmc-$pkgver" - # Running make install - make DESTDIR="${pkgdir}" install - - # run feh with python2 - sed -i -e 's/python/python2/g' ${pkgdir}${_prefix}/bin/xbmc - - # lsb_release fix - sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc" - sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/ \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc" - - # Tools - install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr" - install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/" - - # Licenses - install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}" - for licensef in LICENSE.GPL copying.txt; do - mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}" - done -} -# vim:set ts=2 sw=2 et: diff --git a/community-testing/xbmc/xbmc.install b/community-testing/xbmc/xbmc.install deleted file mode 100644 index 862508e73..000000000 --- a/community-testing/xbmc/xbmc.install +++ /dev/null @@ -1,15 +0,0 @@ -post_install() { - [[ $(type -p gtk-update-icon-cache) ]] && usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor - [[ $(type -p update-desktop-database) ]] && usr/bin/update-desktop-database -q usr/share/applications - true -} - -post_upgrade() { - post_install $1 - true -} - -post_remove() { - post_install $1 - true -} diff --git a/community-testing/xlockmore/LICENSE b/community-testing/xlockmore/LICENSE deleted file mode 100644 index f0b9aa9c6..000000000 --- a/community-testing/xlockmore/LICENSE +++ /dev/null @@ -1,18 +0,0 @@ -/*- - * xscreensaver compatibility layer for xlockmore modules. - * xscreensaver, Copyright (c) 1997, 1998 Jamie Zawinski <jwz@jwz.org> - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation. No representations are made about the suitability of this - * software for any purpose. It is provided "as is" without express or - * implied warranty. - * - * This file, along with xlockmore.h, make it possible to compile an xlockmore - * module into a standalone program, and thus use it with xscreensaver. - * By Jamie Zawinski <jwz@jwz.org> on 10-May-97; based on the ideas - * in the older xlock.h by Charles Hannum <mycroft@ai.mit.edu>. (I had - * to redo it, since xlockmore has diverged so far from xlock...) - */ diff --git a/community-testing/xlockmore/PKGBUILD b/community-testing/xlockmore/PKGBUILD deleted file mode 100644 index fc3d8b336..000000000 --- a/community-testing/xlockmore/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 77304 2012-10-08 15:13:08Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: dorphell <dorphell@archlinux.org> - -pkgname=xlockmore -pkgver=5.40 -pkgrel=2 -pkgdesc="screen saver / locker for the X Window System" -arch=(i686 x86_64) -license=('BSD') -depends=(freetype2 gtk2 libxpm lesstif pam mesa libxmu glu) -url="http://www.tux.org/~bagleyd/xlockmore.html" -options=('!makeflags') -source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2 - LICENSE) -md5sums=('47a8e16c485da7b0ebfa3f3e43300189' - 'a64afab4283f53972a6702c2e59850d7') - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --disable-setuid \ - --enable-appdefaultdir=/usr/share/X11/app-defaults \ - --enable-pam --with-gtk2 --without-esound --without-ftgl - make - make xapploaddir=$pkgdir/usr/share/X11/app-defaults \ - mandir=$pkgdir/usr/man/man1 \ - prefix=$pkgdir/usr install - install -D -m644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE - mv $pkgdir/usr/man $pkgdir/usr/share/ -} 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-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch deleted file mode 100644 index d4508c916..000000000 --- a/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001 -From: Thomas Dziedzic <gostrc@gmail.com> -Date: Wed, 3 Oct 2012 06:51:21 -0700 -Subject: [PATCH] Update usage of catch to catchIOError since catch has been - removed from System.IO.Error in ghc 7.6.1 - ---- - src/Plugins/Monitors/Bright.hs | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs -index 499e5bc..b5ec4c0 100644 ---- a/src/Plugins/Monitors/Bright.hs -+++ b/src/Plugins/Monitors/Bright.hs -@@ -20,6 +20,7 @@ import Data.Char - import System.FilePath ((</>)) - import System.Posix.Files (fileExist) - import System.Console.GetOpt -+import System.IO.Error (catchIOError) - - data BrightOpts = BrightOpts - { subDir :: String -@@ -101,7 +102,7 @@ readBright files = - maxVal <- grab $ (fMax files) - return $ (currVal / maxVal) - where -- grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) -+ grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0) - - - showHorizontalBar :: Float -> Monitor String --- -1.7.12.2 - diff --git a/community-testing/xmobar/PKGBUILD b/community-testing/xmobar/PKGBUILD deleted file mode 100644 index 25e6e53e1..000000000 --- a/community-testing/xmobar/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 77032 2012-10-03 15:25:55Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Arch Haskell Team <arch-haskell@haskell.org> - -pkgname=xmobar -pkgver=0.16 -pkgrel=1 -pkgdesc="A Minimalistic Text Based Status Bar" -url="http://hackage.haskell.org/package/xmobar" -license=('custom:BSD3') -arch=('i686' 'x86_64') -depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr') -makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string' - 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2') -options=('strip') -#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-builddep.patch) -# Use Git snapshot for Ghc 7.6.1 rebuild -source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz -0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch) - -build() { - cd ${srcdir}/xmobar - patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch - - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" - runhaskell Setup build -} - -package() { - cd ${srcdir}/xmobar - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} - -md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' - 'ffd6079c879f3b6ff7208a846d6ee241' - '149583c19ac3d0ad829f3138342bb9db') diff --git a/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch b/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch deleted file mode 100644 index bee3dc354..000000000 --- a/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur xmobar-0.15.old/xmobar.cabal xmobar-0.15/xmobar.cabal ---- xmobar-0.15.old/xmobar.cabal 2012-06-11 17:04:21.422444926 +0000 -+++ xmobar-0.15/xmobar.cabal 2012-06-11 17:05:16.772001865 +0000 -@@ -112,7 +112,7 @@ - time, - filepath, - X11 == 1.6.*, -- mtl == 2.0.*, -+ mtl >= 2.0 && <2.2, - parsec == 3.1.*, - stm == 2.3.* - diff --git a/community-testing/xmonad-contrib/PKGBUILD b/community-testing/xmonad-contrib/PKGBUILD deleted file mode 100644 index 71a84cdfe..000000000 --- a/community-testing/xmonad-contrib/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# $Id: PKGBUILD 77034 2012-10-03 15:26:13Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: orbisvicis <gmail.com> - -pkgname=xmonad-contrib -pkgver=0.10 -pkgrel=5 -pkgdesc="Add-ons for xmonad" -arch=('i686' 'x86_64') -url="http://xmonad.org/" -license=('BSD') -depends=('ghc=7.6.1' 'xmonad=0.10-5' 'sh' 'haskell-x11=1.6.0.2' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1-3') -install='xmonad-contrib.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch) -md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81' - '32163aaeb3424cf73bf831640c162a8a') - -build() { - cd $srcdir/$pkgname-$pkgver - # Patch xmonad-contrib to support haskell-x11 - patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch - - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh - runhaskell Setup.lhs copy --destdir=$pkgdir - install -D LICENSE $pkgdir/usr/share/licenses/xmonad-contrib/LICENSE -} diff --git a/community-testing/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community-testing/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch deleted file mode 100644 index 8372b4144..000000000 --- a/community-testing/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch +++ /dev/null @@ -1,46 +0,0 @@ -Tue Mar 20 03:53:11 FET 2012 Adam Vogt <vogt.adam@gmail.com> - * Bump version to 0.10.1 - - Raising the X11 dependency while keeping the xmonad version the same leads to - problems where cabal install uses the dependency versions following hackage, - not what is installed. -diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal -index 743bdc8..0fbf4ac 100644 ---- a/xmonad-contrib.cabal -+++ b/xmonad-contrib.cabal -@@ -61,7 +61,7 @@ library - extensions: ForeignFunctionInterface - cpp-options: -DXFT - -- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string -+ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string - - if true - ghc-options: -fwarn-tabs -Wall -diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs -index a485d95..5e388e2 100644 ---- a/XMonad/Layout/Spiral.hs -+++ b/XMonad/Layout/Spiral.hs -@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral ( - ) where - - import Data.Ratio --import XMonad -+import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..)) - import XMonad.StackSet ( integrate ) - - -- $usage -diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs -index 0d78653..4b7fd3b 100644 ---- a/XMonad/Util/Paste.hs -+++ b/XMonad/Util/Paste.hs -@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage - where - - import XMonad (io, theRoot, withDisplay, X ()) --import Graphics.X11 -+import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode) -+import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask) - import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent) - import Control.Monad.Reader (asks) - import XMonad.Operations (withFocused) diff --git a/community-testing/xmonad-contrib/xmonad-contrib.install b/community-testing/xmonad-contrib/xmonad-contrib.install deleted file mode 100644 index e9208c833..000000000 --- a/community-testing/xmonad-contrib/xmonad-contrib.install +++ /dev/null @@ -1,17 +0,0 @@ -HS_DIR=usr/share/haskell/xmonad-contrib - -post_install() { - ${HS_DIR}/register.sh -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} diff --git a/community-testing/xmonad/PKGBUILD b/community-testing/xmonad/PKGBUILD deleted file mode 100644 index 2ed9c2a9f..000000000 --- a/community-testing/xmonad/PKGBUILD +++ /dev/null @@ -1,53 +0,0 @@ -# $Id: PKGBUILD 77033 2012-10-03 15:26:06Z tdziedzic $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> -# Contributor: shild <shildv@gmail.com> - -pkgname=xmonad -pkgver=0.10 -pkgrel=5 -pkgdesc="Lightweight X11 tiled window manager written in Haskell" -arch=('i686' 'x86_64') -url="http://xmonad.org/" -license=('BSD') -depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions') -makedepends=('setconf' 'gendesk') -optdepends=('xorg-xmessage: for displaying visual error messages') -install='xmonad.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - xmonad.svg xmonad-0.10-x11-1.6.patch) - -build() { - cd "$srcdir" - ghc-pkg list - gendesk - - cd $srcdir/$pkgname-$pkgver - # Patch XMonad so we support haskell 1.6 - patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch - - - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd $srcdir/$pkgname-$pkgver - install -D -m744 register.sh $pkgdir/usr/share/haskell/$pkgname/register.sh - install -m744 unregister.sh $pkgdir/usr/share/haskell/$pkgname/unregister.sh - runhaskell Setup.lhs copy --destdir=$pkgdir - #runhaskell util/GenerateManpage.hs - - install -D -m644 man/xmonad.1 $pkgdir/usr/share/man/man1/xmonad.1 - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/xmonad/LICENSE - - install -D -m644 $srcdir/xmonad.svg $pkgdir/usr/share/pixmaps/xmonad.svg -} -md5sums=('f8381e1ec15137863558a454d4466467' - '72bfa5e62e4e44fe7fa59b6a7593d993' - '22d29900d71f09a8f9fa6f0d2f3fed32') diff --git a/community-testing/xmonad/xmonad-0.10-x11-1.6.patch b/community-testing/xmonad/xmonad-0.10-x11-1.6.patch deleted file mode 100644 index 5b7afaf3b..000000000 --- a/community-testing/xmonad/xmonad-0.10-x11-1.6.patch +++ /dev/null @@ -1,19 +0,0 @@ -Tue Mar 20 03:49:24 FET 2012 Adam Vogt <vogt.adam@gmail.com> - * Address versioning problems related to X11 1.6 release. - - Bump version to 0.10.1 since cabal uses hackage dependencies even when the - locally installed package differs. - - Allow X11-1.6 dependency. -diff -rN -u old-xmonad/xmonad.cabal new-xmonad/xmonad.cabal ---- old-xmonad/xmonad.cabal 2012-05-06 12:20:26.788767220 +0300 -+++ new-xmonad/xmonad.cabal 2012-05-06 12:20:26.818766844 +0300 -@@ -46,7 +46,7 @@ - build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions - else - build-depends: base < 3 -- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix, -+ build-depends: X11>=1.5 && < 1.7, mtl, unix, - utf8-string >= 0.3 && < 0.4 - - if true diff --git a/community-testing/xmonad/xmonad-gnome-session.session b/community-testing/xmonad/xmonad-gnome-session.session deleted file mode 100644 index c0bd16781..000000000 --- a/community-testing/xmonad/xmonad-gnome-session.session +++ /dev/null @@ -1,6 +0,0 @@ -[GNOME Session] -Name=Xmonad session -RequiredComponents=gnome-panel;gnome-settings-daemon; -RequiredProviders=windowmanager;notifications; -DefaultProvider-windowmanager=xmonad -DefaultProvider-notifications=notification-daemon diff --git a/community-testing/xmonad/xmonad.install b/community-testing/xmonad/xmonad.install deleted file mode 100644 index 6659247db..000000000 --- a/community-testing/xmonad/xmonad.install +++ /dev/null @@ -1,22 +0,0 @@ -HS_DIR=/usr/share/haskell/xmonad - -post_install() { - ${HS_DIR}/register.sh - echo "xmonad now has dynamic configuration via ~/.xmonad/xmonad.hs" - echo "See http://haskell.org/haskellwiki/Xmonad/Config_archive for examples" - echo - echo "If you would like to run xmonad as a window manager inside GNOME, please see" - echo "http://www.haskell.org/haskellwiki/Xmonad/Using_xmonad_in_Gnome#Setting_up_Gnome_to_use_Xmonad" -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} diff --git a/community-testing/xmonad/xmonad.svg b/community-testing/xmonad/xmonad.svg deleted file mode 100644 index 5fc884213..000000000 --- a/community-testing/xmonad/xmonad.svg +++ /dev/null @@ -1,77 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - id="svg2211" - sodipodi:version="0.32" - inkscape:version="0.45.1" - width="47" - height="73" - version="1.0" - sodipodi:docbase="/home/sjanssen/xmonad-web/images" - sodipodi:docname="logo.svg" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="/home/sjanssen/xmonad-web/images/logo.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <metadata - id="metadata2216"> - <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="defs2214" /> - <sodipodi:namedview - inkscape:window-height="778" - inkscape:window-width="1278" - inkscape:pageshadow="2" - inkscape:pageopacity="1" - guidetolerance="10.0" - gridtolerance="10.0" - objecttolerance="10.0" - borderopacity="1.0" - bordercolor="#666666" - pagecolor="#ffffff" - id="base" - inkscape:zoom="4" - inkscape:cx="23.5" - inkscape:cy="22.689137" - inkscape:window-x="0" - inkscape:window-y="20" - inkscape:current-layer="g3208" /> - <g - id="g3208" - transform="translate(-44.517797,4.0967298)"> - <g - id="g3212" - transform="matrix(1.0216109,0,0,1.0127041,45.533715,-4.3577662)"> - <path - style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#aeaeae;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - d="M 22.62043,20.307707 L 36.04778,0.32867349 L 43.859402,0.32867349 L 26.580238,26.139425 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462" - id="text2220" - sodipodi:nodetypes="cccccccc" /> - <path - id="path3206" - d="M 1.4534537,0.32867349 L 9.2650758,0.32867349 L 45.011347,54.074074 L 37.199725,54.074074 L 22.080456,31.215179 L 6.8531925,54.074074 L -0.9944279,54.074074 L 18.192644,25.383462 L 1.4534537,0.32867349" - style="font-size:73.7244339px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - sodipodi:nodetypes="ccccccccc" /> - </g> - <path - style="font-size:28.207407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ee0a00;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans Mono" - d="M 44.517797,65.480602 L 55.836194,59.828049 L 44.517797,54.228655 L 44.517797,51.056847 L 58.809298,58.321883 L 58.809298,61.298776 L 44.517797,68.652411 M 44.517797,68.652411 L 44.517797,65.480602 M 73.929389,61.298776 L 59.637889,68.652411 L 59.637889,65.480602 L 70.956287,59.828049 L 59.637889,54.228655 L 59.637889,51.056847 L 73.929389,58.321883 L 73.929389,61.298776 z M 91.517797,57.382744 L 77.270452,57.382744 L 77.270452,54.405851 L 91.517797,54.405851 L 91.517797,57.382744 z M 91.517797,65.267967 L 77.270452,65.267967 L 77.270452,62.291073 L 91.517797,62.291073 L 91.517797,65.267967 z " - id="text3216" - sodipodi:nodetypes="ccccccccccccccccccccccccccc" /> - </g> -</svg> diff --git a/community-testing/xmoto/PKGBUILD b/community-testing/xmoto/PKGBUILD deleted file mode 100644 index 6cfbb2db3..000000000 --- a/community-testing/xmoto/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 77535 2012-10-11 21:34:16Z lcarlier $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> -# Contributor: Travis Willard <travisw@wmpub.ca> -# Contributor: Denis (dtonator@gmail.com) - -pkgname=xmoto -pkgver=0.5.10 -pkgrel=2 -pkgdesc="A challenging 2D motocross platform game, where physics play an important role." -arch=('i686' 'x86_64') -url="http://xmoto.tuxfamily.org" -license=('GPL') -depends=('libjpeg' 'libpng' 'lua' 'sdl_mixer' 'ode' 'curl' - 'sqlite3' 'sdl_ttf' 'desktop-file-utils' 'sdl_net' 'glu' - 'libxdg-basedir' 'libxml++') -makedepends=('mesa') -install=xmoto.install -source=("http://download.tuxfamily.org/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" - 'xmoto-0.5.10-libpng15.patch' - 'system.cpp.patch') -sha1sums=('692d50a9c91791cd06ee84846632651b44544fcc' - '9d13fa09f1c558a0fc504f7e7b1ceac6b4b7b20d' - 'e741f769d1fc5779a6688970ee97e2a61a50c7ae') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - patch -Np1 -i "${srcdir}/xmoto-0.5.10-libpng15.patch" - patch -Np1 -i "${srcdir}/system.cpp.patch" - - # build and install - ./configure LDFLAGS="-L/usr/lib" --prefix=/usr --disable-sdltest - - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} mangdir=/usr/share/man/man6 install - - # install desktop file - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.desktop \ - ${pkgdir}/usr/share/applications/xmoto.desktop - - # install icon for desktop file - install -Dm0644 ${srcdir}/${pkgname}-${pkgver}/extra/xmoto.xpm \ - ${pkgdir}/usr/share/pixmaps/xmoto.xpm -} diff --git a/community-testing/xmoto/system.cpp.patch b/community-testing/xmoto/system.cpp.patch deleted file mode 100644 index df42e3a7c..000000000 --- a/community-testing/xmoto/system.cpp.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/helpers/System.cpp 2011-10-11 22:18:14.000000000 +0200 -+++ b/src/helpers/System.cpp 2012-07-21 21:28:40.000000000 +0200 -@@ -24,6 +24,7 @@ - #include "Log.h" - #include "VExcept.h" - #include <sstream> -+#include <unistd.h> - - std::vector<std::string>* System::getDisplayModes(int windowed) { - std::vector<std::string>* modes = new std::vector<std::string>; diff --git a/community-testing/xmoto/xmoto-0.5.10-libpng15.patch b/community-testing/xmoto/xmoto-0.5.10-libpng15.patch deleted file mode 100644 index aed175c7c..000000000 --- a/community-testing/xmoto/xmoto-0.5.10-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/image/tim_png.cpp 2011-12-29 22:13:37.000000000 +0100 -+++ b/src/image/tim_png.cpp 2012-07-21 21:36:34.000000000 +0200 -@@ -24,6 +24,7 @@ - */ - #include <stdio.h> - #include <string.h> -+#include <zlib.h> - #include "tim.h" - #include <png.h> - #include <zlib.h> diff --git a/community-testing/xmoto/xmoto.install b/community-testing/xmoto/xmoto.install deleted file mode 100644 index e111ef946..000000000 --- a/community-testing/xmoto/xmoto.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/zathura-djvu/PKGBUILD b/community-testing/zathura-djvu/PKGBUILD deleted file mode 100644 index be797feb3..000000000 --- a/community-testing/zathura-djvu/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 75779 2012-08-31 00:57:33Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: karnath <karnathtorjian@gmail.com> - -pkgname=zathura-djvu -pkgver=0.2.1 -pkgrel=1 -pkgdesc="Adds DjVu support to zathura by using the djvulibre library" -arch=('i686' 'x86_64') -url="https://pwmt.org/projects/zathura/plugins/zathura-djvu/" -license=('custom') -depends=('djvulibre' 'zathura') -source=("https://pwmt.org/projects/zathura/plugins/download/zathura-djvu-$pkgver.tar.gz") -md5sums=('c3525b43b74bb0777a2b3561f7dcde06') - -build(){ - cd "${srcdir}/$pkgname-$pkgver" - make -} -package(){ - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - diff --git a/community-testing/zathura-pdf-poppler/PKGBUILD b/community-testing/zathura-pdf-poppler/PKGBUILD deleted file mode 100644 index b1320b1cb..000000000 --- a/community-testing/zathura-pdf-poppler/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# $Id: PKGBUILD 67819 2012-03-14 16:22:14Z spupykin $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: karnath <karnathtorjian@gmail.com> - -pkgname=zathura-pdf-poppler -pkgver=0.2.1 -pkgrel=1 -pkgdesc="Adds pdf support to zathura by using the poppler engine" -arch=('i686' 'x86_64') -url="https://pwmt.org/projects/zathura/plugins/zathura-pdf-poppler/" -license=('custom') -depends=('poppler-glib' 'zathura') -source=("https://pwmt.org/projects/zathura/plugins/download/$pkgname-$pkgver.tar.gz") -md5sums=('6f36fe141f8e5e9e8d71eb143eaaa1c1') - -build() { - cd "${srcdir}/$pkgname-$pkgver" - make -} -package(){ - cd "${srcdir}/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community-testing/zathura/PKGBUILD b/community-testing/zathura/PKGBUILD deleted file mode 100644 index cd7da39a5..000000000 --- a/community-testing/zathura/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 75777 2012-08-31 00:57:27Z dwallace $ -# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: ML <neldoreth> - -pkgname=zathura -pkgver=0.2.1 -pkgrel=1 -pkgdesc="a document viewer" -arch=('i686' 'x86_64') -url="http://pwmt.org/projects/zathura/" -license=('custom') -depends=('girara-gtk2' 'cairo' 'sqlite') -makedepends=('python2-docutils') -optdepends=('zathura-djvu' 'zathura-pdf-poppler' 'zathura-ps') -install=zathura.install -source=(http://pwmt.org/projects/zathura/download/zathura-$pkgver.tar.gz - bash-completion) -md5sums=('2b606a5db61c80b0f1208e9f1df468c2' - 'cac20c37f0e77ba62a8138788f4ccabb') - -build() { - cd $srcdir/zathura-$pkgver - make ZATHURA_GTK_VERSION=2 -} - -package() { - cd $srcdir/zathura-$pkgver - make install DESTDIR=$pkgdir ZATHURA_GTK_VERSION=2 - install -D -m664 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm0644 $srcdir/bash-completion $pkgdir/usr/share/bash-completion/completions/zathura -} diff --git a/community-testing/zathura/bash-completion b/community-testing/zathura/bash-completion deleted file mode 100644 index 41c3825b6..000000000 --- a/community-testing/zathura/bash-completion +++ /dev/null @@ -1,29 +0,0 @@ -_zathura() { - _init_completion || return - - EXTENTIONS='' - for PLUGIN in /usr/lib/zathura/*.so; do - case ${PLUGIN##*/} in - pdf.so) - EXTENTIONS="$EXTENTIONS|pdf" - ;; - ps.so) - EXTENTIONS="$EXTENTIONS|ps|eps|epsi|epsf" - ;; - djvu.so) - EXTENTIONS="$EXTENTIONS|djvu|djv" - ;; - epub.so) - EXTENTIONS="$EXTENTIONS|epub" - ;; - cb.so) - EXTENTIONS="$EXTENTIONS|cb7|cbr|cbz|cbt|rar|zip|7z|tar" - ;; - *) - ;; - esac - done - - _filedir "${EXTENTIONS#|}" -} && -complete -F _zathura zathura diff --git a/community-testing/zathura/zathura.install b/community-testing/zathura/zathura.install deleted file mode 100644 index f450cf9b8..000000000 --- a/community-testing/zathura/zathura.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - which gtk-update-icon-cache >/dev/null && \ - [ -d usr/share/icons/hicolor ] && \ - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community-testing/zeitgeist-datahub/PKGBUILD b/community-testing/zeitgeist-datahub/PKGBUILD deleted file mode 100644 index 35bb0fa68..000000000 --- a/community-testing/zeitgeist-datahub/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 78600 2012-10-21 20:21:55Z bgyorgy $ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Leontius Adhika Pradhana <leon@leapon.net> -# Contributor: Ner0 - -pkgname=zeitgeist-datahub -pkgver=0.9.5 -pkgrel=2 -pkgdesc="Provides passive plugins which insert events into Zeitgeist" -arch=('i686' 'x86_64') -url="https://launchpad.net/zeitgeist-datahub" -license=('GPL3') -depends=('libzeitgeist' 'json-glib' 'gtk2' 'telepathy-glib' 'zeitgeist') -makedepends=('intltool' 'vala') -source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('b2b76b82b67363c45e5fe4f39a172775') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir/" install -} diff --git a/community-testing/znc/PKGBUILD b/community-testing/znc/PKGBUILD deleted file mode 100644 index 7222f1953..000000000 --- a/community-testing/znc/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 78129 2012-10-16 11:54:52Z allan $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: mickael9 <mickael9 at gmail dot com> - -pkgname=znc -pkgver=0.206 -pkgrel=3 -pkgdesc='An IRC bouncer with modules & scripts support' -url='http://en.znc.in/wiki/index.php/ZNC' -license=('GPL2') -arch=('i686' 'x86_64') -depends=('c-ares' 'libsasl') -#makedepends=('swig' 'tcl' 'python' 'perl') -makedepends=('tcl' 'python' 'perl') -optdepends=('tcl: modtcl module' - 'python: modpython module' - 'perl: modperl module' - 'cyrus-sasl: saslauth module') -source=("http://znc.in/releases/$pkgname-$pkgver.tar.gz" - "http://people.znc.in/~darthgandalf/znc/modperl/modperl-znc-0.204.tar.bz2" - "http://people.znc.in/~darthgandalf/znc/modpython/modpython-znc-0.204.tar.bz2") -md5sums=('b7d3f21da81abaeb553066b0e10beb53' - 'a9c72d556d9a4ef100520433f17d71ae' - '19bf033c5cb9243171c215043c594f07') - -build() { - # swig 2.0.6 is bugged, see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=672035 - # use an alternate ways of building znc explain here: - # - http://wiki.znc.in/Modperl - # - http://wiki.znc.in/Modpython - mv -v modperl/* $pkgname-$pkgver/modules/modperl - mv -v modpython/* $pkgname-$pkgver/modules/modpython - cd $pkgname-$pkgver - ./configure --prefix=/usr \ - --enable-sasl \ - --enable-python \ - --enable-perl \ - --enable-tcl \ - --disable-swig \ - --enable-extra - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: |
