diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-10 11:32:41 +0100 |
| commit | bdf817c3549ba377334deb1161de703579670d62 (patch) | |
| tree | c1b80c05c917cda2619e267049978f971bdad169 /community | |
| parent | df609724f30aaccfb05d9fb73f68e7a37118f2f8 (diff) | |
| parent | 1bb2648cde916ac27d3dd75d7b64a4ddc89787b7 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/cdemu-client/PKGBUILD
community/dcron/PKGBUILD
community/freevo/PKGBUILD
community/gmerlin-avdecoder/PKGBUILD
community/hacburn/PKGBUILD
community/htmldoc/PKGBUILD
community/ibus-table/PKGBUILD
community/iksemel/PKGBUILD
community/isomaster/PKGBUILD
community/libmatio/PKGBUILD
community/libtlen/PKGBUILD
community/luarocks/PKGBUILD
community/lxde-common/PKGBUILD
community/multipath-tools/PKGBUILD
community/nvclock/PKGBUILD
community/pam-krb5/PKGBUILD
community/pidgin-musictracker/PKGBUILD
community/pkgfile/PKGBUILD
community/pkgtools/PKGBUILD
community/print-manager/PKGBUILD
community/python-pyro/PKGBUILD
community/python-pyxmpp/PKGBUILD
community/python2-simplejson/PKGBUILD
community/rsnapshot/PKGBUILD
community/setconf/PKGBUILD
community/tagpy/PKGBUILD
community/terminator/PKGBUILD
community/udunits/PKGBUILD
community/vlock/PKGBUILD
community/winefish/PKGBUILD
core/nss-myhostname/PKGBUILD
extra/avfs/PKGBUILD
extra/bmp-musepack/PKGBUILD
extra/bmp-wma/PKGBUILD
extra/bochs/PKGBUILD
extra/botan/PKGBUILD
extra/cdargs/PKGBUILD
extra/cx_freeze/PKGBUILD
extra/dcfldd/PKGBUILD
extra/devilspie/PKGBUILD
extra/emelfm2/PKGBUILD
extra/evilwm/PKGBUILD
extra/fssos-nsvs/PKGBUILD
extra/gimp-dbp/PKGBUILD
extra/gimp-gap/PKGBUILD
extra/gimp-ufraw/PKGBUILD
extra/gmpc/PKGBUILD
extra/gtkpod/PKGBUILD
extra/hercules/PKGBUILD
extra/herqq/PKGBUILD
extra/hydrogen/PKGBUILD
extra/kdegames/PKGBUILD
extra/kradio/PKGBUILD
extra/kshutdown/PKGBUILD
extra/libmusicbrainz4/PKGBUILD
extra/mahjong/PKGBUILD
extra/mcrypt/PKGBUILD
extra/monica/PKGBUILD
extra/mpck/PKGBUILD
extra/mrtg/PKGBUILD
extra/nicotine/PKGBUILD
extra/normalize/PKGBUILD
extra/oprofile/PKGBUILD
extra/perl-event/PKGBUILD
extra/perl-unicode-string/PKGBUILD
extra/pidgin-encryption/PKGBUILD
extra/proftpd/PKGBUILD
extra/pymad/PKGBUILD
extra/qiv/PKGBUILD
extra/quodlibet/PKGBUILD
extra/ratpoison/PKGBUILD
extra/rox/PKGBUILD
extra/scrot/PKGBUILD
extra/stardict/PKGBUILD
extra/terminal/PKGBUILD
extra/usbview/PKGBUILD
extra/xdelta/PKGBUILD
extra/xdelta3/PKGBUILD
extra/xorg-xlsfonts/PKGBUILD
extra/zile/PKGBUILD
mozilla-testing/iceweasel-libre/mozconfig
mozilla-testing/iceweasel-libre/vendor.js
social/tokyocabinet/PKGBUILD
~fauno/notmuch/PKGBUILD
~mtjm/thinkfan/PKGBUILD
~mtjm/zbar/PKGBUILD
Diffstat (limited to 'community')
454 files changed, 90 insertions, 33563 deletions
diff --git a/community/abuse/PKGBUILD b/community/abuse/PKGBUILD deleted file mode 100644 index 68924e839..000000000 --- a/community/abuse/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 64627 2012-02-17 12:45:02Z lfleischer $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: jlvsimoes <jlvsimoes@oninet.pt> -# Contributor: kevin <kevin@archlinux.org> - -pkgname=abuse -pkgver=0.8 -pkgrel=2 -pkgdesc='A side-scroller action game that pits you against ruthless alien killers.' -arch=('i686' 'x86_64') -url='http://abuse.zoy.org/' -license=('GPL' 'custom') -depends=('gcc-libs' 'libgl' 'sdl' 'sdl_mixer') -install='abuse.install' -source=("http://abuse.zoy.org/raw-attachment/wiki/download/${pkgname}-${pkgver}.tar.gz") -md5sums=('ec678b8dc8d00e0382d8c805c6438489') - -build() { - cd "${srcdir}/abuse-${pkgver}" - - ./configure --prefix=/usr --with-assetdir=/usr/share/abuse/orig --with-x - make -} - -package() { - cd "${srcdir}/abuse-${pkgver}" - - make DESTDIR="${pkgdir}" install - - install -d "${pkgdir}/usr/share/licenses/abuse" - sed -n '1,/^$/p' src/view.cpp > "${pkgdir}/usr/share/licenses/abuse/orig.code.license" -} diff --git a/community/abuse/abuse.install b/community/abuse/abuse.install deleted file mode 100644 index 4d28ebacd..000000000 --- a/community/abuse/abuse.install +++ /dev/null @@ -1,13 +0,0 @@ -# arg 1: the new package version -post_install() { -# echo "If you get a BOSS_ANT error trying to run abuse, copy /usr/share/games/abuse/gamma.lsp to ~/.abuse" - echo "Abuse uses the original game levels by default. To use the frabs levels" - echo "use '-datadir' or set 'datadir' in the abuserc to /usr/share/abuse/frabs" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install -} - diff --git a/community/acetoneiso2/PKGBUILD b/community/acetoneiso2/PKGBUILD deleted file mode 100644 index e400f8b72..000000000 --- a/community/acetoneiso2/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 61069 2011-12-21 20:50:25Z andrea $ -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Wes Brewer <brewerw@gmail.com> - -pkgname=acetoneiso2 -pkgver=2.3 -pkgrel=4 -pkgdesc="An all in one ISO tool (bin mdf nrg img daa dmg cdi b5i bwi pdi iso)" -arch=('i686' 'x86_64') -url="http://www.acetoneteam.org" -license=('GPL3') -depends=('qtwebkit' 'fuseiso' 'cdrdao' 'cdrkit' 'dvd+rw-tools' 'gnupg2' 'pinentry' 'mplayer' 'phonon') -optdepends=("p7zip: for ISO compress/decompress support") -conflicts=('acetoneiso') -install=${pkgname}.install -source=(http://downloads.sourceforge.net/acetoneiso/AcetoneISO/AcetoneISO%202.3/acetoneiso_${pkgver}.tar.gz) -md5sums=('225f7af687016690ff28b9771a1ce179') - -build() { - cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso - - qmake - # needed for phonon - sed -i 's|-I/usr/include/QtCore|-I/usr/include/QtCore -I/usr/include/KDE|' Makefile - make -} - -package() { - cd ${srcdir}/acetoneiso_${pkgver}/acetoneiso - - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/community/acetoneiso2/acetoneiso2.install b/community/acetoneiso2/acetoneiso2.install deleted file mode 100644 index 1a3984e24..000000000 --- a/community/acetoneiso2/acetoneiso2.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { -cat << EOF - --> - --> Please remember to add 'fuse' to your MODULES array in /etc/rc.conf - --> -EOF -} - -post_upgrade() { - post_install $* -} diff --git a/community/acpid/acpid.conf b/community/acpid/acpid.conf deleted file mode 100644 index b60103a2d..000000000 --- a/community/acpid/acpid.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Arguments to be passed to the acpid daemon -# - -ACPID_ARGS="" diff --git a/community/acpid/acpid.rc b/community/acpid/acpid.rc deleted file mode 100644 index 674f4621b..000000000 --- a/community/acpid/acpid.rc +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -[[ -f /etc/conf.d/acpid ]] && . /etc/conf.d/acpid - -PID=$(pidof -o %PPID /usr/sbin/acpid) -case "$1" in - start) - stat_busy "Starting acpid" - [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon acpid - stat_done - fi - ;; - stop) - stat_busy "Stopping acpid" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon acpid - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD new file mode 100644 index 000000000..062922dda --- /dev/null +++ b/community/aiccu/PKGBUILD @@ -0,0 +1,40 @@ +# $Id: PKGBUILD 84051 2013-02-09 13:54:03Z seblu $ +# Maintainer: Sébastien Luttringer + +pkgname=aiccu +pkgver=20070115 +pkgrel=1 +pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility' +arch=('i686' 'x86_64') +url='http://www.sixxs.net/tools/aiccu/' +license=('custom') +depends=('gnutls' 'iproute2') +backup=('etc/aiccu.conf') +source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz" + 'aiccu.service') +md5sums=('c9bcc83644ed788e22a7c3f3d4021350' + 'e038c9d7882e6e603d87962bac7a0f2a') + +build() { + cd $pkgname + [[ $LDFLAGS ]] && LDFLAGS="$LDFLAGS,--no-as-needed" + make +} + +package() { + cd $pkgname + make DESTDIR="$pkgdir" install + # default config + install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf" + # license + install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # doc + install -dm755 "$pkgdir/usr/share/doc/$pkgname" + install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname/" + install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1" + # systemd + install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service" + rm -r "$pkgdir/etc/init.d" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/aiccu/aiccu.service b/community/aiccu/aiccu.service new file mode 100644 index 000000000..7371b2849 --- /dev/null +++ b/community/aiccu/aiccu.service @@ -0,0 +1,12 @@ +[Unit] +Description=SixXS Automatic IPv6 Connectivity Configuration Utility +After=network.target + +[Service] +Type=forking +PIDFile=/var/run/aiccu.pid +ExecStart=/usr/sbin/aiccu start +ExecStop=/usr/sbin/aiccu stop + +[Install] +WantedBy=multi-user.target diff --git a/community/alienarena/PKGBUILD b/community/alienarena/PKGBUILD deleted file mode 100644 index 124c7aa7a..000000000 --- a/community/alienarena/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 76630 2012-09-25 13:43:44Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: yugrotavele <yugrotavele at archlinux dot us> -# Contributor: Det <nimetonmaili at gmail a-dot com> -# Contributor: godane <slaxemulator@gmail.com> -# Contributor: damian01w <damian01w@gmail.com> - -pkgname=alienarena -pkgver=7.60.1 -pkgrel=1 -_verdate=20120823 -pkgdesc="Multiplayer retro sci-fi deathmatch game" -arch=('i686' 'x86_64') -url='http://icculus.org/alienarena/rpa/' -license=('GPL') -depends=('curl' 'freetype2' 'libgl' 'libjpeg' 'libvorbis' 'libxxf86dga' 'libxxf86vm' 'libgl' 'sdl' 'openal' 'alienarena-data') -makedepends=('gendesk' 'mesa') -source=(http://icculus.org/alienarena/Files/alienarena-${pkgver}-linux${_verdate}.tar.gz) -md5sums=('1e32455d8f6418c92b1b6f4d54becadd') -_name=('Alien Arena') - -build() { - cd "$srcdir" - gendesk -n - - cd "$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 "../$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" - rm -rf "$pkgdir/usr/share/$pkgname" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/angband/PKGBUILD b/community/angband/PKGBUILD deleted file mode 100644 index af58de442..000000000 --- a/community/angband/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# Maintainer: schuay <jakob.gruber@gmail.com> -# Maintainer: Mike Sampson <mike at sambodata dot com> -# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> -# Contributor: KillaB <xGenoBlast@gmail.com> -# Contributor: Callan Barrett <wizzomafizzo@gmail.com> -# Contributor: Christian Schmidt <xmucknertx@googlemail.com> -# Contributor: Sebastian Sareyko <public@nooms.de> - -pkgname=angband -pkgver=3.4.1 -pkgrel=1 -pkgdesc="A roguelike dungeon exploration game based on the writings of JRR Tolkien" -arch=('i686' 'x86_64') -url="http://rephial.org/" -license=('GPL2' 'custom') -depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'ncurses' 'libglade') -source=("http://rephial.org/downloads/${pkgver:0:3}/${pkgname}-v${pkgver}.tar.gz") - -build() { - - cd "${srcdir}/${pkgname}-v${pkgver}" - - ./configure \ - --prefix=/usr \ - --bindir=/usr/bin \ - --sysconfdir=/usr/share/angband \ - --with-configpath=/usr/share/angband \ - --with-libpath=/usr/share/angband \ - --enable-gtk \ - --enable-sdl \ - --enable-sdl-mixer - - make - -} - -package() { - - cd "${srcdir}/${pkgname}-v${pkgver}" - - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/share/angband/*/delete.me" - install -Dm644 copying.txt "${pkgdir}/usr/share/licenses/${pkgname}/COPYING" - -} - -md5sums=('3ea22e5caabc3de7b49bac13ba922a8c') diff --git a/community/arptables/arptables.conf b/community/arptables/arptables.conf deleted file mode 100644 index 8b5456788..000000000 --- a/community/arptables/arptables.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file used to load/save configuration. -CONFIG_FILE='/etc/arptables.conf' - -# Save configuration on stop/restart. -#SAVE_ON_STOP=yes - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.install b/community/arptables/arptables.install deleted file mode 100644 index 5f03b6e24..000000000 --- a/community/arptables/arptables.install +++ /dev/null @@ -1,10 +0,0 @@ -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - [ $(vercmp "$2" '0.0.3_4-2') -gt 0 ] || cat <<EOF -Config file have been moved from /etc/arptables/arptables to /etc/arptables.conf. -You can revert to the previous location by editing /etc/conf.d/arptables. -EOF -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/arptables/arptables.rc b/community/arptables/arptables.rc deleted file mode 100644 index a188c65c1..000000000 --- a/community/arptables/arptables.rc +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -case "$1" in - start) - stat_busy 'Loading arptables rules' - arptables-restore < "$CONFIG_FILE" && - add_daemon ${0##*/} && stat_done || stat_die - ;; - stop) - [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save - stat_busy 'Clearing arptables rules' - arptables-restore < /dev/null && - rm_daemon ${0##*/} && stat_done || stat_die - ;; - restart) - $0 start - $0 stop - ;; - save) - stat_busy 'Saving arptables rules' - arptables-save > "$CONFIG_FILE" && - stat_done || stat_die - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|save}" >&2 - exit 1 - ;; -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/assaultcube/PKGBUILD b/community/assaultcube/PKGBUILD deleted file mode 100644 index bc05fbe4e..000000000 --- a/community/assaultcube/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 64731 2012-02-18 03:18:55Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Rabyte <rabyte [at] gmail (dot) com> - -pkgname=assaultcube -pkgver=1.1.0.4 -pkgrel=4 -pkgdesc='A realistic team oriented multiplayer FPS based on the Cube engine' -arch=('i686' 'x86_64') -url='http://assault.cubers.net/' -license=('ZLIB' 'custom') -depends=('sdl' 'sdl_mixer' 'sdl_image' 'openal' 'zlib' 'gcc-libs' 'libgl' 'desktop-file-utils') -makedepends=('mesa') -source=("http://downloads.sourceforge.net/actiongame/AssaultCube_v${pkgver}.tar.bz2" - "http://downloads.sourceforge.net/actiongame/AssaultCube_v${pkgver}_source.tar.bz2" - 'assaultcube' - 'assaultcube-server' - 'assaultcube.desktop' - 'assaultcube.png') -md5sums=('a5eb79eaf564c5b4de1ffad0883e45e8' - '603b97a4262fb59ea86d483730b712e9' - 'd658ad3ee476bfe92afa5b5a04a7b4f5' - '553e2c3b38c4d13e5d77c23efd51a6a6' - 'a37dfbe8263f4ef8fe41120196194eae' - 'f688c59ecee2ebc5c589720aa1480765') -install=assaultcube.install - -build() { - cd ${pkgver}/source - - # We'll use official binaries for cheat protection or some stuff. - # Upstream is strange. - #make -} - -package() { - #cd ${pkgver}/source/src - - #install -Dm755 ac_client ${pkgdir}/usr/bin/ac_client - #install -Dm755 ac_server ${pkgdir}/usr/bin/ac_server - cd ${srcdir}/${pkgver} - - mkdir -p ${pkgdir}/usr/share/assaultcube/packages - mkdir -p ${pkgdir}/usr/bin - - if [[ $CARCH == "x86_64" ]]; then - cp bin_unix/linux_64_client ${pkgdir}/usr/bin/ac_client - cp bin_unix/linux_64_server ${pkgdir}/usr/bin/ac_server - else - cp bin_unix/linux_client ${pkgdir}/usr/bin/ac_client - cp bin_unix/linux_server ${pkgdir}/usr/bin/ac_server - fi - cp -rf config packages docs mods ${pkgdir}/usr/share/assaultcube - install -Dm644 ${srcdir}/assaultcube.png ${pkgdir}/usr/share/pixmaps/assaultcube.png - install -Dm644 ${srcdir}/assaultcube.desktop ${pkgdir}/usr/share/applications/assaultcube.desktop - install -Dm644 docs/package_copyrights.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - install -Dm755 ${srcdir}/assaultcube ${pkgdir}/usr/bin/assaultcube - install -Dm755 ${srcdir}/assaultcube-server ${pkgdir}/usr/bin/assaultcube-server -} - -# vim: sw=2:ts=2 et: diff --git a/community/assaultcube/assaultcube b/community/assaultcube/assaultcube deleted file mode 100755 index d982cb641..000000000 --- a/community/assaultcube/assaultcube +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd /usr/share/assaultcube -ac_client "--home=${HOME}/.assaultcube" "--init=${HOME}/.assaultcube/config/init.cfg" "$@" diff --git a/community/assaultcube/assaultcube-server b/community/assaultcube/assaultcube-server deleted file mode 100755 index 46d93c594..000000000 --- a/community/assaultcube/assaultcube-server +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -cd /usr/share/assaultcube -ac_server "$@" diff --git a/community/assaultcube/assaultcube.desktop b/community/assaultcube/assaultcube.desktop deleted file mode 100644 index 9449fc1f3..000000000 --- a/community/assaultcube/assaultcube.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=assaultcube -Icon=assaultcube -Type=Application -Terminal=false -MultipleArgs=false -Name=AssaultCube -GenericName=Realistic Multiplayer FPS -MimeType=text/html -StartupNotify=false -Categories=Game;ActionGame; diff --git a/community/assaultcube/assaultcube.install b/community/assaultcube/assaultcube.install deleted file mode 100644 index 724bfce00..000000000 --- a/community/assaultcube/assaultcube.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q - 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/assaultcube/assaultcube.png b/community/assaultcube/assaultcube.png Binary files differdeleted file mode 100644 index a0915cb76..000000000 --- a/community/assaultcube/assaultcube.png +++ /dev/null diff --git a/community/asunder/PKGBUILD b/community/asunder/PKGBUILD deleted file mode 100644 index 5a30eb34f..000000000 --- a/community/asunder/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 66554 2012-02-26 05:35:59Z xyne $ -# Maintainer: Xyne <ac xunilhcra enyx, backwards> -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: cs-cam - me.at.camdaniel.com -# Contributor: Sebastien Piccand <sebcactus gmail com> - -pkgname=asunder -pkgver=2.2 -pkgrel=1 -pkgdesc="a graphical CD ripper and encoder" -arch=('i686' 'x86_64') -url="http://littlesvr.ca/asunder/" -license=('GPL2') -depends=('gtk2' 'libcddb' 'cdparanoia') -makedepends=('pkgconfig') -optdepends=('lame: for mp3 support' 'vorbis-tools: for ogg support' \ - 'flac: for flac support') -source=(http://littlesvr.ca/asunder/releases/${pkgname}-${pkgver}.tar.bz2) -md5sums=('4996860f552879fd8abdc87d1c6c7530') -sha256sums=('bb608c1cdefcce2f533fb5d5cc23838846b2810ec89d0ebb083507cf27e7822f') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} - diff --git a/community/awesome/01-fix_glib2_build.patch b/community/awesome/01-fix_glib2_build.patch deleted file mode 100644 index aeab63fbb..000000000 --- a/community/awesome/01-fix_glib2_build.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d3d8160e273b56d0262d2570cfa6bcb76b9ea771 Mon Sep 17 00:00:00 2001 -From: Thomas Moschny <thomas.moschny@gmx.de> -Date: Wed, 14 Dec 2011 20:00:53 +0100 -Subject: [PATCH] Fix build with glib2 2.31.0 - -Starting with glib2 2.31.0, It is no longer possible to -include individual headers (like "ghash.h") -- you must -#include <glib.h>. - -Signed-off-by: Thomas Moschny <thomas.moschny@gmx.de> -Signed-off-by: Uli Schlachter <psychon@znc.in> ---- - spawn.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/spawn.c b/spawn.c -index 3c8cf07..a6d6c5e 100644 ---- a/spawn.c -+++ b/spawn.c -@@ -24,7 +24,7 @@ - #include <sys/types.h> - #include <sys/wait.h> - --#include <glib/gspawn.h> -+#include <glib.h> - - #include "spawn.h" - #include "screen.h" --- -1.7.2.5 - diff --git a/community/bird/bird.conf b/community/bird/bird.conf deleted file mode 100644 index 88276d8cf..000000000 --- a/community/bird/bird.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -DAEMON_OPTS='-u nobody -g nobody' diff --git a/community/bird/bird.rc b/community/bird/bird.rc deleted file mode 100644 index a3aa5e4ad..000000000 --- a/community/bird/bird.rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/sbin/${0##*/} -PID=$(pidof -o %PPID $DAEMON) - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && 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/blackbox/PKGBUILD b/community/blackbox/PKGBUILD deleted file mode 100644 index c8c641216..000000000 --- a/community/blackbox/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 58674 2011-11-17 13:44:24Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: durbatuluk <dvdscripter@gmail.org> -# Contributor: Steve Ponsford <sp4d@lavabit.com> - -pkgname=blackbox -pkgver=0.70.1 -pkgrel=10 -pkgdesc="A window manager for X11" -url="http://blackboxwm.sourceforge.net/" -arch=('i686' 'x86_64') -depends=('gcc-libs' 'libxft' 'libxext' 'libx11' 'libxt') -license=('MIT') -options=('!libtool') -source=(http://downloads.sourceforge.net/blackboxwm/$pkgname-$pkgver.tar.gz - gcc4.3.patch - bbdock.patch - bsetbg-feh.patch - textpropertytostring-unconditional.patch) -md5sums=('2d173b95ca5e64ef478c6a5d2deee9df' - 'bc7a1335d77cdeb6f85cba4d01e68e63' - '69c5a5e981b087b2d8267cab996b48dd' - 'e7fb0d5bfd95820c0194ec73df66dadc' - '3b92ad246f07126dd55ae9634d6e875e') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np1 -i ../gcc4.3.patch - patch -Np0 -i ../bbdock.patch - patch -Np0 -i ../bsetbg-feh.patch - patch -Np1 -i ../textpropertytostring-unconditional.patch - - ./configure --prefix=/usr --mandir=/usr/share/man - make - make DESTDIR=$pkgdir install - - install -D -m644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/blackbox/bbdock.patch b/community/blackbox/bbdock.patch deleted file mode 100644 index 709b6cfe1..000000000 --- a/community/blackbox/bbdock.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- src/Slit.cc 2005-01-04 05:58:33.000000000 -0700 -+++ /root/tmp/Slit.cc 2007-12-29 11:13:09.000000000 -0700 -@@ -248,6 +248,13 @@ - bt::PixmapCache::find(screen->screenNumber(), texture, - frame.rect.width(), frame.rect.height(), - frame.pixmap); -+/*** START: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative **************/ -+ if ((texture.texture() & bt::Texture::Gradient) && frame.pixmap) -+ XSetWindowBackgroundPixmap(display, frame.window, frame.pixmap); -+ else if ((texture.texture() & bt::Texture::Solid)) -+ XSetWindowBackground(display, frame.window, -+ texture.color1().pixel(screen->screenNumber())); -+/*** STOP: BBDOCK PATCH FOR DOCK APPS THAT USE ParentRelative ***************/ - XClearArea(display, frame.window, 0, 0, - frame.rect.width(), frame.rect.height(), True); - diff --git a/community/blackbox/bsetbg-feh.patch b/community/blackbox/bsetbg-feh.patch deleted file mode 100644 index 17a612ff0..000000000 --- a/community/blackbox/bsetbg-feh.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- util/bsetbg.orig 2008-03-26 21:17:04.000000000 -0700 -+++ util/bsetbg 2008-03-26 21:21:57.000000000 -0700 -@@ -22,7 +22,7 @@ - - PATH=$PATH:/usr/bin:/usr/local/bin:/usr/X11R6/bin - --img_apps="display xli xsetbg Esetroot qiv wmsetbg xv" -+img_apps="display xli xsetbg Esetroot qiv wmsetbg xv feh" - - display_full_cmd="display -geometry 800x600 -window root" - display_tile_cmd="display -window root" -@@ -59,6 +59,11 @@ - xsetbg_center_cmd="xsetbg -center" - xsetbg_default_cmd="$xsetbg_center_cmd" - -+feh_full_cmd="feh --bg-scale" -+feh_tile_cmd="feh --bg-tile" -+feh_center_cmd="feh --bg-center" -+feh_default_cmd="$feh_center_cmd" -+ - ################################## - - me=`basename $0` diff --git a/community/blackbox/gcc4.3.patch b/community/blackbox/gcc4.3.patch deleted file mode 100644 index 40a9dcdef..000000000 --- a/community/blackbox/gcc4.3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -Nur blackbox-0.70.1/lib/Image.cc blackbox-0.70.1-new/lib/Image.cc ---- blackbox-0.70.1/lib/Image.cc 2005-04-08 08:41:09.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Image.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -45,6 +45,8 @@ - #include <stdio.h> - #include <stdlib.h> - -+#include <cstring> -+ - // #define COLORTABLE_DEBUG - // #define MITSHM_DEBUG - -diff -Nur blackbox-0.70.1/lib/Resource.cc blackbox-0.70.1-new/lib/Resource.cc ---- blackbox-0.70.1/lib/Resource.cc 2005-04-06 14:16:50.000000000 -0700 -+++ blackbox-0.70.1-new/lib/Resource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -30,6 +30,8 @@ - - #include <stdio.h> - -+#include <cstring> -+ - - bt::Resource::Resource(void) - : db(NULL) -diff -Nur blackbox-0.70.1/lib/XDG.cc blackbox-0.70.1-new/lib/XDG.cc ---- blackbox-0.70.1/lib/XDG.cc 2005-04-06 07:04:38.000000000 -0700 -+++ blackbox-0.70.1-new/lib/XDG.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -26,7 +26,7 @@ - #include "XDG.hh" - - #include <stdlib.h> -- -+#include <algorithm> - - // make sure directory names end with a slash - static std::string terminateDir(const std::string &string) -diff -Nur blackbox-0.70.1/src/BlackboxResource.cc blackbox-0.70.1-new/src/BlackboxResource.cc ---- blackbox-0.70.1/src/BlackboxResource.cc 2005-10-18 00:34:46.000000000 -0700 -+++ blackbox-0.70.1-new/src/BlackboxResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - #include <X11/Xutil.h> - #include <X11/cursorfont.h> - -+#include <cstring> -+ - - BlackboxResource::BlackboxResource(const std::string& rc): rc_file(rc) { - screen_resources = 0; -diff -Nur blackbox-0.70.1/src/Screen.cc blackbox-0.70.1-new/src/Screen.cc ---- blackbox-0.70.1/src/Screen.cc 2005-10-18 01:07:22.000000000 -0700 -+++ blackbox-0.70.1-new/src/Screen.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -48,6 +48,8 @@ - #include <ctype.h> - #include <dirent.h> - -+#include <cstring> -+ - - static bool running = true; - static int anotherWMRunning(Display *, XErrorEvent *) { -diff -Nur blackbox-0.70.1/src/ScreenResource.cc blackbox-0.70.1-new/src/ScreenResource.cc ---- blackbox-0.70.1/src/ScreenResource.cc 2005-04-12 22:54:08.000000000 -0700 -+++ blackbox-0.70.1-new/src/ScreenResource.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -33,6 +33,8 @@ - - #include <assert.h> - -+#include <cstring> -+ - - static const int iconify_width = 9; - static const int iconify_height = 9; -diff -Nur blackbox-0.70.1/src/main.cc blackbox-0.70.1-new/src/main.cc ---- blackbox-0.70.1/src/main.cc 2005-01-03 02:42:57.000000000 -0700 -+++ blackbox-0.70.1-new/src/main.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -36,6 +36,8 @@ - - #include <stdio.h> - -+#include <cstring> -+ - - static void showHelp(int exitval) { - // print version - this should not be localized! -diff -Nur blackbox-0.70.1/util/bsetbg blackbox-0.70.1-new/util/bsetbg ---- blackbox-0.70.1/util/bsetbg 2004-12-22 02:40:18.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetbg 2008-05-21 20:52:44.000000000 -0700 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - - # Copyright (c) 2000-2002 Timothy M. King (tmk@lordzork.com) - # -diff -Nur blackbox-0.70.1/util/bsetroot.cc blackbox-0.70.1-new/util/bsetroot.cc ---- blackbox-0.70.1/util/bsetroot.cc 2005-03-15 00:01:37.000000000 -0700 -+++ blackbox-0.70.1-new/util/bsetroot.cc 2008-05-21 20:52:44.000000000 -0700 -@@ -27,11 +27,14 @@ - #include <Pen.hh> - #include <Texture.hh> - -+#include <cstdlib> - #include <cctype> - - #include <X11/Xatom.h> - #include <stdio.h> - -+#include <cstring> -+ - - // ignore all X errors - static int x11_error(::Display *, XErrorEvent *) diff --git a/community/blackbox/textpropertytostring-unconditional.patch b/community/blackbox/textpropertytostring-unconditional.patch deleted file mode 100644 index ed320388a..000000000 --- a/community/blackbox/textpropertytostring-unconditional.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Declare bt::textPropertyToString unconditionally. -Author: Jakub Wilk <jwilk@debian.org> -Forwarded: no -Bug-Debian: http://bugs.debian.org/614468 -Last-Update: 2011-03-12 - ---- a/lib/Util.hh -+++ b/lib/Util.hh -@@ -25,6 +25,8 @@ - #ifndef __Util_hh - #define __Util_hh - -+#include <X11/Xutil.h> -+ - #include <limits.h> - #include <string> - -@@ -94,10 +96,8 @@ - - std::string tolower(const std::string &string); - --#ifdef _XUTIL_H_ - std::string textPropertyToString(::Display *display, - ::XTextProperty& text_prop); --#endif - - } // namespace bt - diff --git a/community/boinc/PKGBUILD b/community/boinc/PKGBUILD deleted file mode 100644 index 7e24b51c0..000000000 --- a/community/boinc/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 79673 2012-11-11 01:08:11Z fyan $ -# Maintainer: Felix Yan <felixonmars@gmail.com> -# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> -# Contributor: Michal Krenek <mikos@sg1.cz> - -pkgname=boinc -pkgver=7.0.28 -pkgrel=1 -pkgdesc="Berkeley Open Infrastructure for Network Computing for desktop with X" -arch=('i686' 'x86_64') -url="http://boinc.berkeley.edu/" -license=('LGPL') -depends=('curl' 'wxgtk' 'libnotify' 'libxss' 'sqlite') -makedepends=('curl' 'libxslt' 'perl-xml-sax' 'subversion' 'wxgtk' 'libnotify') -options=('!libtool') -install=$pkgname.install -source=(boinc.rc boinc.bash boinc.desktop boinc.service boinc-AM_CONDITIONAL.patch) - -_svnroot="http://boinc.berkeley.edu/svn/tags" -_svnmod="boinc_core_release_${pkgver//./_}" - -build() { - cd ${srcdir} - - msg "Connecting to boinc.berkeley.edu SVN server..." - svn co ${_svnroot}/${_svnmod} || (error "SVN checkout failed" && return 1) - msg "SVN checkout done or server timeout" - - msg "Starting make..." - rm -fr ${_svnmod}-build - cp -r $_svnmod $_svnmod-build - cd $_svnmod-build - - patch -p1 -i ${srcdir}/boinc-AM_CONDITIONAL.patch - - ./_autosetup - - ./configure --prefix=/usr --disable-server --enable-unicode --with-ssl \ - --with-wxdir=/usr/lib --with-wx-config=$(which wx-config) \ - --disable-static --enable-client --enable-manager --with-x LDFLAGS='-lX11' - make -} - -package() { - cd ${srcdir}/$_svnmod-build - - make DESTDIR=${pkgdir} install - -#install rc-script - install -D -m755 ${srcdir}/$pkgname.rc ${pkgdir}/etc/rc.d/$pkgname - -#install systemd unit - install -D -m644 ${srcdir}/$pkgname.service ${pkgdir}/usr/lib/systemd/system/$pkgname.service - -#install bash-completion - install -D -m644 ${srcdir}/$pkgname.bash ${pkgdir}/usr/share/bash-completion/completions/$pkgname - -#install .desktop File - install -D -m644 ${srcdir}/${pkgname}.desktop \ - ${pkgdir}/usr/share/applications/${pkgname}.desktop - -#install icons - install -D -m644 ${srcdir}/${_svnmod}-build/clientgui/res/boincmgr.48x48.png \ - ${pkgdir}/usr/share/pixmaps/$pkgname.png - -#killing /etc/init.d directory - rm -rf ${pkgdir}/etc/init.d -} - -md5sums=('c6dadc333f982ea7b548602a70bd1e93' - '4d00e1aa4090a3f51feb20f5a541b9ee' - '17969d849f3cf27c2100b20a7b7a7e64' - '3d5cbab785cc8b004661b17c65883fd5' - 'e27047518dec54d4db38816487a28661') diff --git a/community/boinc/boinc-AM_CONDITIONAL.patch b/community/boinc/boinc-AM_CONDITIONAL.patch deleted file mode 100644 index 3ebf7c887..000000000 --- a/community/boinc/boinc-AM_CONDITIONAL.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- A/configure.ac -+++ B/configure.ac -@@ -39,6 +39,7 @@ AC_PROG_CC - AC_PROG_CXX - AC_PROG_F77 - AC_PROG_CPP -+AC_PROG_OBJCXX - AC_PROG_MAKE_SET - SAH_LINKS - AC_LANG_PUSH(C) -@@ -744,6 +745,8 @@ AM_CONDITIONAL(ENABLE_LIBRARIES, [test " - AM_CONDITIONAL(INSTALL_HEADERS, [test "${enable_install_headers}" = yes]) - AM_CONDITIONAL(HAVE_CUDA_LIB, [test "${enable_client}" = yes -a -f ./coprocs/CUDA/posix/${boinc_platform}/libcudart.so]) - -+PKG_CHECK_MODULES([GTK2], [gtk+-2.0]) -+ - dnl ====================================================================== - dnl some more vodoo required for building portable client-binary (client, clientgui) - dnl ====================================================================== diff --git a/community/boinc/boinc.bash b/community/boinc/boinc.bash deleted file mode 100644 index b614dd54c..000000000 --- a/community/boinc/boinc.bash +++ /dev/null @@ -1,99 +0,0 @@ -# Source this file in BASH to get command completion (using tab) for -# boinc and boinccmd. Written by Frank S. Thomas <fst@debian.org>. -# See also: http://boinc.berkeley.edu/trac/wiki/BashCommandCompletion - -_boinc() -{ - local cur prev opts - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - opts="$(boinc_client --help | \ - sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')" - - # Handle options that require one or more arguments. - case "$prev" in - --attach_project|--detach_project|--reset_project|--update_prefs|\ - --gui_rpc_port) - return 0 - ;; - esac - - # Handle options that require two arguments. - if [[ COMP_CWORD -gt 1 ]]; then - pprev="${COMP_WORDS[COMP_CWORD-2]}" - - case "$pprev" in - --attach_project) - return 0 - ;; - esac - fi - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $(compgen -W "$opts" -- "$cur") ) - return 0 - fi -} -complete -F _boinc -o default boinc_client - -_boinccmd() -{ - local cur prev opts cmds - COMPREPLY=() - cur="${COMP_WORDS[COMP_CWORD]}" - prev="${COMP_WORDS[COMP_CWORD-1]}" - - opts="--host --passwd -h --help -V --version" - cmds="$(boinc_cmd --help 2>&1 | \ - sed -n -r 's/^[[:space:]]*(--[a-z_]*).*/\1/p')" - - # The following construct assures that: - # - no command follows if one of $opts or $cmds was given - # - after --host follows only one command or --passwd and one command - # - after --passwd follows only one command - if [[ $COMP_CWORD -eq 1 ]]; then - COMPREPLY=( $(compgen -W "$opts $cmds" -- "$cur") ) - return 0 - else - if [[ "${COMP_WORDS[@]}" =~ ".* --host .* --passwd .*" ]]; then - if [[ $COMP_CWORD -eq 5 ]]; then - COMPREPLY=( $(compgen -W "$cmds" -- "$cur") ) - fi - elif [[ "${COMP_WORDS[@]}" =~ ".* --passwd .*" ]]; then - if [[ $COMP_CWORD -eq 3 ]]; then - COMPREPLY=( $(compgen -W "$cmds" -- "$cur") ) - fi - elif [[ "${COMP_WORDS[@]}" =~ ".* --host .*" ]]; then - if [[ $COMP_CWORD -eq 3 ]]; then - COMPREPLY=( $(compgen -W "--passwd $cmds" -- "$cur") ) - fi - fi - fi - - # Handle options/commands that require one or more arguments. - case "$prev" in - --get_messages|--passwd) - return 0 - ;; - - --host) - _known_hosts - return 0 - ;; - - --set_run_mode|--set_network_mode) - COMPREPLY=( $(compgen -W "always auto never" -- "$cur") ) - return 0 - ;; - - --set_screensaver_mode) - COMPREPLY=( $(compgen -W "on off" -- "$cur") ) - return 0 - ;; - esac -} -complete -F _boinccmd boinc_cmd - -# vim: syntax=sh
\ No newline at end of file diff --git a/community/boinc/boinc.desktop b/community/boinc/boinc.desktop deleted file mode 100644 index 267d56d6d..000000000 --- a/community/boinc/boinc.desktop +++ /dev/null @@ -1,16 +0,0 @@ -[Desktop Entry] -Type=Application -Version=1.0 -Exec=/usr/bin/boincmgr -Path=/var/lib/boinc -Icon=boincmgr -Categories=System;Monitor;GTK; -Name=BOINC Manager -GenericName=BOINC monitor and control utility -GenericName[cs]=Monitorovací a ovládací nástroj pro BOINC -GenericName[de]=BOINC Überwachungs- und Kontrollprogramm -GenericName[pt]=Monitorização BOINC e utilitário de controlo -Comment=Configure or monitor a BOINC core client -Comment[cs]=Monitoruje a nastavuje klienta BOINC -Comment[de]=BOINC Basis Client konfigurieren oder überwachen -Comment[pt]=Configurar ou monitorizar o cliente básico do BOINC diff --git a/community/boinc/boinc.install b/community/boinc/boinc.install deleted file mode 100644 index b54002ada..000000000 --- a/community/boinc/boinc.install +++ /dev/null @@ -1,23 +0,0 @@ -# arg 1: the new package version -post_install() { - /usr/sbin/groupadd boinc 2>/dev/null || true - /usr/sbin/useradd -s /bin/bash -g boinc -d /var/lib/boinc boinc 2>/dev/null || true - - if [ ! -d /var/lib/boinc ]; then - install -d /var/lib/boinc - fi - chown -R boinc:boinc /var/lib/boinc - - echo '>>> Client RPC password can be found in /var/lib/boinc/gui_rpc_auth.cfg' - echo '>>> (this file is generated after first run of /etc/rc.d/boinc start).' - echo '>>> Remove it from gui_rpc_auth.cfg if you do not want to use password.' - echo '>>> See more details on the Arch Linux BOINC wiki page.' -} - -# arg 1: the old package version -post_remove() { - /usr/sbin/userdel boinc - /usr/sbin/groupdel boinc - - echo '>>> If you really do not want to run Boinc in the future, you may completely remove the directory "/var/lib/boinc".' -} diff --git a/community/boinc/boinc.rc b/community/boinc/boinc.rc deleted file mode 100644 index 160043a04..000000000 --- a/community/boinc/boinc.rc +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - - -BOINCUSER="boinc" -BOINCDIR="/var/lib/boinc" -PID=`pidof -o %PPID /usr/bin/boinc_client` -case "$1" in - attach) - echo "Enter the Project URL: " - read url - echo "Enter your Account Key: " - read key - echo "Attaching to project" - cd $BOINCDIR - su $BOINCUSER -c "boinccmd --project_attach $url $key" -;; - start) - stat_busy "Starting boinc" - if [ -z "$PID" ]; then - su $BOINCUSER -c "nice -n 19 /usr/bin/boinc_client --daemon --dir ${BOINCDIR} --redirectio" - else - false - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon boinc - stat_done - fi - ;; - stop) - stat_busy "Stopping boinc" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon boinc - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {attach|start|stop|restart}" -esac -exit 0 diff --git a/community/boinc/boinc.service b/community/boinc/boinc.service deleted file mode 100644 index 12634ff5a..000000000 --- a/community/boinc/boinc.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=BOINC Daemon - -[Service] -User=boinc -Nice=19 -ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio - -[Install] -WantedBy=multi-user.target diff --git a/community/calcurse/PKGBUILD b/community/calcurse/PKGBUILD index be65222f7..c6388e351 100644 --- a/community/calcurse/PKGBUILD +++ b/community/calcurse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81291 2012-12-16 10:48:59Z lfleischer $ +# $Id: PKGBUILD 84062 2013-02-09 16:21:30Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Ronald van Haren <ronald.archlinux.org> # Contributor: wain <wain.at.gmx.net> pkgname=calcurse -pkgver=3.1.2 +pkgver=3.1.4 pkgrel=1 pkgdesc='A text-based personal organizer.' arch=('i686' 'x86_64' 'mips64el') @@ -13,8 +13,8 @@ license=('BSD') depends=('ncurses') install='calcurse.install' source=("http://calcurse.org/files/${pkgname}-${pkgver}.tar.gz"{,.asc}) -md5sums=('9ad32bd0efa9c8ed1e1d7df49aef5663' - '484c86e82252d39917d00fe4f80d807f') +md5sums=('e354bdb7636daffa99ffb98534d04cb2' + '44baaf17198e2fd75d2d160dedee814f') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/calf/include_fix.patch b/community/calf/include_fix.patch deleted file mode 100644 index 243bd86ab..000000000 --- a/community/calf/include_fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -aur calf-0.0.18.6.orig/src/benchmark.cpp calf-0.0.18.6/src/benchmark.cpp ---- calf-0.0.18.6.orig/src/benchmark.cpp 2012-07-08 21:57:55.246042862 +0800 -+++ calf-0.0.18.6/src/benchmark.cpp 2012-07-08 21:58:20.015908672 +0800 -@@ -26,6 +26,7 @@ - #include <stdlib.h> - #include <string.h> - #include <config.h> -+#include <unistd.h> - #include <calf/audio_fx.h> - - #ifdef BENCHMARK_PLUGINS -diff -aur calf-0.0.18.6.orig/src/osctlnet.cpp calf-0.0.18.6/src/osctlnet.cpp ---- calf-0.0.18.6.orig/src/osctlnet.cpp 2012-07-08 21:57:55.246042862 +0800 -+++ calf-0.0.18.6/src/osctlnet.cpp 2012-07-08 21:58:19.002580827 +0800 -@@ -26,6 +26,7 @@ - #include <stdlib.h> - #include <sstream> - #include <stdio.h> -+#include <unistd.h> - using namespace osctl; - using namespace std; - -diff -aur calf-0.0.18.6.orig/src/preset.cpp calf-0.0.18.6/src/preset.cpp ---- calf-0.0.18.6.orig/src/preset.cpp 2012-07-08 21:57:55.246042862 +0800 -+++ calf-0.0.18.6/src/preset.cpp 2012-07-08 21:58:18.989247567 +0800 -@@ -20,6 +20,7 @@ - */ - - #include <config.h> -+#include <unistd.h> - #include <fcntl.h> - #include <stdlib.h> - #include <errno.h> diff --git a/community/calibre/PKGBUILD b/community/calibre/PKGBUILD deleted file mode 100644 index 32dcab244..000000000 --- a/community/calibre/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 81470 2012-12-21 14:35:15Z giovanni $ -# Maintainer: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Petrov Roman <nwhisper@gmail.com> -# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com> - -pkgname=calibre -pkgver=0.9.11 -pkgrel=1 -pkgdesc="Ebook management application" -arch=('i686' 'x86_64') -url="http://calibre-ebook.com/" -license=('GPL3') -depends=('python2-dateutil' 'python2-cssutils' 'python2-cherrypy' - 'python2-mechanize' 'podofo' 'libwmf' 'python2-beautifulsoup3' - 'imagemagick' 'poppler-qt' 'chmlib' 'python2-lxml' 'libusbx' - 'python2-imaging' 'shared-mime-info' 'python2-dnspython' - 'libunrar' 'python2-pyqt' 'python2-psutil' 'icu' 'libmtp' - 'python2-netifaces' 'python2-cssselect') -makedepends=('python2-pycountry') -optdepends=('ipython2: to use calibre-debug') -install=calibre.install -source=("http://calibre-ebook.googlecode.com/files/${pkgname}-${pkgver}.tar.xz" - 'desktop_integration.patch' - 'calibre-mount-helper') -md5sums=('07e620aed65d7bae2a27ccea123da4c9' - '42c07b43d575b5e7e7524bd7b9528f0e' - '675cd87d41342119827ef706055491e7') - -build() { - cd "${srcdir}/${pkgname}" - - #rm -rf src/{cherrypy,pyPdf} - rm -rf src/cherrypy - sed -i -e "s/ldflags = shlex.split(ldflags)/ldflags = shlex.split(ldflags) + ['-fPIC']/" setup/extensions.py - - # Fix for calibre-0.8.58 - sed -i -e "s:#!usr:#!/usr:g" src/calibre/ebooks/markdown/extensions/meta.py - - sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#![ ]/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ - $(find . -regex ".*.py\|.*.recipe") - - LANG='en_US.UTF-8' python2 setup.py build - # LANG='en_US.UTF-8' python2 setup.py resources - LANG='en_US.UTF-8' python2 setup.py translations -} - -package() { - cd "${srcdir}/${pkgname}" - - patch -Np1 -i "${srcdir}/desktop_integration.patch" - - # More on desktop integration (e.g. enforce arch defaults) - sed -i -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \ - -e "s|self.opts.staging_sharedir, 'man/man1'|self.opts.staging_root, 'usr/share/man/man1'|" \ - -e "s|manpath, prog+'.1'+__appname__+'.bz2'|manpath, prog+'.1'+'.bz2'|" \ - -e "s|old_udev = '/etc|old_udev = '${pkgdir}/etc|" \ - -e "s/^Name=calibre/Name=Calibre/g" src/calibre/linux.py - - # Fix the environment module location - sed -i -e "s|(prefix=.*)|(prefix='$pkgdir/usr')|g" setup/install.py - - install -d "${pkgdir}/usr/lib/python2.7/site-packages" - LANG='en_US.UTF-8' python2 setup.py install --root="${pkgdir}" --prefix=/usr \ - --staging-bindir="${pkgdir}/usr/bin" \ - --staging-libdir="${pkgdir}/usr/lib" \ - --staging-sharedir="${pkgdir}/usr/share" - - find "${pkgdir}" -type d -empty -delete - - # See http://lwn.net/SubscriberLink/465311/7c299471a5399167/ - rm -rf "${pkgdir}/usr/bin/calibre-mount-helper" - install -m 755 "${srcdir}/calibre-mount-helper" "${pkgdir}/usr/bin" -} diff --git a/community/calibre/calibre-mount-helper b/community/calibre/calibre-mount-helper deleted file mode 100755 index 00cac4270..000000000 --- a/community/calibre/calibre-mount-helper +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -e -# Replacement for upstream mount helper using udisks/eject -# (C) 2010 Martin Pitt <mpitt@debian.org> - -ACTION="$1" -DEV="$2" - -case "$ACTION" in - mount) - udisks --mount "$DEV" - - # check if mount worked. If not, fail - # udisks does return 0 even if mount failed - mount | grep -q "$DEV" || exit 0 - ;; - - eject) - eject "$DEV" - ;; - - cleanup) - ;; - - *) - echo "unknown action" >&2 - exit 1 -esac - diff --git a/community/calibre/calibre.install b/community/calibre/calibre.install deleted file mode 100644 index 6210bd0ab..000000000 --- a/community/calibre/calibre.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 -} - -post_remove() { - post_install -} diff --git a/community/calibre/desktop_integration.patch b/community/calibre/desktop_integration.patch deleted file mode 100644 index 4c756f5d4..000000000 --- a/community/calibre/desktop_integration.patch +++ /dev/null @@ -1,109 +0,0 @@ ---- a/src/calibre/linux.py 2012-09-21 06:56:20.000000000 +0200 -+++ b/src/calibre/linux.py 2012-09-22 18:51:12.000000000 +0200 -@@ -179,19 +179,6 @@ - self.setup_completion() - if islinux or isbsd: - self.setup_desktop_integration() -- self.create_uninstaller() -- -- from calibre.utils.config import config_dir -- if os.path.exists(config_dir): -- os.chdir(config_dir) -- if islinux or isbsd: -- for f in os.listdir('.'): -- if os.stat(f).st_uid == 0: -- import shutil -- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f) -- if os.stat(config_dir).st_uid == 0: -- os.rmdir(config_dir) -- - if warn is None and self.warnings: - self.info('There were %d warnings'%len(self.warnings)) - for args, kwargs in self.warnings: -@@ -237,7 +224,7 @@ - if isnetbsd: - f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre') - else: -- f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre') -+ f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre') - if not os.path.exists(os.path.dirname(f)): - os.makedirs(os.path.dirname(f)) - self.manifest.append(f) -@@ -357,63 +344,39 @@ - - with TemporaryDirectory() as tdir, CurrentDir(tdir), \ - PreserveMIMEDefaults(): -- render_img('mimetypes/lrf.png', 'calibre-lrf.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrf', '128')) -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True) -- self.icon_resources.append(('mimetypes', 'application-lrs', -- '128')) -- render_img('mimetypes/mobi.png', 'calibre-mobi.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-mobi.png application-x-mobipocket-ebook', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-mobipocket-ebook', '128')) -- render_img('mimetypes/tpz.png', 'calibre-tpz.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-tpz.png application-x-topaz-ebook', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-topaz-ebook', '128')) -- render_img('mimetypes/azw2.png', 'calibre-azw2.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw2.png application-x-kindle-application', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-kindle-application', '128')) -- render_img('mimetypes/azw3.png', 'calibre-azw3.png') -- cc('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-azw3.png application-x-mobi8-ebook', shell=True) -- self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128')) -- render_img('lt.png', 'calibre-gui.png', width=256, height=256) -- cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True) -- self.icon_resources.append(('apps', 'calibre-gui', '128')) -- render_img('viewer.png', 'calibre-viewer.png') -- cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True) -- self.icon_resources.append(('apps', 'calibre-viewer', '128')) -+ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps') -+ os.mkdir(dir) -+ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png')) -+ render_img('lt.png', os.path.join(dir, 'calibre-gui.png')) -+ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png')) - - mimetypes = set([]) - for x in all_input_formats(): - mt = guess_type('dummy.'+x)[0] -- if mt and 'chemical' not in mt and 'ctc-posml' not in mt: -+ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt: - mimetypes.add(mt) - - def write_mimetypes(f): - f.write('MimeType=%s;\n'%';'.join(mimetypes)) - -- f = open('calibre-lrfviewer.desktop', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../applications') -+ os.mkdir(dir) -+ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb') - f.write(VIEWER) - f.close() -- f = open('calibre-ebook-viewer.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb') - f.write(EVIEWER) - write_mimetypes(f) - f.close() -- f = open('calibre-gui.desktop', 'wb') -+ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb') - f.write(GUI) - write_mimetypes(f) - f.close() -- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop', -- 'calibre-ebook-viewer.desktop') -- for x in des: -- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x] -- cc(' '.join(cmd), shell=True) -- self.menu_resources.append(x) -- cc(['xdg-desktop-menu', 'forceupdate']) -- f = open('calibre-mimetypes.xml', 'wb') -+ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/') -+ os.makedirs(dir) -+ f = open(os.path.join(dir, 'calibre.xml'), 'wb') - f.write(MIME) - f.close() -- self.mime_resources.append('calibre-mimetypes.xml') -- cc('xdg-mime install ./calibre-mimetypes.xml', shell=True) - except Exception: - if self.opts.fatal_errors: - raise diff --git a/community/catalyst-utils/PKGBUILD b/community/catalyst-utils/PKGBUILD deleted file mode 100644 index 3fa6a4509..000000000 --- a/community/catalyst-utils/PKGBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# $Id: PKGBUILD 77684 2012-10-13 13:37:15Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero -# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert - -pkgbase=catalyst-utils -pkgname=('catalyst-utils' 'opencl-catalyst') -pkgver=12.9 -pkgrel=0.1 -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" - https://launchpad.net/ubuntu/quantal/+source/fglrx-installer/2:9.000-0ubuntu1/+files/fglrx-installer_9.000.orig.tar.gz - fglrx-authfile-locations.patch - atieventsd - atieventsd.service) -md5sums=('2bb6e8193fdddff9bbd2e3d9f9e8f39b' - '31ec3f0432dc2e9bf3203223aa75ce20' - 'f729bf913613f49b0b9759c246058a87' - '4bdb353dea68e33ac9e20ec30cc42082') - -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 -# -# cd fglrx-install - patch -Np2 -i fglrx-authfile-locations.patch -} - -package_catalyst-utils() { - pkgdesc="AMD Catalyst drivers utilities and libraries." - provides=('libgl') - conflicts=('libgl' 'nvidia-utils') - depends=('xorg-server>=1.7.0' 'gcc-libs' 'libxinerama' 'libxcursor' 'libxxf86vm' 'libxrandr' 'libsm' 'fontconfig' 'libxi' 'netkit-bsd-finger') - optdepends=('qt: amdcccle' - 'acpid: acpi event support') - - 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} - install -m755 usr/sbin/* "${pkgdir}/usr/sbin/" - install -m755 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 usr/include/GL/* "${pkgdir}/usr/include/GL/" - - # xorg/dri/gl/... drivers - cd 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}/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}/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 libXvBAW.so.1.0 "${pkgdir}/usr/lib/libXvBAW.so" - ln -s libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1" - - # various files - cd ${srcdir} - 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}/usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" - install -Dm644 "${srcdir}/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}/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}//usr/share/doc/fglrx/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" -} diff --git a/community/catalyst-utils/atieventsd b/community/catalyst-utils/atieventsd deleted file mode 100644 index 16bd9a4fa..000000000 --- a/community/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/catalyst-utils/atieventsd.service b/community/catalyst-utils/atieventsd.service deleted file mode 100644 index 90af165bd..000000000 --- a/community/catalyst-utils/atieventsd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Catalyst event Daemon -Requires=acpid.socket - -[Service] -ExecStart=/usr/sbin/atieventsd --nodaemon - -[Install] -WantedBy=multi-user.target - diff --git a/community/catalyst-utils/fglrx-authfile-locations.patch b/community/catalyst-utils/fglrx-authfile-locations.patch deleted file mode 100644 index 3617e310b..000000000 --- a/community/catalyst-utils/fglrx-authfile-locations.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: ati803/common/etc/ati/authatieventsd.sh -=================================================================== ---- ati803/common/etc/ati/authatieventsd.sh -+++ ati803/common/etc/ati/authatieventsd.sh 2008-04-18 23:25:27.000000000 +0300 -@@ -34,8 +34,9 @@ - - # Check xdm/kdm - -- XDM_AUTH_MASK=/var/lib/xdm/authdir/authfiles/A$1* -- XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file -+ XDM_AUTH_MASK=/var/lib/xdm/authfiles/A$1* -+ KDM_AUTH_MASK=/var/run/xauth/A$1* -+ XDM_AUTH_FILE=`ls -t $XDM_AUTH_MASK $KDM_AUTH_MASK 2>/dev/null | head -n 1` # Choose the newest file - if [ -n "$XDM_AUTH_FILE" ]; then - SERVER_AUTH_FILE=$XDM_AUTH_FILE - DISP_SEARCH_STRING="#ffff#" diff --git a/community/cdemu-client/PKGBUILD b/community/cdemu-client/PKGBUILD deleted file mode 100644 index f31a9608a..000000000 --- a/community/cdemu-client/PKGBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Charles Lindsay <charles@chaoslizard.org> - -pkgname=cdemu-client -pkgver=1.5.0 -pkgrel=2 -pkgdesc="Simple command-line client for controlling cdemu-daemon" -arch=('i686' 'x86_64' 'mips64el') -url="http://cdemu.sourceforge.net/" -license=('GPL') -depends=('python2' 'dbus-python' 'cdemu-daemon') -makedepends=('intltool') -conflicts=('cdemu') -source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2") -md5sums=('11141138f2b91a7100445d9c32b31181') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' src/cdemu - - # bash completion dir change - sed -e 's,bashcompdir = $(sysconfdir)/bash_completion.d,bashcompdir = $(datadir)/bash-completion/completions,' -i data/Makefile.am data/Makefile.in - - ./configure --prefix=/usr - - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/cdemu-daemon/cdemud-dbus.conf b/community/cdemu-daemon/cdemud-dbus.conf deleted file mode 100644 index 3043fe251..000000000 --- a/community/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/cdemu-daemon/cdemud.conf b/community/cdemu-daemon/cdemud.conf deleted file mode 100644 index 1d8c55fe6..000000000 --- a/community/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/cdemu-daemon/cdemud.rc b/community/cdemu-daemon/cdemud.rc deleted file mode 100644 index 09b9ec345..000000000 --- a/community/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/chrony/chrony b/community/chrony/chrony deleted file mode 100755 index ec042d798..000000000 --- a/community/chrony/chrony +++ /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/chrony/rc.d b/community/chrony/rc.d deleted file mode 100644 index ec042d798..000000000 --- a/community/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/cinelerra-cv/PKGBUILD b/community/cinelerra-cv/PKGBUILD deleted file mode 100644 index 339265f54..000000000 --- a/community/cinelerra-cv/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 80152 2012-11-16 23:35:55Z ioni $ -# Maintainer: Ray Rashif <schiv@archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Alexander Rødseth <rodseth@gmail.com> - -pkgname=cinelerra-cv -pkgver=2.2 -_gitrel=2.2.0 -pkgrel=12 -epoch=1 -pkgdesc="Professional video editing and compositing environment" -arch=('x86_64' 'i686') -url="http://cinelerra.org/" -license=('GPL') -depends=('e2fsprogs' 'libavc1394' 'libiec61883' 'freetype2' - 'libtiff' 'mjpegtools' 'fftw' 'a52dec' 'glu' - 'ffmpeg' 'libxv' 'faad2' 'faac' 'openexr' 'ilmbase>=1.0.3') -makedepends=('git' 'nasm' 'mesa') -options=('!libtool') -source=('v4l1_removal.patch' - 'ffmpeg_api.patch') -md5sums=('bfa85e20809429d88eba4ab83e569612' - 'b05ec2fb54e7d02f6167525417802111') - -_gituri="git://git.cinelerra.org/CinelerraCV.git" -_gitdir="cinelerra" - -_confit() { - ./configure --prefix=/usr \ - --with-buildinfo=git/recompile \ - --with-external-ffmpeg \ - --enable-opengl \ - --disable-esd $@ -} - -build() { - msg "Connecting to GIT server...." - - if [ -d $_gitdir ] ; then - cd $_gitdir && git pull origin - msg "The local files are updated." - else - git clone $_gituri -b rel$_gitrel $_gitdir - fi - - msg "GIT checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$_gitdir-build" - cp -r "$srcdir/$_gitdir" "$srcdir/$_gitdir-build" - cd "$srcdir/$_gitdir-build" - - # gcc 4.6 workaround - export CFLAGS+=" -Wwrite-strings -D__STDC_CONSTANT_MACROS" - export CPPFLAGS="$CFLAGS" - - # remove executable stack - export LDFLAGS+=" -Wl,-z,noexecstack" - - # v4l1 removal patch - patch -Np1 -i "$srcdir/v4l1_removal.patch" - - # new ffmpeg api patch - patch -Np1 -i "$srcdir/ffmpeg_api.patch" - - sed -i -e '/Debian/d' admin/nasm - - # if you don't need OpenGL comment out the next line (and no glu/mesa dep) - sed -i '/\/X11R6/s///' configure.in - - ./autogen.sh - - if [ "$CARCH" = 'x86_64' ]; then - _confit --disable-mmx - else - _confit --enable-mmx - fi - - make -} - -package() { - cd "$srcdir/$_gitdir-build" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/cinelerra-cv/ffmpeg_api.patch b/community/cinelerra-cv/ffmpeg_api.patch deleted file mode 100644 index d9747476c..000000000 --- a/community/cinelerra-cv/ffmpeg_api.patch +++ /dev/null @@ -1,163 +0,0 @@ -diff --git a/cinelerra/ffmpeg.C b/cinelerra/ffmpeg.C -index 6ab6047..7cde503 100644 ---- a/cinelerra/ffmpeg.C -+++ b/cinelerra/ffmpeg.C -@@ -23,7 +23,6 @@ FFMPEG::FFMPEG(Asset *asset) { - - int FFMPEG::init(char *codec_string) { - -- avcodec_init(); - avcodec_register_all(); - - CodecID id = codec_id(codec_string); -@@ -364,12 +363,15 @@ int FFMPEG::decode(uint8_t *data, long data_size, VFrame *frame_out) { - - // NOTE: frame must already have data space allocated - -+ AVPacket pkt; - got_picture = 0; -- int length = avcodec_decode_video(context, -+ av_init_packet( &pkt ); -+ pkt.data = data; -+ pkt.size = data_size; -+ int length = avcodec_decode_video2(context, - picture, - &got_picture, -- data, -- data_size); -+ &pkt); - - if (length < 0) { - printf("FFMPEG::decode error decoding frame\n"); -diff --git a/cinelerra/fileac3.C b/cinelerra/fileac3.C -index a1ef61e..e56705f 100644 ---- a/cinelerra/fileac3.C -+++ b/cinelerra/fileac3.C -@@ -84,7 +84,6 @@ int FileAC3::open_file(int rd, int wr) - - if(wr) - { -- avcodec_init(); - avcodec_register_all(); - codec = avcodec_find_encoder(CODEC_ID_AC3); - if(!codec) -diff --git a/quicktime/mpeg4.c b/quicktime/mpeg4.c -index 81cb72b..67bcab8 100644 ---- a/quicktime/mpeg4.c -+++ b/quicktime/mpeg4.c -@@ -629,7 +629,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -674,7 +673,7 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - #if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0) - context->error_resilience = FF_ER_CAREFUL; - #else -- context->error_recognition = FF_ER_CAREFUL; -+ context->err_recognition = AV_EF_CRCCHECK; - #endif - context->error_concealment = 3; - context->frame_skip_cmp = FF_CMP_DCTMAX; -@@ -699,7 +698,6 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - context->profile= FF_PROFILE_UNKNOWN; - context->rc_buffer_aggressivity = 1.0; - context->level= FF_LEVEL_UNKNOWN; -- context->flags |= CODEC_FLAG_H263P_UMV; - context->flags |= CODEC_FLAG_AC_PRED; - - // All the forbidden settings can be extracted from libavcodec/mpegvideo.c of ffmpeg... -@@ -717,10 +715,8 @@ static int encode(quicktime_t *file, unsigned char **row_pointers, int track) - (codec->ffmpeg_id == CODEC_ID_MPEG4 || - codec->ffmpeg_id == CODEC_ID_MPEG1VIDEO || - codec->ffmpeg_id == CODEC_ID_MPEG2VIDEO || -- codec->ffmpeg_id == CODEC_ID_H263P || -- codec->ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) -+ codec->ffmpeg_id == CODEC_ID_H263P)) - { -- avcodec_thread_init(context, file->cpus); - context->thread_count = file->cpus; - } - -diff --git a/quicktime/qtffmpeg.c b/quicktime/qtffmpeg.c -index 8c532c2..a2b51e9 100644 ---- a/quicktime/qtffmpeg.c -+++ b/quicktime/qtffmpeg.c -@@ -54,7 +54,6 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -90,10 +89,8 @@ quicktime_ffmpeg_t* quicktime_new_ffmpeg(int cpus, - (ffmpeg_id == CODEC_ID_MPEG4 || - ffmpeg_id == CODEC_ID_MPEG1VIDEO || - ffmpeg_id == CODEC_ID_MPEG2VIDEO || -- ffmpeg_id == CODEC_ID_H263P || -- ffmpeg_id == CODEC_FLAG_H263P_SLICE_STRUCT)) -+ ffmpeg_id == CODEC_ID_H263P)) - { -- avcodec_thread_init(context, cpus); - context->thread_count = cpus; - } - if(avcodec_open(context, -@@ -181,6 +178,7 @@ static int decode_wrapper(quicktime_t *file, - - if(!result) - { -+ AVPacket pkt; - - - // No way to determine if there was an error based on nonzero status. -@@ -189,11 +187,13 @@ static int decode_wrapper(quicktime_t *file, - ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_NONREF /* AVDISCARD_BIDIR */; - else - ffmpeg->decoder_context[current_field]->skip_frame = AVDISCARD_DEFAULT; -- result = avcodec_decode_video(ffmpeg->decoder_context[current_field], -+ av_init_packet( &pkt ); -+ pkt.data = ffmpeg->work_buffer; -+ pkt.size = bytes + header_bytes; -+ result = avcodec_decode_video2(ffmpeg->decoder_context[current_field], - &ffmpeg->picture[current_field], - &got_picture, -- ffmpeg->work_buffer, -- bytes + header_bytes); -+ &pkt); - - - -diff --git a/quicktime/wma.c b/quicktime/wma.c -index c045741..abc2dc8 100644 ---- a/quicktime/wma.c -+++ b/quicktime/wma.c -@@ -67,7 +67,6 @@ static int init_decode(quicktime_audio_map_t *track_map, - if(!ffmpeg_initialized) - { - ffmpeg_initialized = 1; -- avcodec_init(); - avcodec_register_all(); - } - -@@ -195,11 +194,14 @@ printf("decode 2 %x %llx %llx\n", chunk_size, chunk_offset, chunk_offset + chunk - chunk_size); - #else - bytes_decoded = AVCODEC_MAX_AUDIO_FRAME_SIZE; -- result = avcodec_decode_audio2(codec->decoder_context, -+ AVPacket pkt; -+ av_init_packet( &pkt ); -+ pkt.data = codec->packet_buffer; -+ pkt.size = chunk_size; -+ result = avcodec_decode_audio3(codec->decoder_context, - (int16_t*)(codec->work_buffer + codec->output_size * sample_size), - &bytes_decoded, -- codec->packet_buffer, -- chunk_size); -+ &pkt); - #endif - - pthread_mutex_unlock(&ffmpeg_lock); diff --git a/community/cinelerra-cv/v4l1_removal.patch b/community/cinelerra-cv/v4l1_removal.patch deleted file mode 100644 index 9df4004fe..000000000 --- a/community/cinelerra-cv/v4l1_removal.patch +++ /dev/null @@ -1,125 +0,0 @@ -http://bugs.cinelerra.org/ticket/949 -https://bugs.gentoo.org/show_bug.cgi?id=361709 - -diff -Nru cinelerra.orig//cinelerra/channelpicker.C cinelerra/cinelerra/channelpicker.C ---- cinelerra.orig//cinelerra/channelpicker.C 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/channelpicker.C 2011-02-17 13:31:30.147880002 -0500 -@@ -39,7 +39,7 @@ - #include "recordgui.h" - #include "recordmonitor.h" - #include "theme.h" --#include "vdevicebuz.h" -+//#include "vdevicebuz.h" - #include "vdeviceprefs.h" - #include "videodevice.h" - -@@ -280,7 +280,7 @@ - // printf("PrefsChannelPicker::PrefsChannelPicker 1\n"); - this->mwindow = mwindow; - this->prefs = prefs; -- VDeviceBUZ::get_inputs(&input_sources); -+// VDeviceBUZ::get_inputs(&input_sources); - } - - PrefsChannelPicker::~PrefsChannelPicker() -diff -Nru cinelerra.orig//cinelerra/Makefile.am cinelerra/cinelerra/Makefile.am ---- cinelerra.orig//cinelerra/Makefile.am 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/Makefile.am 2011-02-17 13:31:30.147880002 -0500 -@@ -305,10 +305,8 @@ - vattachmentpoint.C \ - vautomation.C \ - vdevicebase.C \ -- vdevicebuz.C \ - vdevicedvb.C \ - vdeviceprefs.C \ -- vdevicev4l.C \ - vdevicev4l2.C \ - vdevicev4l2jpeg.C \ - vdevicex11.C \ -diff -Nru cinelerra.orig//cinelerra/reversemake cinelerra/cinelerra/reversemake ---- cinelerra.orig//cinelerra/reversemake 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/reversemake 2011-02-17 13:31:30.151880002 -0500 -@@ -32,10 +32,8 @@ - make $OBJDIR/vedits.o - make $OBJDIR/vedit.o - make $OBJDIR/vdevicex11.o --make $OBJDIR/vdevicev4l.o - make $OBJDIR/vdeviceprefs.o - make $OBJDIR/vdevicelml.o --make $OBJDIR/vdevicebuz.o - make $OBJDIR/vdevicebase.o - make $OBJDIR/vdevice1394.o - make $OBJDIR/vautomation.o -diff -Nru cinelerra.orig//cinelerra/videodevice.C cinelerra/cinelerra/videodevice.C ---- cinelerra.orig//cinelerra/videodevice.C 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/videodevice.C 2011-02-17 13:41:53.239880001 -0500 -@@ -39,9 +39,9 @@ - #ifdef HAVE_FIREWIRE - #include "vdevice1394.h" - #endif --#include "vdevicebuz.h" -+//#include "vdevicebuz.h" - #include "vdevicedvb.h" --#include "vdevicev4l.h" -+//#include "vdevicev4l.h" - #include "vdevicev4l2.h" - #include "vdevicev4l2jpeg.h" - #include "vdevicex11.h" -@@ -203,7 +203,6 @@ - result = input_base->open_input(); - break; - -- - #ifdef HAVE_VIDEO4LINUX2 - case VIDEO4LINUX2: - new_device_base(); -@@ -250,8 +249,8 @@ - { - switch(in_config->driver) - { -- case VIDEO4LINUX: -- return input_base = new VDeviceV4L(this); -+ //case VIDEO4LINUX: -+ // return input_base = new VDeviceV4L(this); - - #ifdef HAVE_VIDEO4LINUX2 - case VIDEO4LINUX2: -@@ -264,8 +263,8 @@ - case SCREENCAPTURE: - return input_base = new VDeviceX11(this, 0); - -- case CAPTURE_BUZ: -- return input_base = new VDeviceBUZ(this); -+ //case CAPTURE_BUZ: -+ // return input_base = new VDeviceBUZ(this); - - #ifdef HAVE_FIREWIRE - case CAPTURE_FIREWIRE: -@@ -662,9 +661,9 @@ - //printf("VideoDevice::open_output 1 %d\n", out_config->driver); - switch(out_config->driver) - { -- case PLAYBACK_BUZ: -- output_base = new VDeviceBUZ(this); -- break; -+ //case PLAYBACK_BUZ: -+ // output_base = new VDeviceBUZ(this); -+ // break; - case PLAYBACK_X11: - case PLAYBACK_X11_XV: - case PLAYBACK_X11_GL: -diff -Nru cinelerra.orig//cinelerra/videodevice.h cinelerra/cinelerra/videodevice.h ---- cinelerra.orig//cinelerra/videodevice.h 2010-11-24 18:18:03.000000000 -0500 -+++ cinelerra/cinelerra/videodevice.h 2011-02-17 13:31:30.167880002 -0500 -@@ -40,9 +40,9 @@ - #include "thread.h" - #include "picture.inc" - #include "vdevicebase.inc" --#include "vdevicebuz.inc" -+//#include "vdevicebuz.inc" - #include "vdevicelml.inc" --#include "vdevicev4l.inc" -+//#include "vdevicev4l.inc" - #include "vdevicex11.inc" - #include "videoconfig.inc" - #include "videowindow.inc" diff --git a/community/cinnamon/fix-cursor-change.patch b/community/cinnamon/fix-cursor-change.patch deleted file mode 100644 index 626b3e19e..000000000 --- a/community/cinnamon/fix-cursor-change.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- cinnamon-original/files/usr/lib/cinnamon-settings/cinnamon-settings.py 2012-11-14 15:45:14.000000000 +0100 -+++ cinnamon-new/files/usr/lib/cinnamon-settings/cinnamon-settings.py 2013-01-21 12:49:11.332556000 +0100 - try: - import os -@@ -915,7 +915,8 @@ - valid.sort(lambda a,b: cmp(a.lower(), b.lower())) - res = [] - for i in valid: -- res.append((i, i)) -+ if i != 'default': -+ res.append((i, i)) - return res - - def _load_keybinding_themes(self): -@@ -933,7 +934,8 @@ - valid.sort(lambda a,b: cmp(a.lower(), b.lower())) - res = [] - for i in valid: -- res.append((i, i)) -+ if i != 'default': -+ res.append((i, i)) - return res - - def _load_window_themes(self): -@@ -1638,7 +1640,7 @@ - def onCategoryChanged(self, tree): - self.kb_store.clear() - if tree.get_selection() is not None: -- categories, iter = tree.get_selection().get_selected() -+ categories, iter = tree.get_selection().get_selected() - if iter: - category = categories[iter][1] - if category.int_name is not "custom": -@@ -2005,7 +2007,7 @@ - - def on_my_setting_changed(self, settings, key): - self.content_widget.set_text(self.settings.get_string(self.key)) -- -+ - def on_my_value_changed(self, event, widget): - self.settings.set_string(self.key, self.content_widget.get_text()) - -@@ -2260,8 +2262,14 @@ - def on_my_value_changed(self, widget): - tree_iter = widget.get_active_iter() - if tree_iter != None: -- value = self.model[tree_iter][0] -+ value = self.model[tree_iter][0] - self.settings.set_string(self.key, value) -+ if self.key == 'cursor-theme': -+ if os.path.exists("/usr/share/icons/%s" % value): -+ commands.getoutput('gksudo "ln -snf /usr/share/icons/%s /usr/share/icons/default"' % value.strip()) -+ elif os.path.exists("%s/.icons/%s" % (os.path.join(os.path.expanduser("~")), value)): -+ commands.getoutput('gksudo "ln -snf %s/.icons/%s /usr/share/icons/default"' % (os.path.join(os.path.expanduser("~")), value)) -+ - - def on_dependency_setting_changed(self, settings, dep_key): - if not self.dependency_invert: diff --git a/community/clementine/PKGBUILD b/community/clementine/PKGBUILD deleted file mode 100644 index 242d2122c..000000000 --- a/community/clementine/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 81239 2012-12-14 02:06:27Z stephane $ -#Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -#Contributor: BlackEagle <ike.devolder@gmail.com> -#Contributor: Dany Martineau <dany.luc.martineau@gmail.com> - -pkgname=clementine -pkgver=1.1.1 -pkgrel=2 -pkgdesc="A music player and library organizer" -url="http://www.clementine-player.org/" -license=('GPL') -arch=('i686' 'x86_64') -depends=('gstreamer0.10-base' 'taglib' 'glew' 'liblastfm' 'libgpod' - 'libmtp' 'libplist' 'hicolor-icon-theme' 'qt' 'libimobiledevice' - 'sparsehash' 'qjson' 'libcdio' 'protobuf' 'qca' 'qca-ossl' 'gvfs') -makedepends=('cmake' 'boost' 'mesa') -optdepends=('gstreamer0.10-base-plugins: for more open formats' - 'gstreamer0.10-good-plugins: for use with "Good" plugin libraries' - 'gstreamer0.10-bad-plugins: for use with "Bad" plugin libraries' - 'gstreamer0.10-ugly-plugins: for use with "Ugly" plugin libraries') -source=(http://clementine-player.googlecode.com/files/${pkgname}-${pkgver}.tar.gz) -sha1sums=('f8d3e9c8f54ac488323ab5a629c9accbe256378e') -install=clementine.install - -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/clementine/clementine.install b/community/clementine/clementine.install deleted file mode 100644 index 2f0338d8a..000000000 --- a/community/clementine/clementine.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - - -post_remove() { - post_install $1 -} diff --git a/community/collectd/rtnl_dump_filter.patch b/community/collectd/rtnl_dump_filter.patch deleted file mode 100644 index d5929a621..000000000 --- a/community/collectd/rtnl_dump_filter.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -Naur old/src/netlink.c new/src/netlink.c ---- old/src/netlink.c 2012-01-22 22:10:04.000000000 +1100 -+++ new/src/netlink.c 2012-02-01 17:22:54.362752065 +1100 -@@ -570,8 +570,7 @@ - return (-1); - } - -- if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL, -- NULL, NULL) != 0) -+ if (rtnl_dump_filter (&rth, link_filter, /* arg1 = */ NULL) != 0) - { - ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); - return (-1); -@@ -608,8 +607,7 @@ - continue; - } - -- if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex, -- NULL, NULL) != 0) -+ if (rtnl_dump_filter (&rth, qos_filter, (void *) &ifindex) != 0) - { - ERROR ("netlink plugin: ir_read: rtnl_dump_filter failed."); - continue; diff --git a/community/compiz/compiz-build.patch b/community/compiz/compiz-build.patch deleted file mode 100644 index f22a3fa21..000000000 --- a/community/compiz/compiz-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Naur compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp compiz-0.8.8/kde/window-decorator-kde4/window.cpp ---- compiz-0.8.8-orig/kde/window-decorator-kde4/window.cpp 2012-01-29 22:05:54.000000000 -0500 -+++ compiz-0.8.8/kde/window-decorator-kde4/window.cpp 2012-01-29 22:10:38.000000000 -0500 -@@ -986,10 +986,10 @@ - { - Atom atom = Atoms::compizWindowBlurDecor; - QRegion topQRegion, bottomQRegion, leftQRegion, rightQRegion; -- Region topRegion = NULL; -- Region bottomRegion = NULL; -- Region leftRegion = NULL; -- Region rightRegion = NULL; -+ ::Region topRegion = NULL; -+ ::Region bottomRegion = NULL; -+ ::Region leftRegion = NULL; -+ ::Region rightRegion = NULL; - int size = 0; - int w, h; - diff --git a/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch b/community/conntrack-tools/02-fix-compilation-of-timeout-extension.patch deleted file mode 100644 index 746934994..000000000 --- a/community/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/conntrack-tools/conntrackd.conf b/community/conntrack-tools/conntrackd.conf deleted file mode 100644 index 285f566d2..000000000 --- a/community/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/conntrack-tools/conntrackd.rc b/community/conntrack-tools/conntrackd.rc deleted file mode 100644 index 4300a7041..000000000 --- a/community/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/couchdb/configure-fix.patch b/community/couchdb/configure-fix.patch deleted file mode 100644 index 0bb68ecfe..000000000 --- a/community/couchdb/configure-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -rup apache-couchdb-1.2.0/configure apache-couchdb-1.2.0.new/configure ---- apache-couchdb-1.2.0/configure 2012-03-29 23:05:41.000000000 +0200 -+++ apache-couchdb-1.2.0.new/configure 2012-04-08 13:50:14.923693056 +0200 -@@ -18234,7 +18234,7 @@ echo "$as_me: error: $erlang_version_err - fi - fi - --otp_release="`${ERL} -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" -+otp_release="`${ERL} -smp disable -noshell -eval 'io:put_chars(erlang:system_info(otp_release)).' -s erlang halt`" - - if test x$otp_release \> xR13B03; then - USE_OTP_NIFS_TRUE= -@@ -18253,7 +18253,7 @@ else - fi - - --has_crypto=`${ERL} -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` -+has_crypto=`${ERL} -smp disable -eval "case application:load(crypto) of ok -> ok; _ -> exit(no_crypto) end." -noshell -s init stop` - - if test -n "$has_crypto"; then - { { echo "$as_me:$LINENO: error: Could not find the Erlang crypto library. Has Erlang been compiled with OpenSSL support?" >&5 diff --git a/community/couchdb/rc-script.patch b/community/couchdb/rc-script.patch deleted file mode 100644 index 1dd723ffc..000000000 --- a/community/couchdb/rc-script.patch +++ /dev/null @@ -1,57 +0,0 @@ ---- couchdb 2011-12-27 01:21:59.000000000 +0400 -+++ couchdb.my 2011-12-27 01:21:18.000000000 +0400 -@@ -1,6 +1,4 @@ --#!/bin/bash --. /etc/rc.conf --. /etc/rc.d/functions -+#!/bin/sh -e - - # Licensed under the Apache License, Version 2.0 (the "License"); you may not - # use this file except in compliance with the License. You may obtain a copy of -@@ -31,7 +29,7 @@ - NAME=couchdb - SCRIPT_NAME=`basename $0` - COUCHDB=/usr/bin/couchdb --CONFIGURATION_FILE=/etc/conf.d/couchdb -+CONFIGURATION_FILE=/etc/default/couchdb - RUN_DIR=/var/run/couchdb - LSB_LIBRARY=/lib/lsb/init-functions - -@@ -44,14 +42,16 @@ - fi - - log_daemon_msg () { -- stat_busy $@ -+ # Dummy function to be replaced by LSB library. -+ -+ echo $@ - } - - log_end_msg () { -+ # Dummy function to be replaced by LSB library. -+ - if test "$1" != "0"; then -- stat_fail -- else -- stat_done -+ echo "Error with $DESCRIPTION: $NAME" - fi - return $1 - } -@@ -66,7 +66,7 @@ - command="$command $COUCHDB_OPTIONS" - fi - if test -n "$COUCHDB_USER"; then -- if su $COUCHDB_USER -s /bin/bash -c "$command"; then -+ if su $COUCHDB_USER -c "$command"; then - return $SCRIPT_OK - else - return $SCRIPT_ERROR -@@ -84,7 +84,6 @@ - # Start Apache CouchDB as a background process. - - mkdir -p "$RUN_DIR" -- chown -R $COUCHDB_USER "$RUN_DIR" - command="$COUCHDB -b" - if test -n "$COUCHDB_STDOUT_FILE"; then - command="$command -o $COUCHDB_STDOUT_FILE" diff --git a/community/dangerdeep/PKGBUILD b/community/dangerdeep/PKGBUILD deleted file mode 100644 index c08272acf..000000000 --- a/community/dangerdeep/PKGBUILD +++ /dev/null @@ -1,22 +0,0 @@ -# $Id: PKGBUILD 77850 2012-10-15 09:46:31Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -pkgname=dangerdeep -pkgver=0.3.0 -pkgrel=7 -pkgdesc="submarine simulator" -arch=(i686 x86_64) -url="http://dangerdeep.sourceforge.net" -license=('GPL') -depends=('libgl' 'sdl_net' 'fftw' 'sdl_image' 'sdl_mixer' 'dangerdeep-data' 'glu') -makedepends=('scons' 'mesa') -source=("http://downloads.sourceforge.net/sourceforge/dangerdeep/dangerdeep-$pkgver.tar.gz" - "build-fix.patch") -md5sums=('8a1d19326a9a0bd8bb91a652bfa51bd9' - 'a4487f079e844ec6b093ef97c151dcd7') - -build() { - cd $srcdir/$pkgname-$pkgver - patch -p1 <$srcdir/build-fix.patch - scons installbindir=$pkgdir/usr/bin datadir=/usr/share/dangerdeep install -} diff --git a/community/dangerdeep/build-fix.patch b/community/dangerdeep/build-fix.patch deleted file mode 100644 index f77e07c5a..000000000 --- a/community/dangerdeep/build-fix.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -wbBur dangerdeep-0.3.0/src/bspline_test.cpp dangerdeep-0.3.0.my/src/bspline_test.cpp ---- dangerdeep-0.3.0/src/bspline_test.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/bspline_test.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -1,6 +1,8 @@ - // some test code for the 2d bsplines! - #include "bspline.h" - #include <fstream> -+#include <cstdlib> -+ - using namespace std; - - double rnd() { return double(rand())/RAND_MAX; } -diff -wbBur dangerdeep-0.3.0/src/convoy.h dangerdeep-0.3.0.my/src/convoy.h ---- dangerdeep-0.3.0/src/convoy.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/convoy.h 2012-10-08 17:33:01.034909571 +0400 -@@ -26,6 +26,7 @@ - #include "ai.h" - #include "vector2.h" - #include <new> -+#include <memory> - #include <list> - class ship; - -diff -wbBur dangerdeep-0.3.0/src/date.cpp dangerdeep-0.3.0.my/src/date.cpp ---- dangerdeep-0.3.0/src/date.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/date.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -20,6 +20,8 @@ - // date - // subsim (C)+(W) Markus Petermann and Thorsten Jordan. SEE LICENSE - -+#include <stdio.h> -+#include <stdlib.h> - #include <iomanip> - #include "date.h" - #include "texts.h" -diff -wbBur dangerdeep-0.3.0/src/faulthandler.h dangerdeep-0.3.0.my/src/faulthandler.h ---- dangerdeep-0.3.0/src/faulthandler.h 2007-06-11 22:29:30.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/faulthandler.h 2012-10-08 17:33:23.264909316 +0400 -@@ -50,6 +50,7 @@ - #include <signal.h> - #include <string> - #include <sstream> -+#include <unistd.h> - - // Note: use --export-dynamic as linker option or you won't get function names here. - -diff -wbBur dangerdeep-0.3.0/src/filehelper.cpp dangerdeep-0.3.0.my/src/filehelper.cpp ---- dangerdeep-0.3.0/src/filehelper.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/filehelper.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -23,6 +23,7 @@ - #include "filehelper.h" - #include "error.h" - #include <vector> -+#include <stdio.h> - using namespace std; - - #ifdef WIN32 -diff -wbBur dangerdeep-0.3.0/src/ocean_wave_generator.h dangerdeep-0.3.0.my/src/ocean_wave_generator.h ---- dangerdeep-0.3.0/src/ocean_wave_generator.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/ocean_wave_generator.h 2012-10-08 17:33:01.034909571 +0400 -@@ -29,6 +29,7 @@ - #include "environment.h" - #include <complex> - #include <vector> -+#include <cstdlib> - - // use float fftw (faster) or double (default) ? - #ifdef WITH_FLOAT_FFTW -diff -wbBur dangerdeep-0.3.0/src/ptrlist.h dangerdeep-0.3.0.my/src/ptrlist.h ---- dangerdeep-0.3.0/src/ptrlist.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/ptrlist.h 2012-10-08 17:33:01.034909571 +0400 -@@ -25,6 +25,7 @@ - - #include <list> - #include <stdexcept> -+#include <memory> - - // same as std::list regarding the interface (partly), but handles pointers. - template <class T> -diff -wbBur dangerdeep-0.3.0/src/ptrvector.h dangerdeep-0.3.0.my/src/ptrvector.h ---- dangerdeep-0.3.0/src/ptrvector.h 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/ptrvector.h 2012-10-08 17:33:01.034909571 +0400 -@@ -25,6 +25,7 @@ - - #include <vector> - #include <stdexcept> -+#include <memory> - - // same as std::vector regarding the interface, but handles pointers. - template <class T> -diff -wbBur dangerdeep-0.3.0/src/widget.cpp dangerdeep-0.3.0.my/src/widget.cpp ---- dangerdeep-0.3.0/src/widget.cpp 2007-06-11 19:16:23.000000000 +0400 -+++ dangerdeep-0.3.0.my/src/widget.cpp 2012-10-08 17:33:01.034909571 +0400 -@@ -32,6 +32,8 @@ - #include "datadirs.h" - #include <set> - #include <sstream> -+#include <algorithm> -+ - using std::vector; - using std::list; - using std::string; diff --git a/community/dcfldd/PKGBUILD b/community/dcfldd/PKGBUILD deleted file mode 100644 index c28ded29f..000000000 --- a/community/dcfldd/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 83134 2013-01-27 16:12:28Z pierre $ -# Contributor: Paul Mattal <pjmattal@elys.com> -# Maintainer: Paul Mattal <pjmattal@elys.com> - -pkgname=dcfldd -pkgver=1.3.4.1 -pkgrel=3 -pkgdesc="DCFL (DoD Computer Forensics Lab) dd replacement with hashing" -arch=('i686' 'x86_64') -url="http://dcfldd.sourceforge.net/" -license=('GPL') -depends=('glibc') -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-${pkgver%.*}-${pkgver##*.}.tar.gz") -md5sums=('952026c872f11b53ce0ec6681a3eef0a') -sha1sums=('fb1c55f107a6af5ef8703a44d33476e508815913') - -build() { - cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" - ./configure --prefix=/usr --mandir=/usr/share/man - make -} - -package() { - cd "$srcdir/$pkgname-${pkgver%.*}-${pkgver##*.}" - make DESTDIR="$pkgdir" install -} diff --git a/community/dcron/PKGBUILD b/community/dcron/PKGBUILD deleted file mode 100644 index 03c03a08c..000000000 --- a/community/dcron/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# $Id: PKGBUILD 79754 2012-11-11 21:14:11Z spupykin $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Paul Mattal <paul.archlinux.org> - -pkgname=dcron -pkgver=4.5 -pkgrel=4 -pkgdesc="dillon's lightweight cron daemon" -arch=('i686' 'x86_64' 'mips64el') -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' - 'e43c3d758384ac644f5e19f460ab5f46') - -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/dcron/dcron.install b/community/dcron/dcron.install deleted file mode 100644 index df23d0224..000000000 --- a/community/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/dcron/service b/community/dcron/service deleted file mode 100644 index 47265791e..000000000 --- a/community/dcron/service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Periodic Command Scheduler - -[Service] -Type=forking -EnvironmentFile=/etc/conf.d/crond -ExecStart=/usr/sbin/crond $CROND_ARGS -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch b/community/directfb/DirectFB-1.4.9-libpng-1.5.patch deleted file mode 100644 index 65470ea8f..000000000 --- a/community/directfb/DirectFB-1.4.9-libpng-1.5.patch +++ /dev/null @@ -1,252 +0,0 @@ -From 83180b25e90721e717bf37c5332c22713508786e Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 20 Feb 2011 19:18:19 -0500 -Subject: [PATCH] png: add support for libpng 1.5.x - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - .../idirectfbimageprovider_png.c | 56 ++++++++++++------- - 1 files changed, 35 insertions(+), 21 deletions(-) - -diff --git a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c -index 6d65ea3..7d82c5c 100644 ---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c -+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c -@@ -207,7 +207,7 @@ Construct( IDirectFBImageProvider *thiz, - if (!data->png_ptr) - goto error; - -- if (setjmp( data->png_ptr->jmpbuf )) { -+ if (setjmp( png_jmpbuf( data->png_ptr ))) { - D_ERROR( "ImageProvider/PNG: Error reading header!\n" ); - goto error; - } -@@ -292,7 +292,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, - rect = dst_data->area.wanted; - } - -- if (setjmp( data->png_ptr->jmpbuf )) { -+ if (setjmp( png_jmpbuf( data->png_ptr ))) { - D_ERROR( "ImageProvider/PNG: Error during decoding!\n" ); - - if (data->stage < STAGE_IMAGE) -@@ -327,6 +327,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, - } - else { - CoreSurfaceBufferLock lock; -+ png_byte bit_depth = png_get_bit_depth( data->png_ptr, data->info_ptr ); - - ret = dfb_surface_lock_buffer( dst_surface, CSBR_BACK, CSAID_CPU, CSAF_WRITE, &lock ); - if (ret) -@@ -334,7 +335,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, - - switch (data->color_type) { - case PNG_COLOR_TYPE_PALETTE: -- if (dst_surface->config.format == DSPF_LUT8 && data->info_ptr->bit_depth == 8) { -+ if (dst_surface->config.format == DSPF_LUT8 && bit_depth == 8) { - /* - * Special indexed PNG to LUT8 loading. - */ -@@ -377,7 +378,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, - } - else { - if (data->color_type == PNG_COLOR_TYPE_GRAY) { -- int num = 1 << data->info_ptr->bit_depth; -+ int num = 1 << bit_depth; - - for (x=0; x<num; x++) { - int value = x * 255 / (num - 1); -@@ -386,7 +387,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, - } - } - -- switch (data->info_ptr->bit_depth) { -+ switch (bit_depth) { - case 8: - for (y=0; y<data->height; y++) { - u8 *S = data->image + data->pitch * y; -@@ -441,7 +442,7 @@ IDirectFBImageProvider_PNG_RenderTo( IDirectFBImageProvider *thiz, - - default: - D_ERROR( "ImageProvider/PNG: Unsupported indexed bit depth %d!\n", -- data->info_ptr->bit_depth ); -+ bit_depth ); - } - - dfb_scale_linear_32( image_argb, data->width, data->height, -@@ -594,16 +595,26 @@ png_info_callback( png_structp png_read_ptr, - NULL, NULL, NULL ); - - if (png_get_valid( data->png_ptr, data->info_ptr, PNG_INFO_tRNS )) { -+ png_bytep trans; -+ png_color_16p trans_color; -+ int num_trans; -+ -+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color ); -+ - data->color_keyed = true; - - /* generate color key based on palette... */ - if (data->color_type == PNG_COLOR_TYPE_PALETTE) { - u32 key; -- png_colorp palette = data->info_ptr->palette; -- png_bytep trans = data->info_ptr->trans_alpha; -- int num_colors = MIN( MAXCOLORMAPSIZE, -- data->info_ptr->num_palette ); -- u8 cmap[3][num_colors]; -+ png_colorp palette; -+ int num_colors; -+ u8 *cmap[3]; -+ -+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors ); -+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors ); -+ cmap[0] = alloca (num_colors); -+ cmap[1] = alloca (num_colors); -+ cmap[2] = alloca (num_colors); - - for (i=0; i<num_colors; i++) { - cmap[0][i] = palette[i].red; -@@ -613,7 +624,7 @@ png_info_callback( png_structp png_read_ptr, - - key = FindColorKey( num_colors, &cmap[0][0] ); - -- for (i=0; i<data->info_ptr->num_trans; i++) { -+ for (i=0; i<num_trans; i++) { - if (!trans[i]) { - palette[i].red = (key & 0xff0000) >> 16; - palette[i].green = (key & 0x00ff00) >> 8; - --- -1.7.4.1 - -From 7a2a36fada3ecdd7f48fcfd782a552598477a8f5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 20 Feb 2011 19:38:50 -0500 -Subject: [PATCH] tools: add support for libpng 1.5.x - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - tools/directfb-csource.c | 20 +++++++++++++------- - tools/mkdfiff.c | 2 +- - tools/mkdgifft.cpp | 2 +- - 3 files changed, 15 insertions(+), 9 deletions(-) - -diff --git a/tools/directfb-csource.c b/tools/directfb-csource.c -index 8f2cbf0..487ea3c 100644 ---- a/tools/directfb-csource.c -+++ b/tools/directfb-csource.c -@@ -338,7 +338,7 @@ static DFBResult load_image (const char *filename, - if (!png_ptr) - goto cleanup; - -- if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf (png_ptr))) { - if (desc->preallocated[0].data) { - free (desc->preallocated[0].data); - desc->preallocated[0].data = NULL; -@@ -405,17 +405,22 @@ static DFBResult load_image (const char *filename, - } - - switch (src_format) { -- case DSPF_LUT8: -- if (info_ptr->num_palette) { -+ case DSPF_LUT8: { -+ png_colorp png_palette; -+ int num_palette; -+ -+ png_get_PLTE( png_ptr, info_ptr, &png_palette, &num_palette ); -+ -+ if (num_palette) { - png_byte *alpha; - int i, num; - -- *palette_size = MIN (info_ptr->num_palette, 256); -+ *palette_size = MIN (num_palette, 256); - for (i = 0; i < *palette_size; i++) { - palette[i].a = 0xFF; -- palette[i].r = info_ptr->palette[i].red; -- palette[i].g = info_ptr->palette[i].green; -- palette[i].b = info_ptr->palette[i].blue; -+ palette[i].r = png_palette[i].red; -+ palette[i].g = png_palette[i].green; -+ palette[i].b = png_palette[i].blue; - } - if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) { - png_get_tRNS (png_ptr, info_ptr, &alpha, &num, NULL); -@@ -424,6 +429,7 @@ static DFBResult load_image (const char *filename, - } - } - break; -+ } - case DSPF_RGB32: - png_set_filler (png_ptr, 0xFF, - #ifdef WORDS_BIGENDIAN -diff --git a/tools/mkdfiff.c b/tools/mkdfiff.c -index 68a3b4f..edb58a7 100644 ---- a/tools/mkdfiff.c -+++ b/tools/mkdfiff.c -@@ -97,7 +97,7 @@ load_image (const char *filename, - if (!png_ptr) - goto cleanup; - -- if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf (png_ptr))) { - if (desc->preallocated[0].data) { - free (desc->preallocated[0].data); - desc->preallocated[0].data = NULL; -diff --git a/tools/mkdgifft.cpp b/tools/mkdgifft.cpp -index 96e4220..d4b6bf4 100644 ---- a/tools/mkdgifft.cpp -+++ b/tools/mkdgifft.cpp -@@ -595,7 +595,7 @@ load_image (const char *filename, - if (!png_ptr) - goto cleanup; - -- if (setjmp (png_ptr->jmpbuf)) { -+ if (setjmp (png_jmpbuf (png_ptr))) { - if (desc->preallocated[0].data) { - free (desc->preallocated[0].data); - desc->preallocated[0].data = NULL; --- -1.7.4.1 - ---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c 2012-02-14 19:04:52.000000000 -0500 -+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c 2012-02-14 19:07:18.000000000 -0500 -@@ -710,10 +709,15 @@ - - switch (data->color_type) { - case PNG_COLOR_TYPE_PALETTE: { -- png_colorp palette = data->info_ptr->palette; -- png_bytep trans = data->info_ptr->trans_alpha; -- int num_trans = data->info_ptr->num_trans; -- int num_colors = MIN( MAXCOLORMAPSIZE, data->info_ptr->num_palette ); -+ png_colorp palette; -+ png_bytep trans; -+ png_color_16p trans_color; -+ int num_trans; -+ int num_colors; -+ -+ png_get_PLTE( data->png_ptr, data->info_ptr, &palette, &num_colors ); -+ num_colors = MIN( MAXCOLORMAPSIZE, num_colors ); -+ png_get_tRNS( data->png_ptr, data->info_ptr, &trans, &num_trans, &trans_color ); - - for (i=0; i<num_colors; i++) { - data->colors[i].a = (i < num_trans) ? trans[i] : 0xff; ---- a/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c.old 2012-02-14 22:40:30.000000000 -0500 -+++ b/interfaces/IDirectFBImageProvider/idirectfbimageprovider_png.c 2012-02-14 23:37:19.000000000 -0500 -@@ -638,12 +638,10 @@ - data->color_key = key; - } - else { -- /* ...or based on trans rgb value */ -- png_color_16p trans = &data->info_ptr->trans_color; - -- data->color_key = (((trans->red & 0xff00) << 8) | -- ((trans->green & 0xff00)) | -- ((trans->blue & 0xff00) >> 8)); -+ data->color_key = (((trans_color->red & 0xff00) << 8) | -+ ((trans_color->green & 0xff00)) | -+ ((trans_color->blue & 0xff00) >> 8)); - } - } - diff --git a/community/directfb/DirectFB-1.6.1-zlib-include.patch b/community/directfb/DirectFB-1.6.1-zlib-include.patch deleted file mode 100644 index e4f24a5cf..000000000 --- a/community/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/directfb/directfb-missing_include.patch b/community/directfb/directfb-missing_include.patch deleted file mode 100644 index 4b1af5a30..000000000 --- a/community/directfb/directfb-missing_include.patch +++ /dev/null @@ -1,376 +0,0 @@ ---- /dev/null 2012-02-14 14:47:01.028967126 -0500 -+++ b/lib/voodoo/link.h 2012-02-14 21:19:05.000000000 -0500 -@@ -0,0 +1,85 @@ -+/* -+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ Written by Denis Oliver Kropp <dok@directfb.org>, -+ Andreas Hundt <andi@fischlustig.de>, -+ Sven Neumann <neo@directfb.org>, -+ Ville Syrjälä <syrjala@sci.fi> and -+ Claudio Ciccani <klan@users.sf.net>. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __VOODOO__LINK_H__ -+#define __VOODOO__LINK_H__ -+ -+#include <voodoo/types.h> -+ -+ -+typedef struct { -+ void *ptr; -+ size_t length; -+ size_t done; -+} VoodooChunk; -+ -+ -+struct __V_VoodooLink { -+ void *priv; -+ u32 code; -+ -+ void (*Close)( VoodooLink *link ); -+ -+ /* See 'read(2)', blocking */ -+ ssize_t (*Read) ( VoodooLink *link, -+ void *buffer, -+ size_t count ); -+ -+ /* See 'write(2)', blocking */ -+ ssize_t (*Write)( VoodooLink *link, -+ const void *buffer, -+ size_t count ); -+ -+ -+ /* For later... */ -+ DirectResult (*SendReceive)( VoodooLink *link, -+ VoodooChunk *send, -+ size_t num_send, -+ VoodooChunk *recv, -+ size_t num_recv ); -+ -+ DirectResult (*WakeUp) ( VoodooLink *link ); -+ -+ DirectResult (*WaitForData)( VoodooLink *link, -+ int timeout_ms ); -+}; -+ -+ -+DirectResult VOODOO_API voodoo_link_init_connect( VoodooLink *link, -+ const char *hostname, -+ int port, -+ bool raw ); -+ -+DirectResult VOODOO_API voodoo_link_init_local ( VoodooLink *link, -+ const char *path, -+ bool raw ); -+ -+DirectResult VOODOO_API voodoo_link_init_fd ( VoodooLink *link, -+ int fd[2] ); -+ -+#endif ---- /dev/null 2012-02-14 14:47:01.028967126 -0500 -+++ b/lib/voodoo/packet.h 2012-02-14 21:37:45.000000000 -0500 -@@ -0,0 +1,285 @@ -+/* -+ (c) Copyright 2001-2011 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ Written by Denis Oliver Kropp <dok@directfb.org>, -+ Andreas Hundt <andi@fischlustig.de>, -+ Sven Neumann <neo@directfb.org>, -+ Ville Syrjälä <syrjala@sci.fi> and -+ Claudio Ciccani <klan@users.sf.net>. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __VOODOO__PACKET_H__ -+#define __VOODOO__PACKET_H__ -+ -+extern "C" { -+#include <direct/fastlz.h> -+#include <direct/list.h> -+#include <direct/mem.h> -+#include <direct/memcpy.h> -+ -+ -+#include <voodoo/types.h> -+} -+ -+ -+typedef enum { -+ VPHF_NONE = 0x00000000, -+ -+ VPHF_COMPRESSED = 0x00000001, -+ -+ VPHF_ALL = 0x00000001 -+} VoodooPacketHeaderFlags; -+ -+ -+typedef struct { -+ u32 size; -+ u32 flags; -+ u32 uncompressed; -+ u32 align; -+} VoodooPacketHeader; -+ -+ -+class VoodooPacket { -+public: -+ DirectLink link; -+ bool sending; -+ -+private: -+ void *data; -+ void *current; -+ VoodooPacketHeader header; -+ -+ VoodooPacket( u32 size, -+ void *data ) -+ : -+ sending(false), -+ data(data), -+ current(data) -+ { -+ memset( &link, 0, sizeof(link) ); -+ -+ header.size = size; -+ header.flags = VPHF_NONE; -+ header.uncompressed = size; -+ } -+ -+ VoodooPacket( u32 size, -+ u32 flags, -+ u32 uncompressed, -+ void *data ) -+ : -+ sending(false), -+ data(data), -+ current(data) -+ { -+ memset( &link, 0, sizeof(link) ); -+ -+ header.size = size; -+ header.flags = VPHF_COMPRESSED; -+ header.uncompressed = uncompressed; -+ } -+ -+ ~VoodooPacket() {}; -+ -+public: -+/* -+ static VoodooPacket * -+ New( u32 size ) -+ { -+ VoodooPacket *packet = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size ); -+ -+ if (!packet) { -+ D_OOM(); -+ return NULL; -+ } -+ -+ return new (packet) VoodooPacket( size, packet + 1 ); -+ -+ -+ if (data) -+ this->data = data; -+ else -+ this->data = header + 1; -+ } -+*/ -+ static VoodooPacket * -+ New( u32 size, -+ void *data ) -+ { -+ return new VoodooPacket( size, data ); -+ } -+ -+ static VoodooPacket * -+ Reset( VoodooPacket *packet, -+ u32 size, -+ void *data ) -+ { -+ return new (packet) VoodooPacket( size, data ); -+ } -+ -+ static VoodooPacket * -+ New( void *header, -+ u32 size ) -+ { -+ VoodooPacketHeader *h = (VoodooPacketHeader*) header; -+ -+ h->size = size; -+ h->flags = VPHF_NONE; -+ h->uncompressed = size; -+ -+ return new VoodooPacket( size, (char*) header + sizeof(VoodooPacketHeader) ); -+ } -+ -+ static VoodooPacket * -+ New( u32 size ) -+ { -+ VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + VOODOO_PACKET_MAX ); -+ -+ if (!p) { -+ D_OOM(); -+ return NULL; -+ } -+ -+ return new (p) VoodooPacket( size, p + 1 ); -+ } -+ -+ static VoodooPacket * -+ Compressed( VoodooPacket *packet ) -+ { -+ VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size * 4 / 3 ); -+ -+ if (!p) { -+ D_OOM(); -+ return NULL; -+ } -+ -+ int compressed = direct_fastlz_compress( packet->data, packet->header.uncompressed, p + 1 ); -+ -+ if ((size_t) compressed < packet->header.uncompressed) -+ return new (p) VoodooPacket( compressed, VPHF_COMPRESSED, packet->header.uncompressed, p + 1 ); -+ -+ D_FREE( p ); -+ -+ return packet; -+ } -+ -+ static VoodooPacket * -+ Copy( VoodooPacket *packet ) -+ { -+ VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + packet->header.size ); -+ -+ if (!p) { -+ D_OOM(); -+ return NULL; -+ } -+ -+ direct_memcpy( p + 1, packet->data_start(), packet->header.size ); -+ -+ return new (p) VoodooPacket( packet->header.size, packet->header.flags, packet->header.uncompressed, p + 1 ); -+ } -+ -+ static VoodooPacket * -+ Copy( u32 size, -+ u32 flags, -+ u32 uncompressed, -+ void *data ) -+ { -+ VoodooPacket *p = (VoodooPacket*) D_MALLOC( sizeof(VoodooPacket) + size ); -+ -+ if (!p) { -+ D_OOM(); -+ return NULL; -+ } -+ -+ direct_memcpy( p + 1, data, size ); -+ -+ return new (p) VoodooPacket( size, flags, uncompressed, p + 1 ); -+ } -+ -+ inline u32 -+ size() const -+ { -+ return header.size; -+ } -+ -+ inline u32 -+ flags() const -+ { -+ return header.flags; -+ } -+ -+ inline u32 -+ uncompressed() const -+ { -+ return header.uncompressed; -+ } -+ -+ inline const void * -+ data_header() const -+ { -+ D_ASSERT( data == this + 1 ); -+ -+ return &header; -+ } -+ -+ inline const void * -+ data_start() const -+ { -+ return data; -+ } -+ -+ inline void * -+ data_raw() const -+ { -+ return current; -+ } -+ -+ -+ inline bool -+ append( size_t size ) -+ { -+ D_ASSERT( data == this + 1 ); -+ -+ if (header.size + size > VOODOO_PACKET_MAX) -+ return false; -+ -+ current = (char*) data + header.size; -+ -+ header.size += size; -+ header.uncompressed += size; -+ -+ return true; -+ } -+ -+ inline void -+ reset( size_t size ) -+ { -+ D_ASSERT( data == this + 1 ); -+ -+ current = (char*) data; -+ -+ header.size = size; -+ header.uncompressed = size; -+ } -+}; -+ -+ -+#endif diff --git a/community/dmd/dmd.install b/community/dmd/dmd.install deleted file mode 100644 index 62f98d07d..000000000 --- a/community/dmd/dmd.install +++ /dev/null @@ -1,21 +0,0 @@ -pre_install() { - /bin/true -} -post_install() { - echo '==> Note: dmd does not come with a runtime library!' - echo '==> The D language has two competing, incompatible standard libraries.' - echo '==> In order for dmd to be useful, you must' - echo '==> install either libphobos or libtango, whichever you prefer.' -} -pre_upgrade() { - /bin/true -} -post_upgrade() { - /bin/true -} -pre_remove() { - /bin/true -} -post_remove() { - /bin/true -} diff --git a/community/dosemu/PKGBUILD b/community/dosemu/PKGBUILD deleted file mode 100644 index 4c9fb31f6..000000000 --- a/community/dosemu/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 81027 2012-12-10 10:25:41Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: Bob Finch <w9ya@arrl.net> - -pkgname=dosemu -pkgver=1.4.0 -pkgrel=9 -pkgdesc="DOS emulator" -arch=('i686' 'x86_64') -url="http://www.dosemu.org/" -license=('GPL' 'custom') -depends=('gpm' 'slang' 'sdl' 'libxxf86vm' 'libsndfile' 'sh' 'xorg-mkfontdir' 'xorg-bdftopcf' 'xorg-xlsfonts') -backup=('etc/dosemu/dosemu.conf' - 'etc/dosemu/dosemu.users' - 'etc/dosemu/global.conf') -install=dosemu.install -source=(http://downloads.sourceforge.net/sourceforge/dosemu/$pkgname-$pkgver.tgz - http://downloads.sourceforge.net/sourceforge/dosemu/dosemu-freedos-1.0-bin.tgz - kernel_version.patch - fix-infinite-loop.patch - cpu-support.patch) -md5sums=('0bba530637266f99d404ba15e3f118d4' - '2e09774fe91cff4372cb4a393eb467f5' - '15af2ca86b2e7d8835f0f837ea663c3d' - 'e8ea87d46c613130b26724facb5aa297' - 'ebb17406a7d302f6c4ad2b67304f31b6') - -build() { - cd $srcdir/$pkgname-$pkgver - - patch -Np1 -i ${srcdir}/kernel_version.patch - patch -Np1 -i ${srcdir}/fix-infinite-loop.patch - patch -Np1 -i ${srcdir}/cpu-support.patch - sed -i 's|extern int yyget_leng|extern size_t yyget_leng|' src/base/init/lexer.h - - unset CFLAGS - ./configure --prefix=/usr --with-fdtarball=$srcdir/dosemu-freedos-1.0-bin.tgz --mandir=/usr/share/man - make -} - -package(){ - cd $srcdir/$pkgname-$pkgver - - make DESTDIR=$pkgdir install - - ln -s /usr/share/dosemu/drive_z $pkgdir/etc/dosemu/drives/z - install -dm0755 $pkgdir/etc/sysctl.d - echo "vm.mmap_min_addr = 0" >$pkgdir/etc/sysctl.d/dosemu.conf - - install -D -m 644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING - install -D -m 644 COPYING.DOSEMU $pkgdir/usr/share/licenses/$pkgname/COPYING.DOSEMU -} diff --git a/community/dosemu/cpu-support.patch b/community/dosemu/cpu-support.patch deleted file mode 100644 index 6a8d84148..000000000 --- a/community/dosemu/cpu-support.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur orig/dosemu-1.4.0/src/base/init/config.c modified/dosemu-1.4.0/src/base/init/config.c ---- orig/src/base/init/config.c 2007-05-04 22:19:41.000000000 +0800 -+++ modified/src/base/init/config.c 2012-12-06 10:05:31.780346032 +0800 -@@ -480,6 +480,8 @@ - case 5: case 586: - case 6: case 686: - case 15: -+ case 16: -+ case 17: - config.realcpu = CPU_586; - cpuflags = get_proc_string_by_key("features"); - if (!cpuflags) { diff --git a/community/dosemu/dosemu.install b/community/dosemu/dosemu.install deleted file mode 100644 index b5ed385d1..000000000 --- a/community/dosemu/dosemu.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - sysctl -p etc/sysctl.d/dosemu.conf -} - -post_upgrade() { - post_install -} diff --git a/community/dosemu/fix-infinite-loop.patch b/community/dosemu/fix-infinite-loop.patch deleted file mode 100644 index 7f12d9985..000000000 --- a/community/dosemu/fix-infinite-loop.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- trunk/src/plugin/translate/translate.c 2011/05/24 02:28:24 2032 -+++ trunk/src/plugin/translate/translate.c 2011/10/03 23:37:46 2058 -@@ -466,7 +466,9 @@ - while (list->next) { - list = list->next; - } -- list->next = set; -+ if (list != set) { -+ list->next = set; -+ } - } - initialize_charset(set); - } diff --git a/community/dosemu/kernel_version.patch b/community/dosemu/kernel_version.patch deleted file mode 100644 index 0351922d4..000000000 --- a/community/dosemu/kernel_version.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur dosemu-1.4.0/src/base/init/init.c dosemu-1.4.0.my/src/base/init/init.c ---- dosemu-1.4.0/src/base/init/init.c 2007-05-04 09:59:48.000000000 +0400 -+++ dosemu-1.4.0.my/src/base/init/init.c 2011-08-15 12:39:42.000000000 +0400 -@@ -280,7 +280,7 @@ - char version[80]; - - uname((struct utsname *)&unames); --#ifdef __linux__ -+#if 0 - strcpy(version,unames.release); - running_kversion = atoi(strtok(version,".")) *1000000; - running_kversion += atoi(strtok(NULL,".")) *1000; diff --git a/community/drbd/drbd.rc b/community/drbd/drbd.rc deleted file mode 100644 index b8b196e4b..000000000 --- a/community/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/ebtables/ebtables.conf b/community/ebtables/ebtables.conf deleted file mode 100644 index 386f94249..000000000 --- a/community/ebtables/ebtables.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file used to load/save configuration. -CONFIG_FILE='/etc/ebtables.conf' - -# Save configuration on stop/restart. -#SAVE_ON_STOP=yes - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ebtables/ebtables.rc b/community/ebtables/ebtables.rc deleted file mode 100644 index a845449fe..000000000 --- a/community/ebtables/ebtables.rc +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -case "$1" in - start) - stat_busy 'Loading ebtables rules' - ebtables-restore < "$CONFIG_FILE" && - add_daemon ${0##*/} && stat_done || stat_die - ;; - stop) - [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save - status 'Clearing ebtables rules' ebtables -F && rm_daemon ${0##*/} || exit 1 - ;; - restart) - $0 stop - $0 start - ;; - save) - stat_busy 'Saving ebtables rules' - ebtables-save > "$CONFIG_FILE" && stat_done || stat_die - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|save}" >&2 - exit 1 - ;; -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ecryptfs-utils/symlinked_mtab.patch b/community/ecryptfs-utils/symlinked_mtab.patch deleted file mode 100644 index 2ba0aa8bf..000000000 --- a/community/ecryptfs-utils/symlinked_mtab.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- ecryptfs-utils/src/ecryptfs-utils-96/src/libecryptfs/main.c.orig -+++ ecryptfs-utils/src/ecryptfs-utils-96/src/libecryptfs/main.c -@@ -387,6 +387,8 @@ - char *fullpath_source = NULL; - char *fullpath_target = NULL; - int rc; -+ char dummy; -+ int useMtab; - - mountent.mnt_opts = NULL; - if (!source) { -@@ -425,6 +427,13 @@ - syslog(LOG_ERR, "Failed to perform eCryptfs mount: [%m]\n"); - goto out; - } -+ /* Check if mtab is a symlink */ -+ useMtab = (readlink("/etc/mtab", &dummy, 1) < 0); -+ if (!useMtab) { -+ /* No need updating mtab */ -+ rc = 0; -+ goto out; -+ } - mtab_fd = setmntent("/etc/mtab", "a"); - if (!mtab_fd) { - rc = -EACCES; diff --git a/community/electricsheep/PKGBUILD.svn b/community/electricsheep/PKGBUILD.svn deleted file mode 100644 index 2fc8a26ff..000000000 --- a/community/electricsheep/PKGBUILD.svn +++ /dev/null @@ -1,60 +0,0 @@ -# $Id: PKGBUILD 57680 2011-11-01 05:03:57Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -pkgname=electricsheep -pkgver=2.7b34 -pkgrel=1 -pkgdesc="Screensaver that realize the collective dream of computers all over the internet" -arch=('x86_64' 'i686') -url="http://community.electricsheep.org/" -license=('GPL') -depends=('curl' 'expat' 'flam3' 'ffmpeg' 'mplayer' 'libglade' 'tinyxml' 'boost' 'gtk2' 'lua') -#subversion libgtk2.0 libgl1-mesa libavcodec libavformat libswscale liblua5 libcurl4-openssl libxml2 libjpeg8 libgtop2 libboost libboost-filesystem libboost-thread libtinyxml libglut3 -makedepends=('xscreensaver') -optdepends=('xscreensaver: to use electricsheep with xscreensaver') -_fixed_revision=107 - -build() { - cd "$srcdir" - - msg2 "Checking out svn revision $_fixed_revision (in lack of a Linux release for $pkgver)..." - if [[ -d "$pkgname/.svn" ]]; then - (cd "$pkgname" && svn up -r $_fixed_revision) - else - svn co \ - http://electricsheep.googlecode.com/svn/trunk/ \ - --config-dir ./ -r $_fixed_revision "$pkgname" - fi - - msg2 "Setting up build directory..." - rm -rf "$srcdir/$pkgname-build" - cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build" - cd "$srcdir/$pkgname-build/client_generic" - - #patch -p1 -i ../electricsheep-ffmpeg.patch - msg2 "Configuring..." - ./autogen.sh - ./configure --prefix=/usr - - msg2 "Compiling..." - make -} - -package() { - cd "$srcdir/$pkgname-build/client_generic" - - install -d "$pkgdir/usr/share/applications/screensavers" - install -d "$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" - make DESTDIR="$pkgdir" \ - GNOME_SCREENSAVER_DATADIR="$pkgdir/usr/share/applications/screensavers" \ - GNOME_SCREENSAVER_PRIVEXEDIR="$pkgdir/usr/lib/gnome-screensaver/gnome-screensaver" \ - install - install -Dm644 electricsheep.desktop.kde \ - "$pkgdir/usr/share/kde4/services/ScreenSavers/electricsheep.desktop" - install -Dm644 electricsheep.xml \ - "$pkgdir/usr/share/xscreensaver/config/electricsheep.xml" - install -Dm755 electricsheep-saver \ - "$pkgdir/usr/bin/electricsheep-saver" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/electricsheep/electricsheep-ffmpeg.patch b/community/electricsheep/electricsheep-ffmpeg.patch deleted file mode 100644 index b04cf41b0..000000000 --- a/community/electricsheep/electricsheep-ffmpeg.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c ---- electricsheep-2.7b12.orig/electricsheep.c 2011-10-31 22:36:30.000000000 -0400 -+++ electricsheep-2.7b12/electricsheep.c 2011-10-31 22:40:04.000000000 -0400 -@@ -662,7 +662,7 @@ - input_stream_index = -1; - for (j = 0; j < ictx->nb_streams; j++) { - AVCodecContext *enc = ictx->streams[j]->codec; -- if (CODEC_TYPE_VIDEO == enc->codec_type) { -+ if (AVMEDIA_TYPE_VIDEO == enc->codec_type) { - input_stream_index = j; - break; - } -@@ -730,7 +730,7 @@ - av_init_packet(&opkt); - if (av_parser_change(ictx->streams[input_stream_index]->parser, output_ctx->streams[0]->codec, - &opkt.data, &opkt.size, ipkt.data, ipkt.size, -- ipkt.flags & PKT_FLAG_KEY)) -+ ipkt.flags & AV_PKT_FLAG_KEY)) - opkt.destruct= av_destruct_packet; - - if (-1 == av_interleaved_write_frame(output_ctx, &opkt)) { -diff -Naur electricsheep-2.7b12.orig/electricsheep.c electricsheep-2.7b12/electricsheep.c ---- electricsheep-2.7b12.orig/electricsheep.c 2011-11-01 00:21:51.000000000 -0400 -+++ electricsheep-2.7b12/electricsheep.c 2011-11-01 00:25:10.000000000 -0400 -@@ -686,9 +686,9 @@ - } - } - -- output_ctx = av_alloc_format_context(); -+ output_ctx = avformat_alloc_context(); - -- ofmt = guess_format(NULL, fname, NULL); -+ ofmt = av_guess_format(NULL, fname, NULL); - if (!ofmt) { - fprintf(logout, "could not determine format from %s.\n", fname); - exit(1); diff --git a/community/electricsheep/electricsheep-pref-segfault.patch b/community/electricsheep/electricsheep-pref-segfault.patch deleted file mode 100644 index 83bcd8a0f..000000000 --- a/community/electricsheep/electricsheep-pref-segfault.patch +++ /dev/null @@ -1,270 +0,0 @@ -diff -Naur electricsheep-2.7b12/electricsheep.c electricsheep-2.7~b12+svn20091224/electricsheep.c ---- electricsheep-2.7b12/electricsheep.c 2009-07-09 04:10:05.000000000 -0400 -+++ electricsheep-2.7~b12+svn20091224/electricsheep.c 2009-12-24 18:03:01.000000000 -0500 -@@ -564,6 +566,12 @@ - n++; - } - } -+ if (n < 1) { -+ if (debug) { -+ fprintf(logout, "median rank undefined\n"); -+ } -+ return; -+ } - qsort(tms, n, sizeof(int), compare_ints); - if (0 && debug) { - for (i = 0; i < n; i++) -@@ -1915,7 +1923,7 @@ - if (-1 == (decoder_pid = fork())) { - perror("decoder fork"); - } else if (0 == decoder_pid) { -- char *argv[20]; -+ char *argv[25]; - int c = 0; - /* child */ - snprintf(fps, 24, "%g", prefs.frame_rate); -@@ -1934,6 +1942,7 @@ - cleanup_and_exit(1); - } - argv[c++] = "mplayer"; -+ argv[c++] = "-nolirc"; - argv[c++] = "-cache"; - argv[c++] = "8192"; - argv[c++] = "-really-quiet"; -diff -Naur electricsheep-2.7b12/electricsheep.h electricsheep-2.7~b12+svn20091224/electricsheep.h ---- electricsheep-2.7b12/electricsheep.h 2009-07-09 04:10:05.000000000 -0400 -+++ electricsheep-2.7~b12+svn20091224/electricsheep.h 2009-12-24 18:03:01.000000000 -0500 -@@ -74,4 +74,4 @@ - void init_list_cmd (char *buf); - void get_end_element(void *userData, const char *name); - void character_handler(void *userData, const XML_Char *s, int len); --char *encry(char *pw); -+char *encry(char *pw, char *nick); -diff -Naur electricsheep-2.7b12/electricsheep-preferences.c electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c ---- electricsheep-2.7b12/electricsheep-preferences.c 2009-07-09 04:10:05.000000000 -0400 -+++ electricsheep-2.7~b12+svn20091224/electricsheep-preferences.c 2009-12-24 18:03:01.000000000 -0500 -@@ -108,8 +108,9 @@ - prefs.password = strdup(""); - } else { - char *pw = (char*)gtk_entry_get_text(password_entry); -+ pw = strdup(pw); - if (strcmp(pw, pw_marker)) -- prefs.password = encry(pw); -+ prefs.password = encry(pw, prefs.nick); - } - prefs.video_driver = (char*)gtk_entry_get_text(video_driver_entry); - prefs.frame_rate = gtk_spin_button_get_value(frame_rate_spin); -@@ -207,72 +208,72 @@ - void get_widgets(GladeXML *xml) { - title_label = (GtkLabel *) glade_xml_get_widget(xml, "titleLabel"); - if (NULL == title_label) { -- fprintf(stderr, "titleLabel not found\n"); -+ fprintf(logout, "titleLabel not found\n"); - exit(1); - } - test_label = (GtkLabel *) glade_xml_get_widget(xml, "testLabel"); - if (NULL == test_label) { -- fprintf(stderr, "testLabel not found\n"); -+ fprintf(logout, "testLabel not found\n"); - exit(1); - } - test_button = (GtkButton *) glade_xml_get_widget(xml, "testButton"); - if (NULL == test_button) { -- fprintf(stderr, "testButton not found\n"); -+ fprintf(logout, "testButton not found\n"); - exit(1); - } - nick_entry = (GtkEntry *) glade_xml_get_widget(xml, "nickEntry"); - if (NULL == nick_entry) { -- fprintf(stderr, "nickEntry not found\n"); -+ fprintf(logout, "nickEntry not found\n"); - exit(1); - } - url_entry = (GtkEntry *) glade_xml_get_widget(xml, "urlEntry"); - if (NULL == url_entry) { -- fprintf(stderr, "urlEntry not found\n"); -+ fprintf(logout, "urlEntry not found\n"); - exit(1); - } - password_entry = (GtkEntry *) glade_xml_get_widget(xml, "passEntry"); - if (NULL == password_entry) { -- fprintf(stderr, "passEntry not found\n"); -+ fprintf(logout, "passEntry not found\n"); - exit(1); - } - video_driver_entry = (GtkEntry *) glade_xml_get_widget(xml, "vdEntry"); - if (NULL == video_driver_entry) { -- fprintf(stderr, "vdEntry not found\n"); -+ fprintf(logout, "vdEntry not found\n"); - exit(1); - } - frame_rate_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "frameSpin"); - if (NULL == frame_rate_spin) { -- fprintf(stderr, "frameSpin not found\n"); -+ fprintf(logout, "frameSpin not found\n"); - exit(1); - } - nrepeats_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "repeatSpin"); - if (NULL == nrepeats_spin) { -- fprintf(stderr, "repeatSpin not found\n"); -+ fprintf(logout, "repeatSpin not found\n"); - exit(1); - } - cache_spin = (GtkSpinButton *) glade_xml_get_widget(xml, "cacheSpin"); - if (NULL == cache_spin) { -- fprintf(stderr, "cacheSpin not found\n"); -+ fprintf(logout, "cacheSpin not found\n"); - exit(1); - } - no_animation_check = (GtkCheckButton *) glade_xml_get_widget(xml, "noanimCheck"); - if (NULL == no_animation_check) { -- fprintf(stderr, "noanimCheck not found\n"); -+ fprintf(logout, "noanimCheck not found\n"); - exit(1); - } - standalone_check = (GtkCheckButton *) glade_xml_get_widget(xml, "standaloneCheck"); - if (NULL == standalone_check) { -- fprintf(stderr, "standaloneCheck not found\n"); -+ fprintf(logout, "standaloneCheck not found\n"); - exit(1); - } - hide_errors_check = (GtkCheckButton *) glade_xml_get_widget(xml, "hideCheck"); - if (NULL == hide_errors_check) { -- fprintf(stderr, "hideCheck not found\n"); -+ fprintf(logout, "hideCheck not found\n"); - exit(1); - } - save_frames_check = (GtkCheckButton *) glade_xml_get_widget(xml, "saveCheck"); - if (NULL == save_frames_check) { -- fprintf(stderr, "saveCheck not found\n"); -+ fprintf(logout, "saveCheck not found\n"); - exit(1); - } - } -diff -Naur electricsheep-2.7b12/utils.c electricsheep-2.7~b12+svn20091224/utils.c ---- electricsheep-2.7b12/utils.c 2009-07-09 04:10:05.000000000 -0400 -+++ electricsheep-2.7~b12+svn20091224/utils.c 2009-12-24 18:03:01.000000000 -0500 -@@ -69,19 +70,23 @@ - } - } - --char *encry(char *pw) { -+ -+char *encry(char *pw, char *nick) { -+ static char *salt = "sh33p"; - unsigned char digest[16]; - char md5_pw[33]; -+ char *pw_salted = malloc(strlen(pw) + strlen(salt) + strlen(nick) + 1); - int i, j; -- md5_buffer(pw, strlen(pw), digest); -+ sprintf(pw_salted, "%s%s%s", pw, salt, nick); -+ md5_buffer(pw_salted, strlen(pw_salted), digest); - for (i = 0, j = 0; i < sizeof(digest); i++) { - char *hex_digits = "0123456789ABCDEF"; -- - md5_pw[j++] = hex_digits[digest[i] >> 4]; - md5_pw[j++] = hex_digits[digest[i] & 0x0F]; - } - md5_pw[j] = 0; - free(pw); -+ free(pw_salted); - return strdup(md5_pw); - } - -@@ -97,10 +102,11 @@ - free(prefs->url); - prefs->url = strdup(atts[i+1]); - } else if (!strcmp("password", atts[i])) { -- free(prefs->password); -- prefs->password = encry(strdup(atts[i+1])); -+ free(prefs->password); -+ /* assume nick comes before pw in the xml XXX */ -+ prefs->password = encry(strdup(atts[i+1]), prefs->nick); - } else if (!strcmp("password_md5", atts[i])) { -- free(prefs->password); -+ free(prefs->password); - prefs->password = strdup(atts[i+1]); - } else if (!strcmp("video_driver", atts[i])) { - free(prefs->video_driver); -@@ -133,7 +139,7 @@ - } else if (!strcmp("version", atts[i])) { - // nothing to check - } else { -- fprintf(stderr, "ignoring attribute %s\n", atts[i]); -+ fprintf(logout, "ignoring attribute %s\n", atts[i]); - } - i += 2; - } -@@ -146,7 +152,7 @@ - if (argc > 2) - strcpy(rc_file, argv[2]); - else { -- fprintf(stderr, -+ fprintf(logout, - "%s: --preferences option requires a file name argument.\n", - argv[0]); - exit(1); -@@ -155,7 +161,7 @@ - } - hom = getenv("HOME"); - if (!hom) { -- fprintf(stderr, "%s: HOME envar not defined\n", argv[0]); -+ fprintf(logout, "%s: HOME envar not defined\n", argv[0]); - exit(1); - } - snprintf(rc_file, PATH_MAX, "%s/.electricsheep/preferences.xml", hom); -@@ -281,15 +287,15 @@ - - int mysystem(char *cmd, char *msg) { - int n; -- if (0) fprintf(stderr, "subprocess; (%s)\n", cmd); -+ if (0) fprintf(logout, "subprocess; (%s)\n", cmd); - if (0 != (n = interruptable_system(cmd))) { - if (SIGINT != n) { - if (!prefs.hide_errors) -- fprintf(stderr, "subprocess error: %s, %d=%d<<8+%d\n", -+ fprintf(logout, "subprocess error: %s, %d=%d<<8+%d\n", - msg, n, n>>8, n&255); - return 1; - } -- fprintf(stderr, "control-c during %s, exiting\n", msg); -+ fprintf(logout, "control-c during %s, exiting\n", msg); - cleanup_and_exit(1); - } - return 0; -@@ -325,7 +331,7 @@ - int bytes_read; - void *buff = XML_GetBuffer(parser, XML_BUFF_SIZE); - if (buff == NULL) { -- fprintf(stderr, "unable to allocate buffer.\n"); -+ fprintf(logout, "unable to allocate buffer.\n"); - exit(1); - } - -@@ -334,7 +340,7 @@ - break; - - if (! XML_ParseBuffer(parser, bytes_read, bytes_read == 0)) { -- fprintf(stderr, "parse error.\n"); -+ fprintf(logout, "parse error.\n"); - exit(1); - } - } -@@ -441,7 +447,7 @@ - - void init_curl_cmd(int registration) { - -- if (debug) fprintf(stderr, "init_curl_cmd %d\n", registration); -+ if (debug) fprintf(logout, "init_curl_cmd %d\n", registration); - - if (prefs.proxy_name) { - snprintf(curl_cmd, MAXBUF, "nice -n %d curl --location --proxy %s", -@@ -472,7 +478,7 @@ - } - } - server = dream_server; -- if (debug) fprintf(stderr, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); -+ if (debug) fprintf(logout, "curl_cmd = %s\nserver = %s\n", curl_cmd, server); - } - - void init_list_cmd (char *buf) { diff --git a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch b/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch deleted file mode 100644 index e077a15cf..000000000 --- a/community/epdfview/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch +++ /dev/null @@ -1,60 +0,0 @@ -From d30496f52b85f82947bd07b9bd60f8482843ece8 Mon Sep 17 00:00:00 2001 -From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e> -Date: Tue, 5 Jul 2011 09:23:38 +0000 -Subject: [PATCH 1/2] When using Poppler 0.17.0, I needed to swap the blue and - red channels, otherwise the colors (other than black - and white) looked wierd. - -git-svn-id: svn://svn.emma-soft.com/epdfview/trunk@367 cb4bfb15-1111-0410-82e2-95233c8f1c7e ---- - src/PDFDocument.cxx | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) - -diff --git a/src/PDFDocument.cxx b/src/PDFDocument.cxx -index df5d75f..63b3513 100644 ---- a/src/PDFDocument.cxx -+++ b/src/PDFDocument.cxx -@@ -20,6 +20,7 @@ - #include <time.h> - #include <poppler.h> - #include <unistd.h> -+#include <algorithm> - #include "epdfview.h" - - using namespace ePDFView; -@@ -33,6 +34,24 @@ static PageLayout convertPageLayout (gint pageLayout); - static PageMode convertPageMode (gint pageMode); - static gchar *getAbsoluteFileName (const gchar *fileName); - -+namespace -+{ -+ void -+ convert_bgra_to_rgba (guint8 *data, int width, int height) -+ { -+ using std::swap; -+ -+ for (int y = 0; y < height; y++) -+ { -+ for (int x = 0; x < width; x++) -+ { -+ swap(data[0], data[2]); -+ data += 4; -+ } -+ } -+ } -+} -+ - /// - /// @brief Constructs a new PDFDocument object. - /// -@@ -650,6 +669,7 @@ PDFDocument::renderPage (gint pageNum) - poppler_page_render (page, context); - cairo_destroy(context); - cairo_surface_destroy (surface); -+ convert_bgra_to_rgba(renderedPage->getData (), width, height); - #else // !HAVE_POPPLER_0_17_0 - // Create the pixbuf from the data and render to it. - GdkPixbuf *pixbuf = gdk_pixbuf_new_from_data (renderedPage->getData (), --- -1.7.7 - diff --git a/community/epdfview/PKGBUILD b/community/epdfview/PKGBUILD deleted file mode 100644 index 81ab34ff6..000000000 --- a/community/epdfview/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 72969 2012-06-25 18:50:56Z foutrelis $ -# Maintainer: schuay <jakob.gruber@gmail.com> -# Contributor: Tom K <tomk@runbox.com> -# Contributor: Thayer Williams <thayer@archlinux.org> - -pkgname=epdfview -pkgver=0.1.8 -pkgrel=4 -pkgdesc="A free lightweight PDF document viewer." -url="http://www.emma-soft.com/projects/epdfview/" -arch=('i686' 'x86_64') -license=('GPL') -depends=('poppler-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'gtk2') -makedepends=('pkgconfig') -install='epdfview.install' -source=("http://www.emma-soft.com/projects/${pkgname}/chrome/site/releases/${pkgname}-${pkgver}.tar.bz2" - "${pkgname}.desktop.patch" - "glib2_headers.patch" - "0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - patch -Np0 -i "${srcdir}/${pkgname}.desktop.patch" - patch -Np1 -i "${srcdir}/0001-When-using-Poppler-0.17.0-I-needed-to-swap-the-blue-.patch" - patch -Np1 -i "${srcdir}/glib2_headers.patch" # FS#30116 - - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var - make -} -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install - - for size in 24 32 48; do - install -Dm644 data/icon_${pkgname}-${size}.png \ - "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/${pkgname}.png" - done -} - -md5sums=('e50285b01612169b2594fea375f53ae4' - 'fbf22bbabdbb7544db615ac5775d57e2' - '2fffa9c7cd4c5f0744803591c2f162a3' - '7f9ea101a41f5b4e999fd024f423d41f') diff --git a/community/epdfview/epdfview.desktop.patch b/community/epdfview/epdfview.desktop.patch deleted file mode 100644 index d86fc3088..000000000 --- a/community/epdfview/epdfview.desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- data/epdfview.desktop.bak 2009-04-05 16:55:56.000000000 -0700 -+++ data/epdfview.desktop 2009-04-05 16:56:33.000000000 -0700 -@@ -7,7 +7,7 @@ - GenericName=PDF Viewer - GenericName[ca]=Visor PDF - GenericName[es]=Visor PDF --Icon=icon_epdfview-48 -+Icon=epdfview - Name=ePDFViewer - Name[ca]=ePDFViewer - Name[es]=ePDFViewer diff --git a/community/epdfview/epdfview.install b/community/epdfview/epdfview.install deleted file mode 100644 index c317fbaca..000000000 --- a/community/epdfview/epdfview.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/epdfview/glib2_headers.patch b/community/epdfview/glib2_headers.patch deleted file mode 100644 index e9f0983b5..000000000 --- a/community/epdfview/glib2_headers.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h -index c142a7a..58fcf2e 100644 ---- a/src/gtk/StockIcons.h -+++ b/src/gtk/StockIcons.h -@@ -18,7 +18,7 @@ - #if !defined (__STOCK_ICONS_H__) - #define __STOCK_ICONS_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/community/evilwm/LICENSE b/community/evilwm/LICENSE deleted file mode 100644 index 6778ede8c..000000000 --- a/community/evilwm/LICENSE +++ /dev/null @@ -1,40 +0,0 @@ -LICENCE - -evilwm 1.1 -Copyright (C) 1999-2011 Ciaran Anscomb <evilwm@6809.org.uk> - -This is free software. You can do what you want to it, but if it -breaks something, you get to pay for the counselling. The code was -originally based on aewm, so this is distributed under the same terms, -which follow. - - -AEWM LICENCE - -Copyright (c) 1998-2000 Decklin Foster. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS", WITHOUT ANY EXPRESS -OR IMPLIED WARRANTIES OF ANY KIND. IN NO EVENT SHALL THE AUTHOR BE -HELD LIABLE FOR ANY DAMAGES CONNECTED WITH THE USE OF THIS PROGRAM. - -You are granted permission to copy, publish, distribute, and/or sell -copies of this program and any modified versions or derived works, -provided that this copyright and notice are not removed or altered. - -Portions of the code were based on 9wm, which contains this license: - -> 9wm is free software, and is Copyright (c) 1994 by David Hogan. -> Permission is granted to all sentient beings to use this software, -> to make copies of it, and to distribute those copies, provided -> that: -> -> (1) the copyright and licence notices are left intact -> (2) the recipients are aware that it is free software -> (3) any unapproved changes in functionality are either -> (i) only distributed as patches -> or (ii) distributed as a new program which is not called 9wm -> and whose documentation gives credit where it is due -> (4) the author is not held responsible for any defects -> or shortcomings in the software, or damages caused by it. -> -> There is no warranty for this software. Have a nice day. diff --git a/community/evilwm/PKGBUILD b/community/evilwm/PKGBUILD deleted file mode 100644 index 1ac5b6205..000000000 --- a/community/evilwm/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 83062 2013-01-27 09:45:44Z andrea $ -# Maintainer: Kevin Piche <kevin@archlinux.org> -# Contributor: Jochem Kossen <j.kossen@home.nl> - -pkgname=evilwm -pkgver=1.1.0 -pkgrel=1 -pkgdesc="A minimalist but usable window manager for the X Window System." -arch=('i686' 'x86_64') -url="http://evilwm.sourceforge.net" -license=('custom') -depends=('libxrandr') -source=(http://www.6809.org.uk/evilwm/$pkgname-$pkgver.tar.gz LICENSE) -md5sums=('5f14cc3019320860c85bb07c60a76bd7' - '0941ad3e96597ef75c6310f43a0342a0') - -build() { - cd "$srcdir"/$pkgname-$pkgver - make -} - -package() { - cd "$srcdir"/$pkgname-$pkgver - make DESTDIR="$pkgdir" desktopfilesdir=/usr/share/xsessions install - install -D -m644 "$srcdir"/LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/extundelete/extundelete-build.patch b/community/extundelete/extundelete-build.patch deleted file mode 100644 index f068dc31f..000000000 --- a/community/extundelete/extundelete-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ruN1 extundelete-0.2.0-orig/src/extundelete.cc extundelete-0.2.0/src/extundelete.cc ---- extundelete-0.2.0-orig/src/extundelete.cc 2010-05-16 03:51:15.000000000 +0200 -+++ extundelete-0.2.0/src/extundelete.cc 2012-02-26 16:49:20.000000000 +0100 -@@ -943,3 +943,3 @@ - { -- group_descriptor_table[n] = fs->group_desc[n]; -+ group_descriptor_table[n] = *ext2fs_group_desc(fs, fs->group_desc, n); - } -@@ -2613,3 +2613,4 @@ - inode->osd2.linux2.l_i_gid_high = le16_to_cpu( (uint16_t *) &inodebuf[item*60] ); -- inode->osd2.linux2.l_i_reserved2 = le32_to_cpu( (uint32_t *) &inodebuf[item*62] ); -+ inode->osd2.linux2.l_i_checksum_lo = le16_to_cpu( (uint16_t *) &inodebuf[item*62] ); -+ inode->osd2.linux2.l_i_reserved = le16_to_cpu( (uint16_t *) &inodebuf[item*63] ); - } -diff -ruN1 extundelete-0.2.0-orig/src/insertionops.cc extundelete-0.2.0/src/insertionops.cc ---- extundelete-0.2.0-orig/src/insertionops.cc 2010-03-21 07:05:15.000000000 +0100 -+++ extundelete-0.2.0/src/insertionops.cc 2012-02-26 16:49:27.000000000 +0100 -@@ -65,3 +65,3 @@ - os << "# Blocks per group: " << s_block->s_blocks_per_group << std::endl; -- os << "# Fragments per group: " << s_block->s_frags_per_group << std::endl; -+ os << "# Fragments per group: " << s_block->s_clusters_per_group << std::endl; - os << "# Inodes per group: " << s_block->s_inodes_per_group << std::endl; diff --git a/community/fbreader/build-fix.patch b/community/fbreader/build-fix.patch deleted file mode 100644 index 7316464b8..000000000 --- a/community/fbreader/build-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- config.mk.orig 2010-02-23 18:22:10.000000000 +0000 -+++ config.mk 2010-02-28 13:55:11.000000000 +0000 -@@ -21,7 +21,7 @@ - ARCHIVER_LIBS ?= -lz -lbz2 - NETWORK_LIBS ?= -lcurl - --CFLAGS += -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" -+CFLAGS += -I$(srcdir)/liblinebreak-20080321 -DINSTALLDIR=\"$(INSTALLDIR_MACRO)\" -DBASEDIR=\"$(SHAREDIR_MACRO)\" -DLIBDIR=\"$(LIBDIR_MACRO)\" -DIMAGEDIR=\"$(IMAGEDIR_MACRO)\" -DAPPIMAGEDIR=\"$(APPIMAGEDIR_MACRO)\" -DVERSION=\"$(VERSION)\" - ifeq "$(ZLSHARED)" "yes" - CFLAGS += -fPIC -DZLSHARED - endif -@@ -38,6 +38,8 @@ - LDFLAGS += -pg - endif - -+LDFLAGS += -L$(srcdir)/liblinebreak-20080321/DebugDir -+ - ZINCLUDE = -I $(ROOTDIR)/zlibrary/core/include -I $(ROOTDIR)/zlibrary/text/include - - ZLSHARED ?= yes diff --git a/community/fceux/fceux.desktop b/community/fceux/fceux.desktop deleted file mode 100644 index c20271a77..000000000 --- a/community/fceux/fceux.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Fceux -GenericName=NES/Famicom emulator -Exec=fceux -Icon=fceux -Type=Application -Categories=Game;Emulator; -Encoding=UTF-8 -MimeType=application/x-nes;application/x-nes-rom diff --git a/community/fceux/fceux.png b/community/fceux/fceux.png Binary files differdeleted file mode 100644 index 1cf27b1fd..000000000 --- a/community/fceux/fceux.png +++ /dev/null diff --git a/community/fillets-ng/fillets-ng.desktop b/community/fillets-ng/fillets-ng.desktop deleted file mode 100644 index 69731d098..000000000 --- a/community/fillets-ng/fillets-ng.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Fillets-NG -GenericName=Fish Fillets -Comment=Wonderful puzzle game Fish Fillets -Comment[cs]=Podmořská logická hra ve které ovládáte dva rybí agenty -Icon=fillets-ng -Exec=fillets -StartupNotify=true -Terminal=false -Categories=Game;LogicGame; diff --git a/community/fmodex/PERMISSION b/community/fmodex/PERMISSION deleted file mode 100644 index be7e15ff8..000000000 --- a/community/fmodex/PERMISSION +++ /dev/null @@ -1,25 +0,0 @@ -Hi Sven, -sounds ok to me. -regards, - -Brett Paterson | CEO -FMOD by Firelight Technologies Pty Ltd -Interactive Audio Middleware | www.fmod.org -PH: +61 3 96635947 Fax: +61 3 96635951 - - ------Original Message----- -From: Sven-Hendrik Haase [mailto:sh@lutzhaase.com] -Sent: Thursday, 15 July 2010 9:51 AM -To: sales@fmod.org -Subject: Redistribution for Arch Linux - - Hello, - - I'm a packager for the Arch Linux project (http://www.archlinux.org) and - I would like to ask you for permission for redistributing FMOD in binary - form in our project. Arch Linux is a free operating system and is run - entirely by volunteers. There is no commercial context. - - Regards, - Sven-Hendrik Haase diff --git a/community/fmodex/PKGBUILD b/community/fmodex/PKGBUILD deleted file mode 100644 index 8bb9b7e2c..000000000 --- a/community/fmodex/PKGBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# $Id: PKGBUILD 80347 2012-11-20 11:44:56Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -# Note: This packae is proprietary and distribution is limited. However, we -# have written permission to by the FMOD CEO to distribute this in binary form. -pkgname=fmodex -pkgver=4.44.01 -pkgrel=1 -pkgdesc="An advanced audio engine" -arch=('i686' 'x86_64') -url="http://www.fmod.org/" -license=('custom') -source=("http://www.fmod.org/index.php/release/version/fmodapi${pkgver//./}linux.tar.gz") -md5sums=('3f32d8e74ac5cc6e581f7c32c71f4d20') - -build() { - cd fmodapi${pkgver//./}linux - - mkdir -p ${pkgdir}/usr/lib - mkdir -p ${pkgdir}/usr/include/fmodex - - cp -d api/lib/* ${pkgdir}/usr/lib/ - [[ $CARCH == "i686" ]] && rm ${pkgdir}/usr/lib/*64* - - if [[ $CARCH == "x86_64" ]]; then - cd ${pkgdir}/usr/lib - ln -sf libfmodex64-${pkgver}.so libfmodex-${pkgver}.so - ln -sf libfmodexL64-${pkgver}.so libfmodexL-${pkgver}.so - cd ${srcdir}/fmodapi${pkgver//./}linux - fi - - cp api/inc/* ${pkgdir}/usr/include/fmodex/ - - install -Dm644 documentation/LICENSE.TXT ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - - mkdir -p ${pkgdir}/usr/share/doc/fmodex - cp -r documentation examples ${pkgdir}/usr/share/doc/fmodex -} - -# vim:set ts=2 sw=2 et: diff --git a/community/fpc/Makefile-mk382.diff b/community/fpc/Makefile-mk382.diff deleted file mode 100644 index 00909766d..000000000 --- a/community/fpc/Makefile-mk382.diff +++ /dev/null @@ -1,174 +0,0 @@ ---- Makefile.fpc.orig 2011-04-02 01:15:34.000000000 +0400 -+++ Makefile.fpc 2011-08-05 22:29:44.000000000 +0400 -@@ -4,7 +4,7 @@ - - [package] - name=compiler --version=2.4.4 -+version=2.5.1 - - [target] - programs=pp -@@ -32,7 +32,7 @@ - unexport FPC_VERSION FPC_COMPILERINFO - - # Which platforms are ready for inclusion in the cycle --CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips -+CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr - - # All supported targets used for clean - ALLTARGETS=$(CYCLETARGETS) -@@ -148,6 +148,12 @@ - ifeq ($(CPC_TARGET),arm) - CPUSUF=arm - endif -+ifeq ($(CPC_TARGET),mips) -+CPUSUF=mips -+endif -+ifeq ($(CPC_TARGET),mipsel) -+CPUSUF=mipsel -+endif - - # Do not define the default -d$(CPU_TARGET) because that - # will conflict with our -d$(CPC_TARGET) -@@ -224,12 +230,39 @@ - override LOCALOPT+= - endif - -+# mipsel specific -+ifeq ($(PPC_TARGET),mipsel) -+override LOCALOPT+=-Fumips -+endif -+ -+ -+OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo -+OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo -+# symbol liveness WPO requires nm, smart linking and no stripping (the latter -+# is forced by the Makefile when necessary) -+ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),) -+ifdef LINKSMART -+ifdef CREATESMART -+OPTWPOCOLLECT+=-OWsymbolliveness -Xs- -+OPTWPOPERFORM+=-Owsymbolliveness -+endif -+endif -+endif -+ -+ - [rules] - ##################################################################### - # Setup Targets - ##################################################################### - - ifeq ($(OS_TARGET),win32) -+USE_CMP_FOR_DIFF=1 -+endif -+ifeq ($(OS_TARGET),win64) -+USE_CMP_FOR_DIFF=1 -+endif -+ -+ifdef USE_CMP_FOR_DIFF - ifdef CMP - override DIFF:=$(CMP) -i218 - endif -@@ -267,6 +300,8 @@ - TEMPNAME1=ppc1$(EXEEXT) - TEMPNAME2=ppc2$(EXEEXT) - TEMPNAME3=ppc3$(EXEEXT) -+TEMPWPONAME1=ppcwpo1$(EXEEXT) -+TEMPWPONAME2=ppcwpo2$(EXEEXT) - MAKEDEP=ppdep$(EXEEXT) - MSG2INC=./msg2inc$(EXEEXT) - ifdef CROSSINSTALL -@@ -327,15 +362,15 @@ - -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR)) - - tempclean: -- -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) -+ -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo - - execlean : -- -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME) -+ -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2) - - $(addsuffix _clean,$(ALLTARGETS)): - -$(DELTREE) $(addprefix $(subst _clean,,$@),/units) - -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)) -- -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME)) -+ -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME)) - - cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET)) - -$(DEL) $(EXENAME) -@@ -444,6 +479,28 @@ - # Normal cycle - # - -+ifndef NOWPOCYCLE -+ifdef RELEASE -+DOWPOCYCLE=1 -+# Two WPO cycles in case of RELEASE=1 -+wpocycle: -+# don't use cycle_clean, it will delete the compiler utilities again -+ $(RM) $(EXENAME) -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler -+ $(RM) $(EXENAME) -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler -+ $(MOVE) $(EXENAME) $(TEMPWPONAME1) -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler -+ $(COPY) $(EXENAME) $(TEMPWPONAME2) -+endif -+endif -+ -+ifndef DOWPOCYCLE -+wpocycle: -+endif -+ - # Used to avoid unnecessary steps - ifdef DIFF - ifdef OLDFPC -@@ -490,6 +547,7 @@ - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next - $(DIFF) $(TEMPNAME3) $(EXENAME) - $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)' -+ $(MAKE) wpocycle - $(MAKE) echotime - - else -@@ -508,8 +566,11 @@ - # ppc<ARCH> (target native) - ifndef CROSSINSTALL - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl -+# building a native compiler for embedded targets is not possible -+ifneq ($(OS_TARGET),embedded) - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler - endif -+endif - - endif - -@@ -523,10 +584,10 @@ - # ppc3/ppcXXX = native (skipped for cross installation) - # - -+cycle: override FPC= - cycle: - # ppc (source native) - # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here --override FPC= - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler - # ppcross<ARCH> (source native) -@@ -535,8 +596,11 @@ - # ppc<ARCH> (target native) - ifndef CROSSINSTALL - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl -+# building a native compiler for embedded targets is not possible -+ifneq ($(OS_TARGET),embedded) - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler - endif -+endif - - endif - diff --git a/community/freeimage/gcc4.5_ln.patch b/community/freeimage/gcc4.5_ln.patch deleted file mode 100644 index 317a48004..000000000 --- a/community/freeimage/gcc4.5_ln.patch +++ /dev/null @@ -1,62 +0,0 @@ -diff -Naur FreeImage.orig//Makefile.fip FreeImage.new//Makefile.fip ---- FreeImage.orig//Makefile.fip 2010-08-10 19:15:20.000000000 +0200 -+++ FreeImage.new//Makefile.fip 2010-09-12 23:29:36.000000000 +0200 -@@ -15,9 +15,9 @@ -
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
-+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
- CFLAGS += $(INCLUDE)
--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
-+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
- CXXFLAGS += $(INCLUDE)
-
- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
-diff -Naur FreeImage.orig//Makefile.gnu FreeImage.new//Makefile.gnu ---- FreeImage.orig//Makefile.gnu 2010-08-10 19:15:20.000000000 +0200 -+++ FreeImage.new//Makefile.gnu 2010-09-12 23:01:57.000000000 +0200 -@@ -15,9 +15,9 @@ -
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
--CFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
-+CFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -DNO_LCMS
- CFLAGS += $(INCLUDE)
--CXXFLAGS ?= -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
-+CXXFLAGS += -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
- CXXFLAGS += $(INCLUDE)
-
- ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
-@@ -65,9 +65,6 @@ - install -m 644 -o root -g root $(HEADER) $(INCDIR)
- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-- ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
-- ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)
-- ldconfig
-
- clean:
- rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
-diff -Naur FreeImage.orig//Source/FreeImageToolkit/Background.cpp FreeImage.new//Source/FreeImageToolkit/Background.cpp ---- FreeImage.orig//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:15:20.000000000 +0200 -+++ FreeImage.new//Source/FreeImageToolkit/Background.cpp 2010-08-10 19:16:12.000000000 +0200 -@@ -21,6 +21,7 @@ -
- #include "FreeImage.h"
- #include "Utilities.h"
-+#include <limits.h>
-
- /** @brief Determines, whether a palletized image is visually greyscale or not.
-
-diff -Naur FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h ---- FreeImage.orig//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 19:15:20.000000000 +0200 -+++ FreeImage.new//Source/OpenEXR/Imath/ImathMatrix.h 2010-08-10 21:43:26.000000000 +0200 -@@ -51,6 +51,7 @@ -
- #include <iostream>
- #include <iomanip>
-+#include <cstring>
-
- #if (defined _WIN32 || defined _WIN64) && defined _MSC_VER
- // suppress exception specification warnings
diff --git a/community/freevo/PKGBUILD b/community/freevo/PKGBUILD deleted file mode 100644 index 1d7a95dea..000000000 --- a/community/freevo/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 73149 2012-07-02 12:22:07Z giovanni $ -# Maintainer: Ronald van Haren <ronald.archlinux.org> - -pkgname=freevo -pkgver=1.9.0 -pkgrel=8 -pkgdesc="An open-source home theatre PC platform" -url="http://freevo.sourceforge.net/" -license=('GPL2') -arch=('i686' 'x86_64' 'mips64el') -depends=('lame' 'flac' 'faad2' 'cdparanoia' 'vorbis-tools' 'fbset' - 'smpeg' 'pil' 'python-pysqlite-legacy' 'pyxml' 'lsdvd' - 'twisted' 'python2-numpy' 'python-pygame' 'kaa-metadata' - 'kaa-imlib2' 'python2-beautifulsoup3' 'python-html5lib') -optdepends=('mplayer: most features' - 'xine-lib: can be used instead of mplayer' - 'tvtime: watching tv' - 'xmltv: parsing online tv guides') -install=freevo.install -options=('docs') -source=("http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz" - 'freevo.desktop' - 'imdb-html5lib.patch') -sha1sums=('0533a2d4ff8a7b09b3b233fdf303ff56bda22d16' - '5f6e76dc58496f072aca29257c24be5ffa9c6c7d' - '57e1099527603500c594fbffa2cb7233b636eed1') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - # patch from http://sourceforge.net/tracker/index.php?func=detail&aid=2924872&group_id=46652&atid=446895 - patch -p0 < ${srcdir}/imdb-html5lib.patch - python2 setup.py install --prefix=${pkgdir}/usr - - install -Dm644 local_conf.py.example ${pkgdir}/usr/share/doc/freevo/local_conf.py.example - - # install .desktop file and icon - install -Dm644 ${srcdir}/${pkgname}-${pkgver}/share/icons/misc/freevo_app.png \ - ${pkgdir}/usr/share/pixmaps/freevo.png - install -Dm644 ${srcdir}/freevo.desktop \ - ${pkgdir}/usr/share/applications/freevo.desktop - - # fix executable for python 2.7 - sed -i -e 's:\(#!/usr/bin/env[ ]\+python$\|#!/usr/bin/python$\):\12:g' \ - $(find ${pkgdir} -regex ".*.py\|.*.recipe") - sed -i "s:python:python2:g" ${pkgdir}/usr/share/freevo/htdocs/downloadurl -} diff --git a/community/freevo/freevo.desktop b/community/freevo/freevo.desktop deleted file mode 100644 index 1b57043be..000000000 --- a/community/freevo/freevo.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Freevo -GenericName=Freevo -Comment=Home theatre -Exec=freevo -Terminal=false -Type=Application -Icon=/usr/share/pixmaps/freevo.png -Categories=AudioVideo; - diff --git a/community/freevo/freevo.install b/community/freevo/freevo.install deleted file mode 100644 index 06734569d..000000000 --- a/community/freevo/freevo.install +++ /dev/null @@ -1,25 +0,0 @@ -post_install() { - if [ ! -d /etc/freevo ]; then - mkdir /etc/freevo - fi - - if [ ! -f /etc/freevo/local_conf.py ]; then - cp /usr/share/doc/freevo/local_conf.py.example /etc/freevo/local_conf.py - fi - -cat << _EOF - -==> freevo installation notes: ---------------------------------------- - Run 'freevo setup --help' and follow the instructions. Then edit - /etc/freevo/local_conf.py to suit your needs. This file can be - installed on a per-user basis in ~/.freevo and will take precedence - over the one in /etc/freevo/. - -_EOF - -} - -post_upgrade() { - post_install -} diff --git a/community/freevo/imdb-html5lib.patch b/community/freevo/imdb-html5lib.patch deleted file mode 100644 index 6f454246e..000000000 --- a/community/freevo/imdb-html5lib.patch +++ /dev/null @@ -1,301 +0,0 @@ -Index: src/helpers/imdb.py -=================================================================== ---- src/helpers/imdb.py (revision 11608) -+++ src/helpers/imdb.py (working copy) -@@ -53,19 +53,19 @@ - parser = OptionParser(version='%prog 1.0', conflict_handler='resolve', usage=""" - Search IMDB for a movie or a TV show - --freevo imdb [options] <search> [<output> <video file> [<video file>]] -+freevo imdb [options] | [<result> <fxd file> <video file> [<video file>]] - --Generate <output>.fxd for the movie. Files is a list of files that belongs to --this movie. Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title] to add --a special DVD or VCD title to the list of files""") -+Generate a fxd for the movie. Files is a list of files that belongs to this -+movie. Use [dvd|vcd] to add the whole disc or use [dvd|vcd][title] to add a -+special DVD or VCD title to the list of files""") - parser.add_option('-v', '--verbose', action='count', default=0, - help='set the level of verbosity [default:%default]') - parser.add_option('-s', '--search', action='store_true', dest='search', default=False, - help='search imdb for string [default:%default]') - parser.add_option('-g', '--guess', action='store_true', dest='guess', default=False, - help='search imdb for possible filename match [default:%default]') -- parser.add_option('--tv', action='store_true', dest='tv', default=False, -- help='specify the search is a tv programme [default:%default]') -+ parser.add_option('--tv', action='store', dest='tv', default=None, -+ help='specify the id of a tv programme for a eipsode search [default:%default]') - parser.add_option('--season', dest='season', default=None, - help='specify the season in the search [default:%default]') - parser.add_option('--episode', dest='episode', default=None, -@@ -116,7 +116,9 @@ - sys.exit(u'--search requires <search pattern>') - elif opts.guess and len(args) < 1: - sys.exit(u'--guess requires <guess pattern>') -- tv_marker = (opts.tv or opts.season or opts.episode) and '"' or '' -+ #elif opts.tv and len(args) < 1: -+ # sys.exit(u'--tv requires <imdb id>') -+ tv_marker = (opts.season or opts.episode) and '"' or '' - - if opts.rom_drive is not None: - driveset = True -@@ -176,6 +178,23 @@ - print '%s' % title.encode(opts.encoding) - sys.exit(0) - -+ if opts.tv: -+ print "Searching IMDB for '%s' season:%s episode:%s..." % (opts.tv, opts.season, opts.episode) -+ results = fxd.getIMDBid(opts.tv, opts.season, opts.episode) -+ if len(results) == 0: -+ print 'No results' -+ #for result in results: -+ # if result[3]: -+ # title = 'http://www.imdb.com/title/tt%s/ %s %s (%s) %s' % (result[:1] + result[:4]) -+ # elif result[2]: -+ # title = 'http://www.imdb.com/title/tt%s/ %s %s (%s)' % (result[:1] + result[:3]) -+ # else: -+ # title = 'http://www.imdb.com/title/tt%s/ %s %s' % (result[:1] + result[:2]) -+ # title = results -+ title = 'http://www.imdb.com/title/tt%s/ %s' % (results, results) -+ print '%s' % title.encode(opts.encoding) -+ sys.exit(0) -+ - # normal usage - if len(args) < 3: - sys.exit(u'requires <imdb id> <fxd filename> <video file>|<cd id>') -Index: src/util/fxdimdb.py -=================================================================== ---- src/util/fxdimdb.py (revision 11608) -+++ src/util/fxdimdb.py (working copy) -@@ -48,8 +48,15 @@ - import codecs - import os - import traceback --from BeautifulSoup import BeautifulSoup, NavigableString --import HTMLParser -+from pprint import pprint, pformat -+try: -+ from html5lib import HTMLParser, treebuilders -+ from html5lib.treebuilders.soup import NavigableString -+ using_html5lib = True -+except ImportError: -+ import HTMLParser -+ from BeautifulSoup import BeautifulSoup, BeautifulStoneSoup, NavigableString -+ using_html5lib = False - - import config - import util -@@ -232,6 +239,7 @@ - response.close() - - _debug_('id_list has %s items' % (len(self.id_list))) -+ #print 'id_list=%s' % (pformat(self.id_list)) - if len(self.id_list) > 20: - # too many results, check if there are stupid results in the list - words = [] -@@ -311,7 +319,11 @@ - dvd = 0 - - try: -- soup = BeautifulSoup(results.read(), convertEntities='xml') -+ if using_html5lib: -+ parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup')) -+ soup = parser.parse(results.read()) -+ else: -+ soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES) - except UnicodeDecodeError: - print "Unicode error: check that /usr/lib/python2.x/site.py has the correct default encoding" - traceback.print_exc() -@@ -336,68 +348,61 @@ - self.info['year'] = y[1:-1] - except (AttributeError, TypeError, ValueError): - self.info['title'] = self.title -- self.info['year'] = title.find('a').string.strip() -+ try: -+ self.info['year'] = title.find('a').contents[0].strip() -+ except AttributeError: -+ self.info['year'] = '' - - # Find the <div> with class info, each <h5> under this provides info -+ wanted_keys = ('release_date', 'genre', 'tagline', 'plot', 'plot_keywords', -+ 'also_known_as', 'mpaa', 'runtime', 'country', 'language', -+ 'color', 'aspect_ratio', 'sound_mix', 'certification', -+ ) -+ - for info in main.findAll('div', {'class' : 'info'}): - infoh5 = info.find('h5') - if not infoh5: - continue - try: -- infostr = infoh5.next -- key = infostr.string.strip(':').lower().replace(' ', '_') -- nextsibling = nextsibling = infoh5.nextSibling.strip() -- sections = info.findAll('a', { 'href' : re.compile('/Sections') }) -- lists = info.findAll('a', { 'href' : re.compile('/List') }) -- if len(nextsibling) > 0: -- self.info[key] = nextsibling -+ infostr = infoh5.find(text=True) -+ key = infostr.strip().strip(':').lower().replace(' ', '_') -+ if key not in wanted_keys: -+ continue -+ content = info.find('div', {'class' : 'info-content'}) -+ infocontent = content.find(text=True) -+ if infocontent: -+ infocontent = infocontent.strip() -+ sections = info.findAll('a', { 'href' : re.compile('^/Sections') }) -+ lists = info.findAll('a', { 'href' : re.compile('^/List') }) -+ keywords = info.findAll('a', { 'href' : re.compile('^/keyword') }) -+ #print 'key=%s content=%r keywords=%r sections=%r lists=%r' % (key, infocontent, keywords, sections, lists) -+ if len(infocontent) > 0: -+ self.info[key] = infocontent - elif len(sections) > 0: - items = [] - for item in sections: -- items.append(item.string) -+ items.append(item.contents[0].strip()) - self.info[key] = ' / '.join(items) - elif len(lists) > 0: - items = [] - for item in lists: -- items.append(item.string) -+ items.append(item.contents[0].strip()) - self.info[key] = ' / '.join(items) -+ elif len(keywords) > 0: -+ items = [] -+ for item in keywords: -+ items.append(item.contents[0].strip()) -+ self.info[key] = ' / '.join(items) - except: - pass - -- # Find Plot Outline/Summary: -- # Normally the tag is named "Plot Outline:" - however sometimes -- # the tag is "Plot Summary:" or just "Plot:". Search for all strings. -- imdb_result = soup.find(text='Plot Outline:') -- if not imdb_result: -- imdb_result = soup.find(text='Plot Summary:') -- if not imdb_result: -- imdb_result = soup.find(text='Plot:') -- if imdb_result: -- self.info['plot'] = imdb_result.next.strip() -- else: -- self.info['plot'] = u'' -- -- # Find tagline - sometimes the tagline is missing. -- # Use an empty string if no tagline could be found. -- imdb_result = soup.find(text='Tagline:') -- if imdb_result: -- self.info['tagline'] = imdb_result.next.strip() -- else: -- self.info['tagline'] = u'' -- - rating = soup.find(text='User Rating:').findNext(text=re.compile('/10')) -- if rating: -+ try: - votes = rating.findNext('a') -- self.info['rating'] = rating.strip() + ' (' + votes.string.strip() + ')' -- else: -+ self.info['rating'] = rating.strip() + ' (' + votes.contents[0].strip() + ')' -+ except AttributeError: - self.info['rating'] = '' - -- runtime = soup.find(text='Runtime:') -- if runtime and runtime.next: -- self.info['runtime'] = runtime.next.strip() -- else: -- self.info['runtime'] = '' -- - # Replace special characters in the items - for (k,v) in self.info.items(): - self.info[k] = self.convert_entities(v) -@@ -794,10 +799,14 @@ - _debug_('parsesearchdata(results=%r, url=%r, id=%r)' % (results, url, id)) - - self.id_list = [] -- m = re.compile('/title/tt([0-9]*)/') -- y = re.compile('\(([^)]+)\)') -+ m = re.compile('/title/tt(\d+)/') -+ y = re.compile('\((\d+)\) *(.*)') - try: -- soup = BeautifulSoup(results.read(), convertEntities='xml') -+ if using_html5lib: -+ parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup')) -+ soup = parser.parse(results.read()) -+ else: -+ soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES) - except HTMLParser.HTMLParseError, why: - traceback.print_exc() - _debug_('Cannot parse %r: %s' % (url, why), DWARNING) -@@ -806,28 +815,37 @@ - traceback.print_exc() - _debug_('Cannot parse %r: %s' % (url, why), DWARNING) - return self.id_list -- items = soup.findAll('a', href=re.compile('/title/tt')) -+ items = soup.findAll('a', href=re.compile('^/title/tt')) - ids = set([]) - for item in items: -- idm = m.search(item['href']) -+ idm = item.attrMap['href'] - if not idm: - continue -- if isinstance(item.next.next, NavigableString): -- yrm = y.findall(item.next.next) -- -- id = idm.group(1) -- name = item.string -- # skip empty names -- if not name: -+ m_match = m.match(idm) -+ if not m_match: -+ # skip invalid titles - continue -- # skip duplicate ids -+ id = m_match.group(1) - if id in ids: -+ # skip duplicate ids - continue -+ name = item.contents[0] -+ if not isinstance(name, NavigableString): -+ # skip empty names -+ continue -+ if isinstance(item.next.next, NavigableString): -+ yrm = item.next.next.strip() - ids.add(id) -- year = len(yrm) > 0 and yrm[0] or '0000' -- type = len(yrm) > 1 and yrm[1] or '' -+ y_match = y.match(yrm) -+ if y_match: -+ year = y_match.group(1) -+ type = y_match.group(2) -+ else: -+ year = '0000' -+ type = '' - #print 'url', item['href'] - #print item.parent.findChildren(text=re.compile('[^ ]')) -+ #print 'id=%s name=%s year=%s type=%s' % (id, name, year, type) - self.id_list += [ ( id, name, year, type ) ] - - for item in self.id_list: -@@ -840,7 +858,11 @@ - Returns a new id for getIMDBid with TV series episode data - """ - try: -- soup = BeautifulSoup(results.read(), convertEntities='xml') -+ if using_html5lib: -+ parser = HTMLParser(tree=treebuilders.getTreeBuilder('beautifulsoup')) -+ soup = parser.parse(results.read()) -+ else: -+ soup = BeautifulSoup(results.read(), convertEntities=BeautifulStoneSoup.HTML_ENTITIES) - except UnicodeDecodeError: - print "Unicode error; check that /usr/lib/python2.x/site.py has the correct default encoding" - pass -@@ -968,9 +990,6 @@ - self.image = vfs.basename(self.image) - - _debug_('Downloaded cover image from %s' % (self.image_url)) -- print "Freevo knows nothing about the copyright of this image, please" -- print "go to %s to check for more information about private." % self.image_url -- print "use of this image" - - - def str2XML(self, line): diff --git a/community/freewrl/build-fix.patch b/community/freewrl/build-fix.patch deleted file mode 100644 index c0de71d07..000000000 --- a/community/freewrl/build-fix.patch +++ /dev/null @@ -1,1201 +0,0 @@ -diff -wbBur freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c ---- freewrl-1.22.10/src/lib/non_web3d_formats/ColladaParser.c 2010-08-19 06:20:36.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/non_web3d_formats/ColladaParser.c 2011-07-04 01:19:07.000000000 +0400 -@@ -54,7 +54,7 @@ - #include "ColladaParser.h" - - #if HAVE_EXPAT_H --# include <expat.h> -+# include </usr/include/expat.h> - #endif - - #define PROTOINSTANCE_MAX_LEVELS 10 -diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldGet.c freewrl-1.22.10.my/src/lib/world_script/fieldGet.c ---- freewrl-1.22.10/src/lib/world_script/fieldGet.c 2010-10-13 23:45:26.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/fieldGet.c 2011-07-04 20:21:21.000000000 +0400 -@@ -412,7 +412,7 @@ - /* create a new SFFloat object */ - - fp = (float *)fp_in; -- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); -+ newjsval = JS_NewJSVal(cx,(double)*fp); - fp_in = offsetPointer_deref(float *,fp_in,elementlen); - - /* put this object into the MF class */ -@@ -449,7 +449,7 @@ - /* create a new SFTime object */ - - fp = (float *)fp_in; -- newjsval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)*fp)); -+ newjsval = JS_NewJSVal(cx,(double)*fp); - fp_in = offsetPointer_deref(float *,fp_in,elementlen); - - /* put this object into the MF class */ -diff -wbBur freewrl-1.22.10/src/lib/world_script/fieldSet.c freewrl-1.22.10.my/src/lib/world_script/fieldSet.c ---- freewrl-1.22.10/src/lib/world_script/fieldSet.c 2010-09-22 00:00:25.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/fieldSet.c 2011-07-04 20:03:53.000000000 +0400 -@@ -748,7 +748,7 @@ - - #ifdef SETFIELDVERBOSE - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - printf ("start of setField_javascriptEventOut, to %ld:%d = %p, fieldtype %d string %s\n",(long)tn, tptr, memptr, fieldType, strp); - #endif - -@@ -813,7 +813,7 @@ - case FIELDTYPE_SFImage: { - /* the string should be saved as an SFImage */ - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - - Parser_scanStringValueToMem(tn, tptr, FIELDTYPE_SFImage, strp, FALSE); - break; -@@ -824,7 +824,7 @@ - uintptr_t *newptr; - - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - - /* copy the string over, delete the old one, if need be */ - /* printf ("fieldSet SFString, tn %d tptr %d offset from struct %d\n", -@@ -844,7 +844,7 @@ - struct X3D_Node *mynode; - - strval = JS_ValueToString(scriptContext, JSglobal_return_val); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(scriptContext, strval); - - /* we will have at least one node here, in an ascii string */ - while ((*strp > '\0') && (*strp <= ' ')) strp ++; -@@ -1227,7 +1227,7 @@ - JSString *_tmpStr; - - _tmpStr = JS_ValueToString(cx, mainElement); -- strp = JS_GetStringBytes(_tmpStr); -+ strp = JS_EncodeString(scriptContext, _tmpStr); - printf ("sub element %d is \"%s\" \n",i,strp); - - if (JSVAL_IS_OBJECT(mainElement)) printf ("sub element %d is an OBJECT\n",i); -@@ -1329,7 +1329,7 @@ - JSString *strval; - - strval = JS_ValueToString(cx, mainElement); -- strp = JS_GetStringBytes(strval); -+ strp = JS_EncodeString(cx, strval); - - #ifdef SETFIELDVERBOSE - printf ("getJSMultiNumType, got string %s\n",strp); -@@ -1441,7 +1441,7 @@ - return; - } - strval = JS_ValueToString(cx, _v); -- valStr = JS_GetStringBytes(strval); -+ valStr = JS_EncodeString(cx, strval); - - /* printf ("new string %d is %s\n",i,valStr); */ - -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsUtils.c freewrl-1.22.10.my/src/lib/world_script/jsUtils.c ---- freewrl-1.22.10/src/lib/world_script/jsUtils.c 2010-06-03 23:38:37.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsUtils.c 2011-07-04 20:21:44.000000000 +0400 -@@ -134,7 +134,7 @@ - nf = OBJECT_TO_JSVAL(me); - - #ifdef JSVRMLCLASSESVERBOSE -- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); -+ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); - #endif - - if (!setSFNodeField (cx, par, pf, &nf)) { -@@ -197,7 +197,7 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, *newval); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - oldS = (struct Uni_String *) *((uintptr_t *)Data); - -@@ -305,12 +305,12 @@ - - case FIELDTYPE_SFFloat: { - memcpy ((void *) &fl, Data, datalen); -- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,(double)fl)); -+ *newval = JS_NewJSVal(cx,(double)fl); - break; - } - case FIELDTYPE_SFTime: { - memcpy ((void *) &dl, Data, datalen); -- *newval = DOUBLE_TO_JSVAL(JS_NewDouble(cx,dl)); -+ *newval = JS_NewJSVal(cx,dl); - break; - } - case FIELDTYPE_SFBool: -@@ -824,7 +824,7 @@ - struct X3D_Node *node; - - _idStr = JS_ValueToString(context, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(context, _idStr); - - #ifdef JSVRMLCLASSESVERBOSE - printf ("\ngetSFNodeField called on name %s object %u\n",_id_c, obj); -@@ -912,7 +912,7 @@ - - /* get the id field... */ - -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - - #ifdef JSVRMLCLASSESVERBOSE - printf ("\nsetSFNodeField called on name %s object %u, jsval %u\n",_id_c, obj, *vp); -@@ -1131,10 +1131,10 @@ - char *_id_c = "(no value in string)"; - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - /* printf ("hmmm...js_SetPropertyCheck called on string \"%s\" object %u, jsval %u\n",_id_c, obj, *vp); */ - } else if (JSVAL_IS_DOUBLE(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyCheck called on double %s object %u, jsval %u\n",_id_c, obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1192,7 +1192,7 @@ - /* get the id field... */ - - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_GetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1211,7 +1211,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1229,7 +1229,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug1 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1247,7 +1247,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(cx, JSVAL_TO_STRING(id)); - printf ("...js_SetPropertyDebug2 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1265,7 +1265,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug3 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1283,7 +1283,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug4 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1301,7 +1301,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug5 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1319,7 +1319,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug6 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1337,7 +1337,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug7 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1355,7 +1355,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug8 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -@@ -1373,7 +1373,7 @@ - - /* get the id field... */ - if (JSVAL_IS_STRING(id)) { -- _id_c = JS_GetStringBytes(JSVAL_TO_STRING(id)); -+ _id_c = JS_EncodeString(context, JSVAL_TO_STRING(id)); - printf ("\n...js_SetPropertyDebug9 called on string \"%s\" object %u, jsval %lu\n",_id_c, (unsigned int) obj, *vp); - } else if (JSVAL_IS_INT(id)) { - num = JSVAL_TO_INT(id); -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c ---- freewrl-1.22.10/src/lib/world_script/jsVRMLBrowser.c 2010-08-02 23:55:57.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLBrowser.c 2011-07-04 20:06:25.000000000 +0400 -@@ -336,7 +336,7 @@ - return JS_FALSE; - } - _str = JS_ValueToString(context, argv[0]); -- _costr = JS_GetStringBytes(_str); -+ _costr = JS_EncodeString(context, _str); - - /* sanitize string, for the EAI_RW call (see EAI_RW code) */ - tptr = _costr; -@@ -385,10 +385,10 @@ - return JS_FALSE; - } - _str[0] = JS_ValueToString(context, argv[0]); -- _costr[0] = JS_GetStringBytes(_str[0]); -+ _costr[0] = JS_EncodeString(context, _str[0]); - - _str[1] = JS_ValueToString(context, argv[1]); -- _costr[1] = JS_GetStringBytes(_str[1]); -+ _costr[1] = JS_EncodeString(context, _str[1]); - - /* we use the EAI code for this - so reformat this for the EAI format */ - { -@@ -575,7 +575,7 @@ - /* third parameter should be a string */ - if (JSVAL_IS_STRING(argv[2])) { - _str[1] = JSVAL_TO_STRING(argv[2]); -- fieldStr = JS_GetStringBytes(_str[1]); -+ fieldStr = JS_EncodeString(context, _str[1]); - #ifdef JSVERBOSE - printf ("field string is :%s:\n",fieldStr); - #endif -@@ -590,7 +590,7 @@ - - /* get the URL listing as a string */ - _str[0] = JS_ValueToString(context, argv[0]); -- _costr0 = JS_GetStringBytes(_str[0]); -+ _costr0 = JS_EncodeString(context, _str[0]); - - - #ifdef JSVERBOSE -@@ -690,7 +690,7 @@ - for (count=0; count < argc; count++) { - if (JSVAL_IS_STRING(argv[count])) { - _str = JSVAL_TO_STRING(argv[count]); -- _id_c = JS_GetStringBytes(_str); -+ _id_c = JS_EncodeString(context, _str); - #if defined(AQUA) || defined(_MSC_VER) - BrowserPrintConsoleMessage(_id_c); /* statusbar hud */ - consMsgCount = 0; /* reset the "Maximum" count */ -@@ -850,7 +850,7 @@ - - /* parameter should be a string */ - if (JSVAL_IS_STRING(argv[0])) { -- target = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); -+ target = JS_EncodeString(context, JSVAL_TO_STRING(argv[0])); - #ifdef JSVERBOSE - printf ("field string is %s\n",target); - #endif -@@ -930,7 +930,7 @@ - - /* parameters should be a string */ - if (JSVAL_IS_STRING(argv[0])) { -- targetDevice = JS_GetStringBytes( JSVAL_TO_STRING(argv[0])); -+ targetDevice = JS_EncodeString(cx, JSVAL_TO_STRING(argv[0])); - #ifdef JSVERBOSE - printf ("field string is %s\n",targetDevice); - #endif -@@ -939,7 +939,7 @@ - return -1; - } - if (JSVAL_IS_STRING(argv[1])) { -- targetController = JS_GetStringBytes( JSVAL_TO_STRING(argv[1])); -+ targetController = JS_EncodeString(cx, JSVAL_TO_STRING(argv[1])); - #ifdef JSVERBOSE - printf ("field string is %s\n",targetController); - #endif -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c ---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.c 2010-09-22 23:40:48.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.c 2011-07-04 20:08:03.000000000 +0400 -@@ -935,7 +935,7 @@ - printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); - return JS_FALSE; - } -- val = DOUBLE_TO_JSVAL(dp); -+ val = DOUBLE_TO_JSVAL(*dp); - - } - } -@@ -1108,7 +1108,7 @@ - - printf ("HAVE STRING HERE!\n"); - _str = JS_ValueToString(cx, id); -- asciiStr = JS_GetStringBytes(_str); -+ asciiStr = JS_EncodeString(context, _str); - printf ("we have as a parameter :%s:\n",asciiStr); - #endif - -@@ -1185,7 +1185,7 @@ - if (_tmpStr==NULL) { - _tmp_valStr = "NULL"; - } else { -- _tmp_valStr = JS_GetStringBytes(_tmpStr); -+ _tmp_valStr = JS_EncodeString(cx, _tmpStr); - } - } - -@@ -1281,7 +1281,7 @@ - #endif - - str = JS_ValueToString(cx, id); -- p = JS_GetStringBytes(str); -+ p = JS_EncodeString(cx, str); - #ifdef JSVRMLCLASSESVERBOSE - printf("\tid string %s\n ",p); - #endif -@@ -1368,12 +1368,12 @@ - char * _c; - printf ("doMFSetProperty, for object %u, vp %u\n", obj,*vp); - _str = JS_ValueToString(cx, id); -- _c = JS_GetStringBytes(_str); -+ _c = JS_EncodeString(cx, _str); - printf ("id is %s\n",_c); - - _sstr = JS_ValueToString(cx, *vp); - printf ("looking up value for %d %x object %p\n",*vp,*vp,obj); -- _cc = JS_GetStringBytes(_sstr); -+ _cc = JS_EncodeString(cx, _sstr); - printf("\tdoMFSetProperty:%d: obj = %p, id = %s, vp = %s\n",type, - obj, _c, _cc); - if (JSVAL_IS_OBJECT(*vp)) { printf ("doMFSet, vp is an OBJECT\n"); } -@@ -1397,7 +1397,7 @@ - - if (!JS_ValueToInt32(cx, *vp, &i)) { - _sstr = JS_ValueToString(cx, *vp); -- _cc = JS_GetStringBytes(_sstr); -+ _cc = JS_EncodeString(cx, _sstr); - printf ("can not convert %s to an integer in doMFAddProperty for type %d\n",_cc,type); - return JS_FALSE; - } -@@ -1408,7 +1408,7 @@ - #ifdef JSVRMLCLASSESVERBOSE - printf ("doMFSetProperty - ensure that this is a DOUBLE "); - _sstr = JS_ValueToString(cx, *vp); -- _cc = JS_GetStringBytes(_sstr); -+ _cc = JS_EncodeString(cx, _sstr); - printf ("value is %s \n",_cc); - #endif - -@@ -1420,7 +1420,7 @@ - printf( "JS_NewDouble failed for %f in simplecopyelements.\n",dd); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - - } - } -@@ -1511,7 +1511,7 @@ - nf = OBJECT_TO_JSVAL(me); - - #ifdef JSVRMLCLASSESVERBOSE -- printf ("parentField is %u \"%s\"\n", pf, JS_GetStringBytes(JSVAL_TO_STRING(pf))); -+ printf ("parentField is %u \"%s\"\n", pf, JS_EncodeString(cx, JSVAL_TO_STRING(pf))); - #endif - - if (!setSFNodeField (cx, par, pf, &nf)) { -@@ -1535,7 +1535,7 @@ - unsigned int i, j = 0; - - _str = JS_ValueToString(cx, *vp); -- _buff = JS_GetStringBytes(_str); -+ _buff = JS_EncodeString(cx, _str); - _buff_len = strlen(_buff) + 1; - - #ifdef JSVRMLCLASSESVERBOSE -@@ -1719,14 +1719,14 @@ - size_t len = 0; - - _idStr = JS_ValueToString(context, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(context, _idStr); - - /* "register" this ECMA value for routing changed flag stuff */ - setInECMATable(context, _id_c); - - if (JSVAL_IS_STRING(*vp)) { - _vpStr = JS_ValueToString(context, *vp); -- _vp_c = JS_GetStringBytes(_vpStr); -+ _vp_c = JS_EncodeString(context, _vpStr); - - len = strlen(_vp_c); - -@@ -1752,7 +1752,7 @@ - } else { - #ifdef JSVRMLCLASSESVERBOSE - _vpStr = JS_ValueToString(context, *vp); -- _vp_c = JS_GetStringBytes(_vpStr); -+ _vp_c = JS_EncodeString(cx, _vpStr); - printf("setECMANative: obj = %p, id = \"%s\", vp = %s\n", - obj, _id_c, _vp_c); - #endif -@@ -1770,9 +1770,9 @@ - JSString *_idStr, *_vpStr; - char *_id_c, *_vp_c; - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _vpStr = JS_ValueToString(cx, *vp); -- _vp_c = JS_GetStringBytes(_vpStr); -+ _vp_c = JS_EncodeString(cx, _vpStr); - printf("getAssignProperty: obj = %p, id = \"%s\", vp = %s\n", - obj, _id_c, _vp_c); - printf ("what is vp? \n"); -@@ -1803,7 +1803,7 @@ - - if (JSVAL_IS_STRING(id)) { - _str = JSVAL_TO_STRING(id); -- _id_c = JS_GetStringBytes(_str); -+ _id_c = JS_EncodeString(cx, _str); - if (!JS_ConvertValue(cx, *vp, JSTYPE_OBJECT, &newVal)) { - printf( "JS_ConvertValue failed in setAssignProperty.\n"); - return JS_FALSE; -@@ -1834,9 +1834,9 @@ - if (JSVAL_IS_DOUBLE(id)) printf ("id is an DOUBLE\n"); - if (JSVAL_IS_INT(id)) printf ("id is an INT\n"); - -- printf ("id is %s\n",JS_GetStringBytes(JS_ValueToString(cx,id))); -- printf ("initVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,initVal))); -- printf ("newVal is %s\n",JS_GetStringBytes(JS_ValueToString(cx,newVal))); -+ printf ("id is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,id))); -+ printf ("initVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,initVal))); -+ printf ("newVal is %s\n",JS_EncodeString(cx, JS_ValueToString(cx,newVal))); - - #endif - -@@ -1859,7 +1859,7 @@ - } else { - #ifdef JSVRMLCLASSESVERBOSE - _str = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_str); -+ _id_c = JS_EncodeString(cx, _str); - printf("setAssignProperty: obj = %p, id = \"%s\"\n", - obj, _id_c); - #endif -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h ---- freewrl-1.22.10/src/lib/world_script/jsVRMLClasses.h 2010-10-13 23:45:26.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRMLClasses.h 2011-07-04 20:24:53.000000000 +0400 -@@ -30,6 +30,21 @@ - #ifndef __FREEWRL_JS_VRML_CLASSES_H__ - #define __FREEWRL_JS_VRML_CLASSES_H__ - -+static inline jsval JS_NewJSVal(JSContext *cx, jsdouble d) -+{ -+ jsval ret; -+ JS_NewNumberValue(cx, d, &ret); -+ return ret; -+} -+ -+static inline jsdouble * JS_NewDouble(JSContext *cx, jsdouble d) -+{ -+ static jsdouble ret; -+ jsval rv; -+ JS_NewNumberValue(cx, d, &rv); -+ ret = JSVAL_TO_DOUBLE(rv); -+ return &ret; -+} - - #ifndef UNUSED - #define UNUSED(v) ((void) v) -@@ -80,14 +95,14 @@ - - - #define SET_JS_TICKTIME_FALSE(possibleRetVal) { jsval zimbo; \ -- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ -+ zimbo = JS_NewJSVal(cx, TickTime); \ - if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ - printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ - return possibleRetVal; \ - }} - - #define SET_JS_TICKTIME() { jsval zimbo; \ -- zimbo = DOUBLE_TO_JSVAL(JS_NewDouble(cx, TickTime)); \ -+ zimbo = JS_NewJSVal(cx, TickTime); \ - if (!JS_DefineProperty(cx,obj, "__eventInTickTime", zimbo, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_STUB2, JSPROP_PERMANENT)) { \ - printf( "JS_DefineProperty failed for \"__eventInTickTime\" at %s:%d.\n",__FILE__,__LINE__); \ - return FALSE; \ -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c ---- freewrl-1.22.10/src/lib/world_script/jsVRML_MFClasses.c 2010-09-22 23:40:48.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_MFClasses.c 2011-07-04 20:08:44.000000000 +0400 -@@ -596,7 +596,7 @@ - return; - } - -- val = DOUBLE_TO_JSVAL(dp); -+ val = DOUBLE_TO_JSVAL(*dp); - - if (!JS_SetElement(cx, obj, (jsint) i, &val)) { - printf( "JS_DefineElement failed for arg %u in VrmlMatrixSetTransform.\n", i); -@@ -1212,7 +1212,7 @@ - /* - if (JSVAL_IS_STRING(id)==TRUE) { - printf(" is a common string :%s:\n", -- JS_GetStringBytes(JS_ValueToString(cx, id))); -+ JS_EncodeString(cx, JS_ValueToString(cx, id))); - } - if (JSVAL_IS_OBJECT(id)==TRUE) { - printf (" parameter is an object\n"); -@@ -1231,7 +1231,7 @@ - _index = JSVAL_TO_INT(id); - - if (_index >= _length) { -- *vp = DOUBLE_TO_JSVAL(&zerojsdouble); -+ *vp = DOUBLE_TO_JSVAL(zerojsdouble); - if (!JS_DefineElement(cx, obj, (jsint) _index, *vp, JS_GET_PROPERTY_STUB, JS_SET_PROPERTY_CHECK, JSPROP_ENUMERATE)) { - printf( "JS_DefineElement failed in VrmlMatrixGetProperty.\n"); - return JS_FALSE; -@@ -1331,7 +1331,7 @@ - printf("MFStringAddProperty: vp = %p\n", obj); - if (JSVAL_IS_STRING(*vp)==TRUE) { - printf(" is a common string :%s:\n", -- JS_GetStringBytes(JS_ValueToString(cx, *vp))); -+ JS_EncodeString(cx, JS_ValueToString(cx, *vp))); - } - if (JSVAL_IS_OBJECT(*vp)==TRUE) { - printf (" parameter is an object\n"); -@@ -1345,7 +1345,7 @@ - printf("MFStringAddProperty: id = %p\n", obj); - if (JSVAL_IS_STRING(id)==TRUE) { - printf(" is a common string :%s:\n", -- JS_GetStringBytes(JS_ValueToString(cx, id))); -+ JS_EncodeString(cx, JS_ValueToString(cx, id))); - } - if (JSVAL_IS_OBJECT(id)==TRUE) { - printf (" parameter is an object\n"); -@@ -1494,7 +1494,7 @@ - if (JSVAL_IS_STRING(argv[i])==TRUE) { - printf (" Common String, is"); - _str = JS_ValueToString(cx, argv[i]); -- printf (JS_GetStringBytes(_str)); -+ printf (JS_EncodeString(cx, _str)); - printf (".."); - - } -diff -wbBur freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c ---- freewrl-1.22.10/src/lib/world_script/jsVRML_SFClasses.c 2010-09-25 00:22:05.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/world_script/jsVRML_SFClasses.c 2011-07-04 20:09:01.000000000 +0400 -@@ -161,7 +161,7 @@ - printf( "JS_NewDouble failed for %f in SFColorGetHSV.\n", xp[i]); - return JS_FALSE; - } -- _v = DOUBLE_TO_JSVAL(dp); -+ _v = DOUBLE_TO_JSVAL(*dp); - JS_SetElement(cx, result, (jsint)i, &_v); - } - -@@ -336,7 +336,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -346,7 +346,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -356,7 +356,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -387,13 +387,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); - break; - - } -@@ -422,18 +422,18 @@ - *rval = OBJECT_TO_JSVAL(_arrayObj); - - /* construct new double before conversion? */ -- _v = DOUBLE_TO_JSVAL(&hue); -+ _v = DOUBLE_TO_JSVAL(hue); - if (!JS_SetElement(cx, _arrayObj, 0, &_v)) { - printf( "JS_SetElement failed for hue in SFColorRGBAGetHSV.\n"); - return JS_FALSE; - } -- _v = DOUBLE_TO_JSVAL(&saturation); -+ _v = DOUBLE_TO_JSVAL(saturation); - if (!JS_SetElement(cx, _arrayObj, 1, &_v)) { - printf( "JS_SetElement failed for saturation in SFColorRGBAGetHSV.\n"); - return JS_FALSE; - } - -- _v = DOUBLE_TO_JSVAL(&value); -+ _v = DOUBLE_TO_JSVAL(value); - if (!JS_SetElement(cx, _arrayObj, 2, &_v)) { - printf( "JS_SetElement failed for value in SFColorRGBAGetHSV.\n"); - return JS_FALSE; -@@ -601,7 +601,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -611,7 +611,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -621,7 +621,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -631,7 +631,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -662,16 +662,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(_val); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(_val); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(_val); - break; - - } -@@ -983,7 +983,7 @@ - } else if (argc == 1) { - /* is this a string, or a number indicating a node? */ - myStr = JS_ValueToString(cx, argv[0]); -- cString = JS_GetStringBytes(myStr); -+ cString = JS_EncodeString(cx, myStr); - #ifdef JSVRMLCLASSESVERBOSE - printf ("SFNodeConstr, argc =1l string %s\n",cString); - #endif -@@ -1067,13 +1067,13 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, argv[0]); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - /* printf ("first string :%s:\n",_id_c); */ - - cString = STRDUP(_id_c); - - _idStr = JS_ValueToString(cx, argv[1]); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - /* printf ("second string :%s:\n",_id_c); */ - - if (sscanf (_id_c,"%p",&newHandle) != 1) { -@@ -1190,7 +1190,7 @@ - jsval rval; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #ifdef JSVRMLCLASSESVERBOSE - printf ("start of SFNodeGetProperty... id is %s\n",_id_c); -@@ -1264,10 +1264,10 @@ - - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - _valStr = JS_ValueToString(cx, *vp); -- _val_c = JS_GetStringBytes(_valStr); -+ _val_c = JS_EncodeString(cx, _valStr); - - #ifdef JSVRMLCLASSESVERBOSE - printf("SFNodeSetProperty: obj = %p, id = %s, vp = %s\n", -@@ -1904,7 +1904,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -1914,7 +1914,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -1924,7 +1924,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -1934,7 +1934,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -1969,16 +1969,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -2051,7 +2051,7 @@ - * it get created in javascript? */ - if (param_isString) { - _str = JS_ValueToString(cx, *argv); -- charString = JS_GetStringBytes(_str); -+ charString = JS_EncodeString(cx, _str); - - if (sscanf(charString, "%lf %lf", - &(pars[0]), &(pars[1])) != 2) { -@@ -2143,7 +2143,7 @@ - printf( "JS_NewDouble failed for %f in SFVec2f.\n",d); - return JS_FALSE; - } -- *rval = DOUBLE_TO_JSVAL(dp); -+ *rval = DOUBLE_TO_JSVAL(*dp); - } - - #ifdef JSVRMLCLASSESVERBOSE -@@ -2332,7 +2332,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -2342,7 +2342,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } -@@ -2373,13 +2373,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -2458,7 +2458,7 @@ - * it get created in javascript? */ - if (param_isString) { - _str = JS_ValueToString(cx, *argv); -- charString = JS_GetStringBytes(_str); -+ charString = JS_EncodeString(cx, _str); - - if (sscanf(charString, "%lf %lf %lf", - &(pars[0]), &(pars[1]), &(pars[2])) != 3) { -@@ -2580,7 +2580,7 @@ - printf( "JS_NewDouble failed for %f in SFVec3f.\n",d); - return JS_FALSE; - } -- *rval = DOUBLE_TO_JSVAL(dp); -+ *rval = DOUBLE_TO_JSVAL(*dp); - } - #ifdef JSVRMLCLASSESVERBOSE - if (retSFVec3f){ -@@ -2792,9 +2792,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -2813,7 +2813,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -2823,7 +2823,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -2833,7 +2833,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -2869,13 +2869,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -2949,7 +2949,7 @@ - * it get created in javascript? */ - if (param_isString) { - _str = JS_ValueToString(cx, *argv); -- charString = JS_GetStringBytes(_str); -+ charString = JS_EncodeString(cx, _str); - - if (sscanf(charString, "%lf %lf %lf", - &(pars[0]), &(pars[1]), &(pars[2])) != 3) { -@@ -3071,7 +3071,7 @@ - printf( "JS_NewDouble failed for %f in SFVec3d.\n",d); - return JS_FALSE; - } -- *rval = DOUBLE_TO_JSVAL(dp); -+ *rval = DOUBLE_TO_JSVAL(*dp); - } - #ifdef JSVRMLCLASSESVERBOSE - if (retSFVec3d){ -@@ -3282,9 +3282,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -3303,7 +3303,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -3313,7 +3313,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -3323,7 +3323,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -3359,13 +3359,13 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -3513,9 +3513,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -3534,7 +3534,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -3544,7 +3544,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -3554,7 +3554,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -3564,7 +3564,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -3600,16 +3600,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -@@ -3758,9 +3758,9 @@ - char *_id_c; - - _idStr = JS_ValueToString(cx, id); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - _idStr = JS_ValueToString(cx, *vp); -- _id_c = JS_GetStringBytes(_idStr); -+ _id_c = JS_EncodeString(cx, _idStr); - - #endif - -@@ -3779,7 +3779,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 1: - d = (ptr->v).c[1]; -@@ -3789,7 +3789,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 2: - d = (ptr->v).c[2]; -@@ -3799,7 +3799,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - case 3: - d = (ptr->v).c[3]; -@@ -3809,7 +3809,7 @@ - d); - return JS_FALSE; - } -- *vp = DOUBLE_TO_JSVAL(dp); -+ *vp = DOUBLE_TO_JSVAL(*dp); - break; - } - } else { -@@ -3845,16 +3845,16 @@ - if (JSVAL_IS_INT(id)) { - switch (JSVAL_TO_INT(id)) { - case 0: -- (ptr->v).c[0] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[0] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 1: -- (ptr->v).c[1] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[1] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 2: -- (ptr->v).c[2] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[2] = (float) JSVAL_TO_DOUBLE(myv); - break; - case 3: -- (ptr->v).c[3] = (float) *JSVAL_TO_DOUBLE(myv); -+ (ptr->v).c[3] = (float) JSVAL_TO_DOUBLE(myv); - break; - } - } -diff -wbBur freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c ---- freewrl-1.22.10/src/lib/x3d_parser/X3DParser.c 2010-09-22 20:54:59.000000000 +0400 -+++ freewrl-1.22.10.my/src/lib/x3d_parser/X3DParser.c 2011-07-04 01:19:07.000000000 +0400 -@@ -54,7 +54,7 @@ - #include "X3DProtoScript.h" - - #if HAVE_EXPAT_H --# include <expat.h> -+# include </usr/include/expat.h> - #endif - //#define X3DPARSERVERBOSE 1 - diff --git a/community/frogatto/PKGBUILD b/community/frogatto/PKGBUILD deleted file mode 100644 index dd0d29b6b..000000000 --- a/community/frogatto/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 78929 2012-10-27 23:44:28Z ebelanger $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Tom Wambold <tom5760@gmail.com> - -pkgname='frogatto' -arch=('i686' 'x86_64') -pkgver=1.2 -pkgrel=7 -pkgdesc="An old-school 2d platformer game, starring a certain quixotic frog" -url="http://www.frogatto.com" -license=('GPL') -depends=('glew' 'sdl' 'sdl_image' 'sdl_ttf' 'sdl_mixer' 'libpng' 'boost-libs' 'frogatto-data') -makedepends=('mesa' 'boost') -source=("frogatto-$pkgver.tar.gz::https://github.com/frogatto/frogatto/tarball/$pkgver" - frogatto - frogatto.desktop) -md5sums=('b60924f384e04728eb6e76cdd48ab8f9' - '9ed2c9ea59e95fe3c0b3ad49e58f8890' - 'e31563b04748a39292a59aaad633ff58') - -build() { - cd "$srcdir/$pkgname-$pkgname"* - - sed -i 's/ccache //g' Makefile - sed -i 's/-lprofiler//g' Makefile - sed -i 's/\.io_service/\.get_io_service/g' src/server.cpp - sed -i 's/-lboost_regex-mt/-lboost_regex/g' Makefile - sed -i 's/-lboost_system-mt/-lboost_system/g' Makefile - sed -i 's/-lboost_thread-mt/-lboost_thread/g' Makefile - sed -i 's/-lboost_iostreams-mt/-lboost_iostreams/g' Makefile - make game server -} - -package() { - cd "$srcdir/$pkgname-$pkgname"* - - install -D -m755 game $pkgdir/opt/frogatto/game - install -D -m755 server $pkgdir/opt/frogatto/server - - install -D -m644 src/LICENSE $pkgdir/usr/share/licenses/frogatto/LICENSE - - cd $srcdir - install -DT -m755 frogatto $pkgdir/usr/bin/frogatto - install -D -m644 frogatto.desktop $pkgdir/usr/share/applications/frogatto.desktop -} - -# vim:set ts=2 sw=2 et: diff --git a/community/frogatto/frogatto b/community/frogatto/frogatto deleted file mode 100644 index 0d741e0de..000000000 --- a/community/frogatto/frogatto +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -cd /opt/frogatto -exec /opt/frogatto/game $* diff --git a/community/frogatto/frogatto.desktop b/community/frogatto/frogatto.desktop deleted file mode 100644 index b0795467a..000000000 --- a/community/frogatto/frogatto.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Frogatto -GenericName=Old-school 2D platformer -Comment=Old-school 2D platformer -Exec=/usr/bin/frogatto -Terminal=false -MultipleArgs=false -Type=Application -Icon=/opt/frogatto/images/window-icon.png -Categories=Game;ArcadeGame diff --git a/community/gambas3/fix-typedef-structure.patch b/community/gambas3/fix-typedef-structure.patch deleted file mode 100644 index 8a5965a5f..000000000 --- a/community/gambas3/fix-typedef-structure.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- gambas/branches/3.2/main/lib/signal/csignal.c 2012/07/07 22:18:14 4902 -+++ gambas/branches/3.2/main/lib/signal/csignal.c 2012/07/07 22:46:07 4903 -@@ -40,10 +40,12 @@ - #define SIGPWR -1 - #endif - --#if !defined(OS_BSD) && !defined(OS_CYGWIN) -+// How could the following fix a BSD warning if it is not compiled on BSD systems? -+ -+/*#if !defined(OS_BSD) && !defined(OS_CYGWIN) - typedef - struct siginfo siginfo_t; --#endif -+#endif*/ - - // The -1 signal is used for ignored signal numbers - diff --git a/community/gambas3/poppler-0-20.patch b/community/gambas3/poppler-0-20.patch deleted file mode 100644 index 3b0e4612a..000000000 --- a/community/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/gimp-ufraw/PKGBUILD b/community/gimp-ufraw/PKGBUILD deleted file mode 100644 index c6642e188..000000000 --- a/community/gimp-ufraw/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 83473 2013-02-01 16:28:18Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Tobias Kieslich <tobias@archlinux.org> -# Contributor: Martin Sugioarto <nakal@web.de> - -pkgname=gimp-ufraw -pkgver=0.18 -pkgrel=6 -pkgdesc='Standalone or gimp plugin converter for raw files' -url='http://ufraw.sourceforge.net/' -arch=('x86_64' 'i686') -license=('GPL') -depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils' 'cfitsio' 'lensfun') -makedepends=('gimp' 'cinepaint') -optdepends=('gimp: to use the gimp import plugin for raw images' - 'cinepaint: to use the cinepaint import plugin for raw images') -install=gimp-ufraw.install -source=("http://downloads.sourceforge.net/ufraw/ufraw-$pkgver.tar.gz") -sha256sums=('24fe739c61e9e14de1900008477c8662553e93427569c1d595556d440e6b9205') - -build() { - cd "$srcdir/ufraw-$pkgver" - - ./configure --prefix=/usr \ - --enable-extras \ - --enable-mime \ - --enable-openmp \ - --with-gimp \ - --with-cinepaint \ - --enable-contrast - sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile - make -} - -package() { - cd "$srcdir/ufraw-$pkgver" - - make DESTDIR="$pkgdir" install - rm -f "$pkgdir/usr/bin/dcraw" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/gimp-ufraw/gimp-ufraw.install b/community/gimp-ufraw/gimp-ufraw.install deleted file mode 100644 index 3b232eeb7..000000000 --- a/community/gimp-ufraw/gimp-ufraw.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} - -# vim:set ts=2 sw=2 et: diff --git a/community/glabels/fix-gschema.patch b/community/glabels/fix-gschema.patch deleted file mode 100644 index 51e197096..000000000 --- a/community/glabels/fix-gschema.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in ---- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in 2012-04-09 13:58:25.256413359 +0000 -+++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in 2012-04-09 13:59:40.495830152 +0000 -@@ -2,10 +2,10 @@ - - - <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="glabels-3.0"> -- <child name="ui" schema="org.gnome.glabels.ui"/> -- <child name="locale" schema="org.gnome.glabels.locale"/> -- <child name="objects" schema="org.gnome.glabels.objects"/> -- <child name="history" schema="org.gnome.glabels.history"/> -+ <child name="ui" schema="org.gnome.glabels-3.ui"/> -+ <child name="locale" schema="org.gnome.glabels-3.locale"/> -+ <child name="objects" schema="org.gnome.glabels-3.objects"/> -+ <child name="history" schema="org.gnome.glabels-3.history"/> - </schema> - - -diff -Naur glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in ---- glabels-3.0.0.orig/data/schemas/org.gnome.glabels-3.gschema.xml.in.in 2012-04-09 13:58:25.256413359 +0000 -+++ glabels-3.0.0/data/schemas/org.gnome.glabels-3.gschema.xml.in.in 2012-04-09 13:59:32.232560783 +0000 -@@ -2,10 +2,10 @@ - - - <schema id="org.gnome.glabels-3" path="/apps/glabels-3/" gettext-domain="@GETTEXT_PACKAGE@"> -- <child name="ui" schema="org.gnome.glabels.ui"/> -- <child name="locale" schema="org.gnome.glabels.locale"/> -- <child name="objects" schema="org.gnome.glabels.objects"/> -- <child name="history" schema="org.gnome.glabels.history"/> -+ <child name="ui" schema="org.gnome.glabels-3.ui"/> -+ <child name="locale" schema="org.gnome.glabels-3.locale"/> -+ <child name="objects" schema="org.gnome.glabels-3.objects"/> -+ <child name="history" schema="org.gnome.glabels-3.history"/> - </schema> - - diff --git a/community/gmerlin-avdecoder/PKGBUILD b/community/gmerlin-avdecoder/PKGBUILD deleted file mode 100644 index 114bf9e46..000000000 --- a/community/gmerlin-avdecoder/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 82330 2013-01-15 11:35:00Z allan $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=gmerlin-avdecoder -pkgver=1.2.0 -pkgrel=2 -pkgdesc="Media decoding library" -arch=('i686' 'x86_64' 'mips64el') -url="http://gmerlin.sourceforge.net/avdec_frame.html" -license=('GPL') -depends=('gmerlin' 'openjpeg' 'flac' 'smbclient' 'libmad' 'libmpcdec' 'speex' - 'libdca' 'libmpeg2' 'a52dec') -source=(http://downloads.sourceforge.net/sourceforge/gmerlin/gmerlin-avdecoder-$pkgver.tar.gz) -md5sums=('37b19266b098d9d05bb05ebef138ffbd') - -build() { - cd "$srcdir/$pkgname-$pkgver" - rm -f cpuinfo.sh - ./configure --prefix=/usr --without-doxygen - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community/gmerlin/libpng.patch b/community/gmerlin/libpng.patch deleted file mode 100644 index c01105e63..000000000 --- a/community/gmerlin/libpng.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -wbBur gmerlin-1.0.0/plugins/png/ir_png.c gmerlin-1.0.0.my/plugins/png/ir_png.c ---- gmerlin-1.0.0/plugins/png/ir_png.c 2011-01-07 18:37:06.000000000 +0300 -+++ gmerlin-1.0.0.my/plugins/png/ir_png.c 2011-11-07 14:46:25.000000000 +0400 -@@ -127,13 +127,8 @@ - bits = 16; - } - if(bit_depth < 8) --#if BG_MAKE_BUILD(PNG_LIBPNG_VER_MAJOR, PNG_LIBPNG_VER_MINOR, PNG_LIBPNG_VER_RELEASE) < BG_MAKE_BUILD(1,2,9) -- png_set_gray_1_2_4_to_8(png->png_ptr); --#else - png_set_expand_gray_1_2_4_to_8(png->png_ptr); --#endif - -- png_set_gray_1_2_4_to_8(png->png_ptr); - if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS)) - { - png_set_tRNS_to_alpha(png->png_ptr); diff --git a/community/gmpc/PKGBUILD b/community/gmpc/PKGBUILD deleted file mode 100644 index 623600656..000000000 --- a/community/gmpc/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 83148 2013-01-27 16:16:24Z pierre $ -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Tobias Kieslich <tobias@archlinux.org> - -pkgname=gmpc -pkgver=11.8.16 -pkgrel=1 -pkgdesc="A GTK2 client for MPD" -arch=('i686' 'x86_64') -url="http://gmpclient.org/home" -license=('GPL') -depends=('libunique' 'libmpd' 'libsoup' 'sqlite' 'hicolor-icon-theme' 'xdg-utils') -makedepends=('gob2' 'intltool' 'vala') -options=('!libtool') -install=gmpc.install -source=(http://download.sarine.nl/Programs/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.gz) -md5sums=('223aeb000e41697d8fdf54ccedee89d5') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's|GNOME;AudioVideo;|GTK;AudioVideo;Player;|' data/gmpc.desktop.in - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/gmpc/gmpc.install b/community/gmpc/gmpc.install deleted file mode 100644 index e70c054ec..000000000 --- a/community/gmpc/gmpc.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/gnome-settings-daemon-updates/screensaver.patch b/community/gnome-settings-daemon-updates/screensaver.patch deleted file mode 100644 index bbcfe3430..000000000 --- a/community/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/gnome-settings-daemon-updates/systemd-fallback.patch b/community/gnome-settings-daemon-updates/systemd-fallback.patch deleted file mode 100644 index ffe953c63..000000000 --- a/community/gnome-settings-daemon-updates/systemd-fallback.patch +++ /dev/null @@ -1,154 +0,0 @@ -commit b9ded09387f0b99ece97baee18595eb9e86a5b9b -Author: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -Date: Mon Mar 12 01:52:54 2012 +0100 - - Fallback to CK if systemd is not available - - Be nice to distributions where systemd is optional. This will select - the code path at runtime depending on whether the system was booted - using systemd. - -diff --git a/configure.ac b/configure.ac -index 3b4789f..d522852 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -299,7 +299,7 @@ AC_ARG_ENABLE([systemd], - [with_systemd=$enableval], - [with_systemd=no]) - if test "$with_systemd" = "yes" ; then -- PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login]) -+ PKG_CHECK_MODULES(SYSTEMD, [libsystemd-daemon libsystemd-login]) - AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) - SESSION_TRACKING=systemd - else -diff --git a/gnome-settings-daemon/gnome-settings-session.c b/gnome-settings-daemon/gnome-settings-session.c -index 5786300..83fe21e 100644 ---- a/gnome-settings-daemon/gnome-settings-session.c -+++ b/gnome-settings-daemon/gnome-settings-session.c -@@ -30,6 +30,7 @@ - #include "gnome-settings-session.h" - - #ifdef HAVE_SYSTEMD -+#include <systemd/sd-daemon.h> - #include <systemd/sd-login.h> - - typedef struct -@@ -130,10 +131,9 @@ struct GnomeSettingsSessionPrivate - { - #ifdef HAVE_SYSTEMD - GSource *sd_source; --#else -+#endif - GDBusProxy *proxy_session; - GCancellable *cancellable; --#endif - gchar *session_id; - GnomeSettingsSessionState state; - }; -@@ -237,7 +237,7 @@ sessions_changed (gpointer user_data) - return TRUE; - } - --#else /* HAVE_SYSTEMD */ -+#endif /* HAVE_SYSTEMD */ - - static void - gnome_settings_session_proxy_signal_cb (GDBusProxy *proxy, -@@ -371,22 +371,25 @@ got_manager_proxy_cb (GObject *source_object, GAsyncResult *res, gpointer user_d - g_object_unref (proxy_manager); - } - --#endif /* HAVE_SYSTEMD */ -- - static void - gnome_settings_session_init (GnomeSettingsSession *session) - { - session->priv = GNOME_SETTINGS_SESSION_GET_PRIVATE (session); - - #ifdef HAVE_SYSTEMD -- sd_pid_get_session (getpid(), &session->priv->session_id); -+ session->priv->sd_source = NULL; -+ -+ if (sd_booted () > 0) { -+ sd_pid_get_session (getpid(), &session->priv->session_id); - -- session->priv->sd_source = sd_source_new (); -- g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); -- g_source_attach (session->priv->sd_source, NULL); -+ session->priv->sd_source = sd_source_new (); -+ g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); -+ g_source_attach (session->priv->sd_source, NULL); - -- sessions_changed (session); --#else -+ sessions_changed (session); -+ return; -+ } -+#endif - session->priv->cancellable = g_cancellable_new (); - - /* connect to ConsoleKit */ -@@ -399,7 +402,6 @@ gnome_settings_session_init (GnomeSettingsSession *session) - session->priv->cancellable, - got_manager_proxy_cb, - session); --#endif - } - - static void -@@ -415,15 +417,17 @@ gnome_settings_session_finalize (GObject *object) - if (session->priv->sd_source != NULL) { - g_source_destroy (session->priv->sd_source); - g_source_unref (session->priv->sd_source); -+ goto out; - } --#else -+#endif -+ - g_cancellable_cancel (session->priv->cancellable); - - if (session->priv->proxy_session != NULL) - g_object_unref (session->priv->proxy_session); - g_object_unref (session->priv->cancellable); --#endif - -+out: - G_OBJECT_CLASS (gnome_settings_session_parent_class)->finalize (object); - } - -diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c -index 8db04e5..9883d76 100644 ---- a/plugins/power/gsd-power-manager.c -+++ b/plugins/power/gsd-power-manager.c -@@ -2031,7 +2031,7 @@ systemd_stop (void) - g_object_unref (bus); - } - --#else -+#endif - - static void - consolekit_stop_cb (GObject *source_object, -@@ -2081,7 +2081,6 @@ consolekit_stop (void) - consolekit_stop_cb, NULL); - g_object_unref (proxy); - } --#endif - - static void - upower_sleep_cb (GObject *source_object, -@@ -2135,10 +2134,11 @@ do_power_action_type (GsdPowerManager *manager, - * hibernate is not available and is marginally better - * than just powering down the computer mid-write */ - #ifdef HAVE_SYSTEMD -- systemd_stop (); --#else -- consolekit_stop (); -+ if (sd_booted () > 0) -+ systemd_stop (); -+ else - #endif -+ consolekit_stop (); - break; - case GSD_POWER_ACTION_BLANK: - ret = gnome_rr_screen_set_dpms_mode (manager->priv->x11_screen, diff --git a/community/gpg-crypter/gpg-crypter.desktop b/community/gpg-crypter/gpg-crypter.desktop deleted file mode 100644 index 446efc414..000000000 --- a/community/gpg-crypter/gpg-crypter.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Name=GPG Crypter -Comment=GPG Crypter utility -Exec=gpg-crypter -Terminal=false -Type=Application -Icon=gpg-crypter -Categories=Utility; diff --git a/community/gpsdrive/gpsd-2.96.patch b/community/gpsdrive/gpsd-2.96.patch deleted file mode 100644 index bc6c7475f..000000000 --- a/community/gpsdrive/gpsd-2.96.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -wbBur gpsdrive-2.11/src/gps_handler.c gpsdrive-2.11.my/src/gps_handler.c ---- gpsdrive-2.11/src/gps_handler.c 2010-06-24 19:53:32.000000000 +0000 -+++ gpsdrive-2.11.my/src/gps_handler.c 2011-04-18 13:21:33.000000000 +0000 -@@ -264,7 +264,8 @@ - #define GPS_TIMER 500 - - static gint gps_timeout_source = 0; --static struct gps_data_t *gpsdata; -+static struct gps_data_t __gd; -+static struct gps_data_t *gpsdata = &__gd; - - /* SYMBOLS USED IN LIBGPS: - * -@@ -410,9 +411,10 @@ - */ - gps_query (gpsdata, "oys\n"); - #else -- if (gps_waiting(gpsdata)) -+ if (gps_waiting(gpsdata, 1000000)) - { -- gps_poll (gpsdata); -+ gps_read (gpsdata); -+ gps_hook_cb(gpsdata, NULL); - } - #endif - -@@ -447,7 +449,7 @@ - } - - /* try to open connection */ -- gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port); -+ gpsdata = gps_open (local_config.gpsd_server, local_config.gpsd_port, gpsdata) ? NULL : &__gd; - if (!gpsdata) - { - g_print ("Can't connect to gps daemon on %s:%s, disabling GPS support!\n", -@@ -466,7 +468,7 @@ - gps_sats = g_new (gps_satellite_struct, MAXCHANNELS); - - /* set hook function to handle gps data */ -- gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); -+// gps_set_raw_hook (gpsdata, (gpointer) gps_hook_cb); - - #ifndef LIBGPS_OLD - /* enable watch mode to get data stream from gpsd */ diff --git a/community/grafx2/grafx2.desktop b/community/grafx2/grafx2.desktop deleted file mode 100644 index d58bc5ed3..000000000 --- a/community/grafx2/grafx2.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -GenericName=GrafX2 -Name=GrafX2 -Comment=Pixelart-oriented painting program -Exec=grafx2 %U -TryExec=grafx2 -Icon=grafx2 -Terminal=false -Type=Application -Categories=Graphics;2DGraphics;RasterGraphics -MimeType=image/bmp;image/gif;image/png;image/x-tga;image/tiff diff --git a/community/gtranslator/disable-dockbar.patch b/community/gtranslator/disable-dockbar.patch deleted file mode 100644 index aa8de6c60..000000000 --- a/community/gtranslator/disable-dockbar.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur gtranslator-2.91.5.orig/src/gtr-tab.c gtranslator-2.91.5/src/gtr-tab.c ---- gtranslator-2.91.5.orig/src/gtr-tab.c 2012-06-07 13:48:56.000000000 +0200 -+++ gtranslator-2.91.5/src/gtr-tab.c 2012-11-05 19:18:01.899014670 +0100 -@@ -149,9 +149,6 @@ - g_return_if_fail (GTR_IS_TAB (tab)); - g_return_if_fail (filename != NULL); - -- gdl_dock_layout_save_layout (tab->priv->layout_manager, name); -- if (!gdl_dock_layout_save_to_file (tab->priv->layout_manager, filename)) -- g_warning ("Saving dock layout to '%s' failed!", filename); - } - - static void -@@ -160,23 +157,6 @@ - const gchar *name) - { - g_return_if_fail (GTR_IS_TAB (tab)); -- -- if (!layout_filename || -- !gdl_dock_layout_load_from_file (tab->priv->layout_manager, -- layout_filename)) -- { -- gchar *path; -- -- path = gtr_dirs_get_ui_file ("layout.xml"); -- -- if (!gdl_dock_layout_load_from_file (tab->priv->layout_manager, -- path)) -- g_warning ("Loading layout from '%s' failed!!", path); -- g_free (path); -- } -- -- if (!gdl_dock_layout_load_layout (tab->priv->layout_manager, name)) -- g_warning ("Loading layout failed!!"); - } - - static void -@@ -702,7 +682,6 @@ - GtkWidget *vertical_box; - GtkWidget *msgid_label; - GtkWidget *scroll; -- GtkWidget *dockbar; - GtrTabPrivate *priv; - - tab->priv = GTR_TAB_GET_PRIVATE (tab); -@@ -727,22 +706,6 @@ - gtk_widget_show (priv->dock); - gtk_box_pack_end (GTK_BOX (hbox), priv->dock, TRUE, TRUE, 0); - -- dockbar = gdl_dock_bar_new (GDL_DOCK (priv->dock)); -- gtk_widget_show (dockbar); -- gtk_box_pack_start (GTK_BOX (hbox), dockbar, FALSE, FALSE, 0); -- -- priv->layout_manager = gdl_dock_layout_new (GDL_DOCK (priv->dock)); -- g_signal_connect (priv->layout_manager->master, -- "layout-changed", -- G_CALLBACK (on_layout_changed), -- tab); -- -- g_settings_bind (priv->ui_settings, -- GTR_SETTINGS_PANEL_SWITCHER_STYLE, -- priv->layout_manager->master, -- "switcher-style", -- G_SETTINGS_BIND_GET | G_SETTINGS_BIND_SET); -- - /* Message table */ - priv->message_table = gtr_message_table_new (GTK_WIDGET (tab)); - gtk_widget_show (priv->message_table); -@@ -904,7 +867,6 @@ - g_clear_object (&priv->files_settings); - g_clear_object (&priv->editor_settings); - g_clear_object (&priv->state_settings); -- g_clear_object (&priv->layout_manager); - - G_OBJECT_CLASS (gtr_tab_parent_class)->dispose (object); - } diff --git a/community/guake/0001-Retrieve-port-as-int.2.patch b/community/guake/0001-Retrieve-port-as-int.2.patch deleted file mode 100644 index 3fde26dc2..000000000 --- a/community/guake/0001-Retrieve-port-as-int.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -From efcd1d8d3cdc354f46bc2485e7e3394f8578b7ba Mon Sep 17 00:00:00 2001 -From: pingou <pingou@pingoured.fr> -Date: Mon, 23 Aug 2010 09:54:35 +0200 -Subject: [PATCH] Retrieve port as int - ---- - src/guake.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/guake.py b/src/guake.py -index 6214fb2..40e688f 100644 ---- a/src/guake.py -+++ b/src/guake.py -@@ -1099,7 +1099,7 @@ class Guake(SimpleGladeApp): - ssl_port = port - else: - ssl_host = self.client.get_string('/system/proxy/secure_host') -- ssl_port = self.client.get_string('/system/proxy/secure_port') -+ ssl_port = self.client.get_int('/system/proxy/secure_port') - - if self.client.get_bool(proxy + 'use_authentication'): - auth_user = self.client.get_string( --- -1.7.2.1 - diff --git a/community/guake/guake-fix-pref.desktop.patch b/community/guake/guake-fix-pref.desktop.patch deleted file mode 100644 index 6bd256d28..000000000 --- a/community/guake/guake-fix-pref.desktop.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- guake-0.4.2-orig/data/guake-prefs.desktop.in 2009-12-01 12:51:08.000000000 +0100 -+++ guake-0.4.2/data/guake-prefs.desktop.in 2012-05-21 17:07:05.982022360 +0200 -@@ -2,7 +2,7 @@ - Encoding=UTF-8 - Name=Guake Preferences - Name[pt_BR]=Preferências do Guake --Comment=Comment=Configure your Guake sessions -+Comment=Configure your Guake sessions - Comment[pt_BR]=Configurações do terminal Guake - TryExec=guake-prefs - Exec=guake-prefs diff --git a/community/guake/guake-glib2.32.patch b/community/guake/guake-glib2.32.patch deleted file mode 100644 index a370e123c..000000000 --- a/community/guake/guake-glib2.32.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 0353da88e550031b4694a4168bd6d489f873d68a -Author: max ulidtko <ulidtko@gmail.com> -Date: Fri Mar 2 07:51:38 2012 +0200 - - globalhotkeys build fix for glib 2.31 - - apply patch from #425 - -diff --git a/src/globalhotkeys/keybinder.h b/src/globalhotkeys/keybinder.h -index 00e532d..69a50c0 100644 ---- a/src/globalhotkeys/keybinder.h -+++ b/src/globalhotkeys/keybinder.h -@@ -2,7 +2,7 @@ - #ifndef __KEY_BINDER_H__ - #define __KEY_BINDER_H__ - --#include <glib/gtypes.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/community/gwibber/lp_959068.patch b/community/gwibber/lp_959068.patch deleted file mode 100644 index 66b288ba7..000000000 --- a/community/gwibber/lp_959068.patch +++ /dev/null @@ -1,27 +0,0 @@ -=== modified file 'libgwibber/streams.vala' ---- old/libgwibber/streams.vala 2012-03-19 13:35:30 +0000 -+++ new/libgwibber/streams.vala 2012-04-04 20:53:49 +0000 -@@ -213,13 +213,21 @@ - model = create_model (); - } - model.row_removed.connect((_m, _i) => { -+ var to_remove = new GLib.List <string> (); - foreach (var v in seen.entries) - { - if (v.value == _i) - { -- seen.unset(v.key); -+ /* defer calling unset until after we are done iterating -+ * the HashMap, it will resize making the iterator invalid -+ * This is fixed in the 0.7 series of libgee -+ * https://bugzilla.gnome.org/show_bug.cgi?id=671327 -+ */ -+ to_remove.prepend (v.key); - } - } -+ foreach (var v in to_remove) -+ seen.unset(v); - }); - Idle.add(() => { - refresh_model_async.begin (); - diff --git a/community/hacburn/PKGBUILD b/community/hacburn/PKGBUILD deleted file mode 100644 index 42d7a1eb0..000000000 --- a/community/hacburn/PKGBUILD +++ /dev/null @@ -1,21 +0,0 @@ -# $Id: PKGBUILD 55602 2011-09-14 23:25:07Z dreisner $ -# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org -pkgname=hacburn -pkgver=0.3.5 -pkgrel=4 -pkgdesc="HacBurn is a script written in perl to aid in writing CDs. It is a graphical interface (using gtk+) to cdrtools, mpg321 and ogg123." -arch=('i686' 'x86_64' 'mips64el') -url="http://hacburn.sourceforge.net/" -license=('GPL') -depends=('gtk2-perl' 'glib-perl' 'cdrkit' 'mpg321' 'vorbis-tools' 'gtk2' 'xorg-server' 'perl' 'cddb_get' 'lame') -conflicts=('hacburn-cvs') -source=(http://downloads.sourceforge.net/sourceforge/hacburn/HacBurn-$pkgver.tar.bz2) -md5sums=('1e4b3e4b49de58259a446b7752f59f22') - -build() { - install -D -m755 $startdir/src/HacBurn-$pkgver/hacburn \ - $startdir/pkg/usr/bin/hacburn - mkdir -p $startdir/pkg/usr/share/pixmaps - cp $startdir/src/HacBurn-$pkgver/hacburn.png \ - $startdir/pkg/usr/share/pixmaps/hacburn.png -} diff --git a/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch b/community/haddock/0001-fix-incorrect-types-in-documentation-haddock.patch deleted file mode 100644 index 2e687db21..000000000 --- a/community/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/handbrake/PKGBUILD b/community/handbrake/PKGBUILD deleted file mode 100644 index b70180a97..000000000 --- a/community/handbrake/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 74053 2012-07-18 17:33:26Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> -# Contributor: Sebastien Piccand <sebcactus gmail com> - -pkgname=('handbrake' 'handbrake-cli') -pkgver=0.9.8 -pkgrel=1 -arch=('i686' 'x86_64') -url="http://handbrake.fr/" -license=('GPL') -makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify' - 'gstreamer0.10-base' 'gtk2' 'dbus-glib' 'fribidi') -source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2) -sha256sums=('dba75a9ff772e419c01d75532c1bf0d7253e73d7ead184eee755cd4c133dc798') - -build() { - cd "$srcdir/HandBrake-$pkgver" - - # Use Python 2 - sed -i 's/python /python2 /' gtk/src/Makefile.am - - ./configure --prefix=/usr --force --disable-gtk-update-checks - cd build - make -} - -package_handbrake() { - pkgdesc="Multithreaded video transcoder" - depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify' 'dbus-glib' - 'fribidi' 'gtk2' 'desktop-file-utils' 'hicolor-icon-theme') - install=$pkgname.install - - cd "$srcdir/HandBrake-$pkgver/build" - - make DESTDIR="$pkgdir" install - rm "$pkgdir/usr/bin/HandBrakeCLI" -} - -package_handbrake-cli() { - pkgdesc="Multithreaded video transcoder (CLI)" - depends=('bzip2' 'gcc-libs' 'zlib' 'fribidi') - - cd "$srcdir/HandBrake-$pkgver/build" - install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/handbrake/handbrake.install b/community/handbrake/handbrake.install deleted file mode 100644 index 87c29e4db..000000000 --- a/community/handbrake/handbrake.install +++ /dev/null @@ -1,14 +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 -} - -# vim:set ts=2 sw=2 et: diff --git a/community/hardinfo/PKGBUILD b/community/hardinfo/PKGBUILD deleted file mode 100644 index 432b9bda3..000000000 --- a/community/hardinfo/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 70023 2012-04-28 09:24:14Z allan $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=hardinfo -pkgver=0.5.1 -pkgrel=5 -pkgdesc="A system information and benchmark tool." -arch=('i686' 'x86_64') -url="http://hardinfo.berlios.de/wiki/index.php/Main_Page" -license=('GPL2') -depends=('gtk2' 'libsoup') -options=('!emptydirs') -source=(http://download.berlios.de/hardinfo/${pkgname}-${pkgver}.tar.bz2 \ - fixsensors.patch hardinfo.distro) -sha1sums=('983f0445aa60e02156bc5a5eaedeffb30b8e4d64' - 'd2151dce76dca238102937d0e15541f172bca530' - '4c31cbbfbdeb48593641ff600c8d4fb7bda2b01c') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 < ../fixsensors.patch - sed -i 's|/usr/lib64|/usr/lib|' configure - ./configure --prefix=/usr - sed -i 's|lib64|lib|' binreloc.c - sed -i 's|{ DB_PREFIX "debian_version", "deb" },|{ DB_PREFIX "hardinfo.distro", "arch" },{ DB_PREFIX "debian_version", "deb" },|' computer.h - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -D -m644 ../hardinfo.distro "${pkgdir}/etc/hardinfo.distro" -} diff --git a/community/hardinfo/fixsensors.patch b/community/hardinfo/fixsensors.patch deleted file mode 100644 index 812c29458..000000000 --- a/community/hardinfo/fixsensors.patch +++ /dev/null @@ -1,13 +0,0 @@ - diff -upNr hardinfo-0.4.2.2.orign/util.c hardinfo-0.4.2.2/util.c ---- hardinfo-0.4.2.2.orign/util.c 2007-07-20 16:45:08.000000000 +0200 -+++ hardinfo-0.4.2.2/util.c 2007-07-26 10:15:32.000000000 +0200 -@@ -996,7 +996,8 @@ gchar *h_strdup_cprintf(const gchar * fo - if (source) { - retn = g_strconcat(source, buffer, NULL); - g_free(buffer); -- g_free(source); -+ if(strlen(source)) -+ g_free(source); - } else { - retn = buffer; - } diff --git a/community/hardinfo/hardinfo.distro b/community/hardinfo/hardinfo.distro deleted file mode 100644 index 850183eeb..000000000 --- a/community/hardinfo/hardinfo.distro +++ /dev/null @@ -1 +0,0 @@ -Arch Linux diff --git a/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch b/community/haskell-tar/0001-update-changed-time-code-for-ghc-7.6.1.patch deleted file mode 100644 index b8c2264bc..000000000 --- a/community/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/haveged/haveged b/community/haveged/haveged deleted file mode 100644 index c0e13b40d..000000000 --- a/community/haveged/haveged +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash -## -# chkconfig: 2345 75 25 -# description: havege entropy daemon -# -# source function library -. /etc/rc.conf -. /etc/rc.d/functions - -RETVAL=0 -prog="haveged" - -case "$1" in -start) - stat_busy $"Starting $prog" - /usr/sbin/$prog -w 1024 -v 1 - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $prog - stat_done - fi - ;; - -stop) - stat_busy $"Stopping $prog" - kill `cat /var/run/$prog.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $prog - stat_done - rm -f /var/lock/$prog - fi - ;; - -restart) - $0 stop - $0 start - ;; - -*) - echo "usage: $prog [start|stop|restart]" -esac diff --git a/community/haveged/haveged.service b/community/haveged/haveged.service deleted file mode 100644 index 6803a0dec..000000000 --- a/community/haveged/haveged.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Entropy Harvesting Daemon -Documentation=man:haveged(8) - -[Service] -Type=forking -ExecStart=/usr/sbin/haveged -w 1024 -v 1 -PIDFile=/var/run/haveged.pid - -[Install] -WantedBy=multi-user.target diff --git a/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch b/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch deleted file mode 100644 index 8e7cd9a97..000000000 --- a/community/hostapd/hostap_allow-linking-with-libnl-3.2.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: [RFC] hostap: Allow linking with libnl-3. -Date: Tue, 15 Nov 2011 14:30:04 -0000 -From: Ben Greear <greearb@candelatech.com> - -I needed this patch to compile against the latest -libnl code. I added this to my config file: - -CONFIG_LIBNL32=y - -Signed-hostap: Ben Greear <greearb@candelatech.com> -rediffed against 0.7.3 by Stefan Lippers-Hollmann <s.l-h@gmx.de> - ---- -:100644 100644 5caeec5... 0cc81f9... M src/drivers/drivers.mak - src/drivers/drivers.mak | 21 ++++++++++++++------- - 2 files changed, 29 insertions(+), 14 deletions(-) - ---- a/src/drivers/drivers.mak -+++ b/src/drivers/drivers.mak -@@ -31,11 +31,18 @@ NEED_SME=y - NEED_AP_MLME=y - NEED_NETLINK=y - NEED_LINUX_IOCTL=y --DRV_LIBS += -lnl -+ifdef CONFIG_LIBNL32 -+ DRV_LIBS += -lnl-3 -+ DRV_LIBS += -lnl-genl-3 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -I/usr/include/libnl3/ -+else -+ DRV_LIBS += -lnl - --ifdef CONFIG_LIBNL20 --DRV_LIBS += -lnl-genl --DRV_CFLAGS += -DCONFIG_LIBNL20 -+ ifdef CONFIG_LIBNL20 -+ DRV_LIBS += -lnl-genl -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -+ endif - endif - endif - diff --git a/community/htmldoc/PKGBUILD b/community/htmldoc/PKGBUILD deleted file mode 100644 index a83e59bb8..000000000 --- a/community/htmldoc/PKGBUILD +++ /dev/null @@ -1,67 +0,0 @@ -# $Id: PKGBUILD 64143 2012-02-09 02:03:02Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: tobias <tobias@archlinux.org> -# Contributor: Simon Rutishauser <simon.rutishauser@gmx.ch> - -pkgname=htmldoc -pkgver=1.9.0svn1700 -pkgrel=1 -pkgdesc="Produce PDF or Postscript from HTML documents including TOCs and Indices" -arch=(i686 x86_64 'mips64el') -url="http://www.htmldoc.org" -license=('GPL') -depends=('libjpeg' 'libpng' 'openssl' 'fltk' 'gcc' 'libxft' 'libxpm') -makedepends=('subversion') -__svntrunk=http://svn.easysw.com/public/htmldoc/trunk/ -__svnmod=htmldoc -source=() -md5sums=() -md5sums=() -md5sums=() - -build() { - cd "$srcdir" - - if [ -d $__svnmod/.svn ]; then - (cd $__svnmod && svn up) - else - svn co $__svntrunk --config-dir ./ $__svnmod - fi - - msg "SVN checkout done or server timeout" - msg "Starting make..." - - rm -rf "$srcdir/$__svnmod-build" - cp -r "$srcdir/$__svnmod" "$srcdir/$__svnmod-build" - cd "$srcdir/$__svnmod-build" - - # - # BUILD - # - [ -x configure ] || autoconf - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$__svnmod-build" - - make install \ - prefix=${pkgdir}/usr \ - bindir=$pkgdir/usr/bin \ - datadir=$pkgdir/usr/share \ - datarootdir=$pkgdir/usr/share \ - docdir=$pkgdir/usr/share/doc/htmldoc \ - exec_prefix=$pkgdir/usr \ - mandir=$pkgdir/usr/share/man \ - prefix=$pkgdir/usr \ - sysconfdir=$pkgdir/etc - - # fix freedesktop stuff - install -Dm 644 desktop/htmldoc-128.png \ - ${pkgdir}/usr/share/pixmaps/htmldoc.png - echo "MimeType=application/vnd.htmldoc-book;" >> desktop/htmldoc.desktop - sed -i 's|X-Red-Hat.*$||' desktop/htmldoc.desktop - install -Dm 644 desktop/htmldoc.desktop \ - ${pkgdir}/usr/share/applications/htmldoc.desktop -} diff --git a/community/ibus-pinyin/ibus-pinyin.install b/community/ibus-pinyin/ibus-pinyin.install deleted file mode 100644 index 3771d9bec..000000000 --- a/community/ibus-pinyin/ibus-pinyin.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - echo "Creating INDEX. Please wait..." - cd usr/share/ibus-pinyin/db - echo "Creating index for android.db..." - sqlite3 android.db '.read create_index.sql' - echo "Creating index for open-phrase.db..." - sqlite3 open-phrase.db '.read create_index.sql' - echo "Done." -} - -post_upgrade() { - post_install $1 -} diff --git a/community/ibus-table/PKGBUILD b/community/ibus-table/PKGBUILD deleted file mode 100644 index 404d48e59..000000000 --- a/community/ibus-table/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 79721 2012-11-11 15:10:35Z fyan $ -# Maintainer: Felix Yan <felixonmars@gmail.com> -# Contributor: coderoar <coderoar@gmail.com> -# Contributor: leemars <leemars@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=ibus-table -pkgver=1.4.99.20121112 -pkgrel=1 -pkgdesc='The IM Engine framework for table-based input methods, such as ZhengMa, WuBi, ErBi, CangJie and so on.' -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/ibus/" -license=('LGPL') -depends=('python2-pyenchant' 'ibus' 'aspell-en') -source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # python2 fix - find -type f -exec sed -i -e 's_exec python_exec python2_' -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' {} \; - - PYTHON=/usr/bin/python2 ./configure \ - --prefix=/usr \ - --libexecdir=/usr/lib/ibus - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" install -} -md5sums=('85c3a57bcbb052d3222c5b6d07e0e565') diff --git a/community/iksemel/PKGBUILD b/community/iksemel/PKGBUILD deleted file mode 100644 index eab6eb7bf..000000000 --- a/community/iksemel/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 55571 2011-09-14 10:35:20Z andrea $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Guillermo Vaya driadan@willinux.net - -pkgname=iksemel -pkgver=1.4 -pkgrel=2 -pkgdesc="XML parser library for Jabber applications in ANSI C" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/iksemel/" -license=('LGPL') -depends=('glibc') -install=iksemel.install -source=("http://iksemel.googlecode.com/files/${pkgname}-$pkgver.tar.gz") -md5sums=('532e77181694f87ad5eb59435d11c1ca') -options=('!libtool') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - ./configure --prefix=/usr \ - --infodir=/usr/share/info - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - make DESTDIR="${pkgdir}" install - mv "${pkgdir}"/usr/share/info/$pkgname "${pkgdir}"/usr/share/info/$pkgname.info - rm -rf "${pkgdir}"/usr/share/info/dir -} diff --git a/community/iksemel/iksemel.install b/community/iksemel/iksemel.install deleted file mode 100644 index 1cd1dbf31..000000000 --- a/community/iksemel/iksemel.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(iksemel.info.gz) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file $infodir/dir 2> /dev/null - done -} diff --git a/community/iperf/iperf.conf b/community/iperf/iperf.conf deleted file mode 100644 index 0685ff011..000000000 --- a/community/iperf/iperf.conf +++ /dev/null @@ -1,7 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -# daemon pid file -#PIDFILE='/run/iperf.pid' - -# daemon options. treated as an array. -#DAEMON_OPTS='--port 5001' diff --git a/community/iperf/iperf.rc b/community/iperf/iperf.rc deleted file mode 100644 index 617b666ad..000000000 --- a/community/iperf/iperf.rc +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -# You can use this script to run iperf as tcp and udp. -# Copy and rename this script to /etc/rc.d/iperf-udp and copy config file to -# /etc/conf.d/iperf-udp and add -u to daemon options - -. /etc/rc.conf -. /etc/rc.d/functions -[[ -r /etc/conf.d/${0##*/} ]] && . /etc/conf.d/${0##*/} - -DAEMON=${DAEMON:-/usr/bin/iperf} -PIDFILE=${PIDFILE:-/run/${0##*/}.pid} -DAEMON_OPTS="--server $DAEMON_OPTS" - -# check pid -[[ -r "$PIDFILE" ]] && - read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID &>/dev/null || unset PID - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ -z $PID ]] && - { $DAEMON $DAEMON_OPTS </dev/null &>/dev/null & } && - echo "$!" > "$PIDFILE" && - disown %% && - add_daemon ${0##*/} && - stat_done && - exit 0 - stat_fail - ;; - stop) - stat_busy "Stopping ${0##*/} daemon" - [[ -n $PID ]] && kill $PID &> /dev/null && - rm_daemon ${0##*/} && - rm -f "$PIDFILE" && - 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 noet: diff --git a/community/iperf/iperf.service b/community/iperf/iperf.service deleted file mode 100644 index 1bdcf86e9..000000000 --- a/community/iperf/iperf.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Iperf Server - -[Service] -ExecStart=/usr/bin/iperf -s - -[Install] -WantedBy=multi-user.target diff --git a/community/ipset/ipset.conf b/community/ipset/ipset.conf deleted file mode 100644 index d5d3cb699..000000000 --- a/community/ipset/ipset.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file used to load/save configuration. -CONFIG_FILE='/etc/ipset.conf' - -# Save configuration on stop/restart. -#SAVE_ON_STOP=yes - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipset/ipset.rc b/community/ipset/ipset.rc deleted file mode 100644 index 517eff1ea..000000000 --- a/community/ipset/ipset.rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -case "$1" in - start) - stat_busy 'Loading IP sets' - ipset restore < "$CONFIG_FILE" && add_daemon ${0##*/} && stat_done || stat_die - ;; - stop) - [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save - stat_busy 'Clearing IP sets' - ipset destroy && - rm_daemon ${0##*/} && stat_done || stat_die - ;; - restart) - $0 stop - $0 start - ;; - save) - stat_busy 'Saving IP sets' - ipset save > "$CONFIG_FILE" && - stat_done || stat_die - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|save}" >&2 - exit 1 - ;; -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.conf b/community/ipvsadm/ipvsadm.conf deleted file mode 100644 index b9a98a36e..000000000 --- a/community/ipvsadm/ipvsadm.conf +++ /dev/null @@ -1,7 +0,0 @@ -# Configuration file used to load/save configuration. -CONFIG_FILE='/etc/ipvsadm.conf' - -# Save configuration on stop/restart. -#SAVE_ON_STOP=yes - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/ipvsadm/ipvsadm.rc b/community/ipvsadm/ipvsadm.rc deleted file mode 100644 index b810dcd62..000000000 --- a/community/ipvsadm/ipvsadm.rc +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -case "$1" in - start) - stat_busy 'Loading IPVS table' - ipvsadm-restore < "$CONFIG_FILE" && - add_daemon ${0##*/} && stat_done || stat_die - ;; - stop) - [[ $SAVE_ON_STOP =~ [yY][eE][sS] ]] && $0 save - stat_busy 'Clearing IPVS table' - ipvsadm -C && rm_daemon ${0##*/} && stat_done || stat_die - ;; - restart) - $0 stop - $0 start - ;; - save) - stat_busy 'Saving IPVS table' - ipvsadm-save -n > "$CONFIG_FILE" && stat_done || stat_die - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|save}" >&2 - exit 1 -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/isomaster/PKGBUILD b/community/isomaster/PKGBUILD deleted file mode 100644 index 5e32e9ac9..000000000 --- a/community/isomaster/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 73565 2012-07-09 23:28:25Z ebelanger $ -# Maintainer: Roman Kyrylych <roman@archlinux.org> -# Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor: Mefju <mefju@o2.pl> - -pkgname=isomaster -pkgver=1.3.9 -pkgrel=1 -pkgdesc="CD image editor written in GTK2" -arch=('i686' 'x86_64' 'mips64el') -url="http://littlesvr.ca/isomaster" -license=('GPL2') -depends=('gtk2' 'desktop-file-utils') -makedepends=('iniparser') -install=isomaster.install -source=("http://littlesvr.ca/isomaster/releases/$pkgname-$pkgver.tar.bz2" - isomaster-1.3.9-asneeded.patch) -md5sums=('ba7b44303979fd193df04b8f5f7ce4f8' - '79ac690bd7edf69dfb53e9916fc1182d') - -build() { - cd "$srcdir/$pkgname-$pkgver" - patch -p0 -i ../isomaster-1.3.9-asneeded.patch - make PREFIX=/usr -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make PREFIX=/usr DESTDIR="$pkgdir" install -} diff --git a/community/isomaster/isomaster-1.3.9-asneeded.patch b/community/isomaster/isomaster-1.3.9-asneeded.patch deleted file mode 100644 index 102f54db4..000000000 --- a/community/isomaster/isomaster-1.3.9-asneeded.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- Makefile -+++ Makefile -@@ -75,9 +75,9 @@ - isomaster: $(OBJECTS) lib iniparser - @echo 'Linking isomaster' - ifndef USE_SYSTEM_INIPARSER -- @$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a iniparser-2.17/libiniparser.a -o isomaster -+ @$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a iniparser-2.17/libiniparser.a `pkg-config --libs gtk+-2.0` - else -- @$(CC) $(LDFLAGS) `pkg-config --libs gtk+-2.0` $(OBJECTS) bk/bk.a -liniparser -o isomaster -+ @$(CC) $(LDFLAGS) $(OBJECTS) -o isomaster bk/bk.a -liniparser `pkg-config --libs gtk+-2.0` - endif - - # static pattern rule diff --git a/community/isomaster/isomaster.install b/community/isomaster/isomaster.install deleted file mode 100644 index 5e5cfef4d..000000000 --- a/community/isomaster/isomaster.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - update-desktop-database -q -} diff --git a/community/kdenlive/glu.patch b/community/kdenlive/glu.patch deleted file mode 100644 index a4c2f21fb..000000000 --- a/community/kdenlive/glu.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur kdenlive-0.8.2/src/videoglwidget.cpp kdenlive-0.8.2.my/src/videoglwidget.cpp ---- kdenlive-0.8.2/src/videoglwidget.cpp 2011-10-31 22:46:21.000000000 +0400 -+++ kdenlive-0.8.2.my/src/videoglwidget.cpp 2011-11-02 14:54:10.000000000 +0400 -@@ -2,6 +2,7 @@ - #include <QtGui> - #include <QtOpenGL> - #include "videoglwidget.h" -+#include <GL/glu.h> - - #ifndef GL_TEXTURE_RECTANGLE_EXT - #define GL_TEXTURE_RECTANGLE_EXT GL_TEXTURE_RECTANGLE_NV diff --git a/community/kdesvn/kdesvn-1.5.5-doctype-version.patch b/community/kdesvn/kdesvn-1.5.5-doctype-version.patch deleted file mode 100644 index 908960b72..000000000 --- a/community/kdesvn/kdesvn-1.5.5-doctype-version.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/doc/nl/index.docbook 2010-08-09 19:00:17.000000000 +0200 -+++ b/doc/nl/index.docbook 2010-08-09 19:00:26.000000000 +0200 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kdesvn "<application>kdesvn</application>"> - <!ENTITY kappname "&kdesvn;"><!-- Do *not* replace kappname--> - <!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc --> diff --git a/community/kdesvn/kdesvn-1.5.5-qt48.patch b/community/kdesvn/kdesvn-1.5.5-qt48.patch deleted file mode 100644 index a1ac51b51..000000000 --- a/community/kdesvn/kdesvn-1.5.5-qt48.patch +++ /dev/null @@ -1,14 +0,0 @@ -Source: Ubuntu -https://launchpad.net/ubuntu/precise/+source/kdesvn/1.5.5-3ubuntu1 - ---- kdesvn-1.5.5.orig/src/svnfrontend/graphtree/revgraphview.h -+++ kdesvn-1.5.5/src/svnfrontend/graphtree/revgraphview.h -@@ -49,7 +49,7 @@ typedef svn::SharedPointer<KTemporaryFil - /** - @author Rajko Albrecht <ral@alwins-world.de> - */ --class RevGraphView : virtual public QGraphicsView -+class RevGraphView : public QGraphicsView - { - Q_OBJECT - public: diff --git a/community/keepalived/ip_vs_moved.patch b/community/keepalived/ip_vs_moved.patch deleted file mode 100644 index e27873810..000000000 --- a/community/keepalived/ip_vs_moved.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- keepalived-1.2.2/configure 2011-01-06 01:51:33.000000000 +0100 -+++ keepalived-1.2.2.orig/configure 2011-11-24 19:36:32.051486626 +0100 -@@ -3973,7 +3973,7 @@ - - IPVS_SUPPORT="_WITHOUT_LVS_" - if test "$enable_lvs" != "no"; then -- ac_fn_c_check_header_mongrel "$LINENO" "net/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" -+ ac_fn_c_check_header_mongrel "$LINENO" "linux/ip_vs.h" "ac_cv_header_net_ip_vs_h" "$ac_includes_default" - if test "x$ac_cv_header_net_ip_vs_h" = x""yes; then : - IPVS_SUPPORT="_WITH_LVS_" - else -diff -ru keepalived-1.2.2/configure.in keepalived-1.2.2.orig/configure.in ---- keepalived-1.2.2/configure.in 2011-01-06 01:51:30.000000000 +0100 -+++ keepalived-1.2.2.orig/configure.in 2011-11-24 19:36:11.797860077 +0100 -@@ -124,7 +124,7 @@ - dnl ----[ Checks for LVS and VRRP support ]---- - IPVS_SUPPORT="_WITHOUT_LVS_" - if test "$enable_lvs" != "no"; then -- AC_CHECK_HEADER([net/ip_vs.h], -+ AC_CHECK_HEADER([linux/ip_vs.h], - [IPVS_SUPPORT="_WITH_LVS_"], - [ - IPVS_SUPPORT="_WITHOUT_LVS_" diff --git a/community/keepalived/keepalived.conf b/community/keepalived/keepalived.conf deleted file mode 100644 index 225f02bf9..000000000 --- a/community/keepalived/keepalived.conf +++ /dev/null @@ -1,16 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh et: -# Options for keepalived. See `keepalived --help' output and keepalived(8) and -# keepalived.conf(5) man pages for a list of all options. Here are the most -# common ones : -# -# --vrrp -P Only run with VRRP subsystem. -# --check -C Only run with Health-checker subsystem. -# --dont-release-vrrp -V Dont remove VRRP VIPs & VROUTEs on daemon stop. -# --dont-release-ipvs -I Dont remove IPVS topology on daemon stop. -# --dump-conf -d Dump the configuration data. -# --log-detail -D Detailed log messages. -# --log-facility -S 0-7 Set local syslog facility (default=LOG_DAEMON) -# - -DAEMON_OPTS='-D' - diff --git a/community/keepalived/keepalived.rc b/community/keepalived/keepalived.rc deleted file mode 100644 index 0ecfc7ded..000000000 --- a/community/keepalived/keepalived.rc +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/sbin/keepalived -PID=$(pidof -o %PPID $DAEMON) - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && 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 - ;; - reload) - stat_busy "Reloading ${0##*/} daemon" - [[ $PID ]] && kill -HUP $PID &> /dev/null && stat_done && exit 0 - stat_fail - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|reload}" >&2 - ;; -esac - -exit 1 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/kid3/ffmpeg-0.11.diff b/community/kid3/ffmpeg-0.11.diff deleted file mode 100644 index 349ca4b3d..000000000 --- a/community/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/kphotoalbum/fix-docbook-build.patch b/community/kphotoalbum/fix-docbook-build.patch deleted file mode 100644 index 575a4271e..000000000 --- a/community/kphotoalbum/fix-docbook-build.patch +++ /dev/null @@ -1,236 +0,0 @@ -diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook ---- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix 2009-11-15 15:16:29.000000000 -0600 -+++ kphotoalbum-4.1.1/doc/index.docbook 2010-06-13 13:03:02.815174744 -0500 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>"> - <!ENTITY kappname "&kphotoalbum;"> - <!ENTITY package "kdeextragear-2"> -@@ -41,12 +41,6 @@ - <date>2004-08-06</date> - <releaseinfo>2.0</releaseinfo> - -- <keywordset> -- <keyword>KDE</keyword> -- <keyword>kdeextragear-2</keyword> -- <keyword>KPhotoAlbum</keyword> -- <keyword>Image Database</keyword> -- </keywordset> - <abstract><para> - This is the user manual for &kphotoalbum;. If you are - not the type who likes reading documentation, but rather just want to try -@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto - on long HTML document at <ulink - url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para> - </abstract> -+ <keywordset> -+ <keyword>KDE</keyword> -+ <keyword>kdeextragear-2</keyword> -+ <keyword>KPhotoAlbum</keyword> -+ <keyword>Image Database</keyword> -+ </keywordset> - </bookinfo> - - &introduction; -diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook ---- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:07.000000000 -0600 -+++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:10:06.145165665 -0500 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kphotoalbum "<application - >KPhotoAlbum</application - >"> -@@ -65,16 +65,6 @@ - <releaseinfo - >2.0</releaseinfo> - -- <keywordset> -- <keyword -->KDE</keyword> -- <keyword -->kdeextragear-2</keyword> -- <keyword -->KPhotoAlbum</keyword> -- <keyword -->Bilddatenbank</keyword> -- </keywordset> - <abstract - ><para - >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist> -@@ -102,6 +92,12 @@ - >HTML</acronym - >-Dokument zum Herunterladen.</para> - </abstract> -+ <keywordset> -+ <keyword>KDE</keyword> -+ <keyword>kdeextragear-2</keyword> -+ <keyword>KPhotoAlbum</keyword> -+ <keyword>Bilddatenbank</keyword> -+ </keywordset> - </bookinfo> - - &introduction; -diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook ---- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:20.000000000 -0600 -+++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:11:18.860165964 -0500 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kphotoalbum "<application - >KPhotoAlbum</application - >"> -@@ -65,16 +65,6 @@ - <releaseinfo - >2.0</releaseinfo> - -- <keywordset> -- <keyword -->KDE</keyword> -- <keyword -->kdeextragear-2</keyword> -- <keyword -->KPhotoAlbum</keyword> -- <keyword -->Piltide andmebaas</keyword> -- </keywordset> - <abstract - ><para - >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist> -@@ -100,6 +90,12 @@ - >&kphotoalbum;i koduleheküljelt</ulink - >.</para> - </abstract> -+ <keywordset> -+ <keyword>KDE</keyword> -+ <keyword>kdeextragear-2</keyword> -+ <keyword>KPhotoAlbum</keyword> -+ <keyword>Piltide andmebaas</keyword> -+ </keywordset> - </bookinfo> - - &introduction; -diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook ---- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:17:57.000000000 -0600 -+++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:00.978165382 -0500 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kphotoalbum "<application - >KPhotoAlbum</application - >"> -@@ -65,16 +65,6 @@ - <releaseinfo - >2.0</releaseinfo> - -- <keywordset> -- <keyword -->KDE</keyword> -- <keyword -->kdeextragear-2</keyword> -- <keyword -->KPhotoAlbum</keyword> -- <keyword -->Banca dati immagini</keyword> -- </keywordset> - <abstract - ><para - >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist> -@@ -100,6 +90,12 @@ - >homepage di &kphotoalbum;</ulink - ></para> - </abstract> -+ <keywordset> -+ <keyword>KDE</keyword> -+ <keyword>kdeextragear-2</keyword> -+ <keyword>KPhotoAlbum</keyword> -+ <keyword>Banca dati immagini</keyword> -+ </keywordset> - </bookinfo> - - &introduction; -diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook ---- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:13.000000000 -0600 -+++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:12:45.765165840 -0500 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kphotoalbum "<application - >KPhotoAlbum</application - >"> -@@ -65,16 +65,6 @@ - <releaseinfo - >2.0</releaseinfo> - -- <keywordset> -- <keyword -->KDE</keyword> -- <keyword -->kdeextragear-2</keyword> -- <keyword -->Kfotoalbum</keyword> -- <keyword -->Bilddatabas</keyword> -- </keywordset> - <abstract - ><para - >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist> -@@ -100,6 +90,12 @@ - >Kfotoalbums hemsida</ulink - ></para> - </abstract> -+ <keywordset> -+ <keyword>KDE</keyword> -+ <keyword>kdeextragear-2</keyword> -+ <keyword>Kfotoalbum</keyword> -+ <keyword>Bilddatabas</keyword> -+ </keywordset> - </bookinfo> - - &introduction; -diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook ---- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix 2009-11-15 15:19:26.000000000 -0600 -+++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook 2010-06-13 13:13:28.217166055 -0500 -@@ -1,5 +1,5 @@ - <?xml version="1.0" ?> --<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ -+<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ - <!ENTITY kphotoalbum "<application - >KPhotoAlbum</application - >"> -@@ -65,16 +65,6 @@ - <releaseinfo - >2.0</releaseinfo> - -- <keywordset> -- <keyword -->KDE</keyword> -- <keyword -->kdeextragear-2</keyword> -- <keyword -->KPhotoAlbum</keyword> -- <keyword -->База даних зображень</keyword> -- </keywordset> - <abstract - ><para - >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist> -@@ -100,6 +90,12 @@ - >домашній сторінці &kphotoalbum;</ulink - ></para> - </abstract> -+ <keywordset> -+ <keyword>KDE</keyword> -+ <keyword>kdeextragear-2</keyword> -+ <keyword>KPhotoAlbum</keyword> -+ <keyword>База даних зображень</keyword> -+ </keywordset> - </bookinfo> - - &introduction; diff --git a/community/kphotoalbum/fix-with-exiv2-0.21.patch b/community/kphotoalbum/fix-with-exiv2-0.21.patch deleted file mode 100644 index 65baf235d..000000000 --- a/community/kphotoalbum/fix-with-exiv2-0.21.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- kphotoalbum-4.1.1/Exif/Info.cpp.orig 2010/08/16 08:04:32 1164187 -+++ kphotoalbum-4.1.1/Exif/Info.cpp 2011/01/09 06:50:40 1213128 -@@ -106,6 +106,28 @@ - return res; - - QList<const Exiv2::TagInfo*> tags; -+ std::ostringstream s; -+ -+#if (EXIV2_TEST_VERSION(0,21,0)) -+ const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList(); -+ while (gi->tagList_ != 0) { -+ Exiv2::TagListFct tl = gi->tagList_; -+ const Exiv2::TagInfo* ti = tl(); -+ -+ while (ti->tag_ != 0xFFFF) { -+ tags << ti; -+ ++ti; -+ } -+ ++gi; -+ } -+ -+ for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) { -+ while ( (*it)->tag_ != 0xffff ) { -+ res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str())); -+ ++(*it); -+ } -+ } -+#else - tags << - Exiv2::ExifTags::ifdTagList() << - Exiv2::ExifTags::exifTagList() << -@@ -121,7 +143,6 @@ - // Now the ugly part -- exiv2 doesn't have any way to get a list of - // MakerNote tags in a reasonable form, so we have to parse it from strings - -- std::ostringstream s; - for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId; - kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) { - #if EXIV2_TEST_VERSION(0,17,0) -@@ -130,6 +151,7 @@ - Exiv2::ExifTags::makerTaglist( s, kind ); - #endif - } -+#endif - - // IPTC tags use yet another format... - Exiv2::IptcDataSets::dataSetList( s ); diff --git a/community/krusader/PKGBUILD b/community/krusader/PKGBUILD deleted file mode 100644 index 0443763d4..000000000 --- a/community/krusader/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 149613 2012-02-08 20:20:01Z pierre $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Alexander Baldeck <alexander@archlinux.org> -# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> - -pkgname=krusader -pkgver=2.4.0beta3 -_pkgver=2.4.0-beta3 -pkgrel=2 -pkgdesc="An alternative file manager for KDE resembling Midnight Commander" -arch=('i686' 'x86_64') -url="http://krusader.sourceforge.net/" -license=('GPL') -depends=('kdebase-runtime' 'kdebase-lib' 'kdebase-katepart') -makedepends=('cmake' 'automoc4' 'kdeutils-ark') -optdepends=('kdebase-keditbookmarks: to edit bookmarks' - 'kdeutils-ark: extract archive with right-click' - 'kdebase-konsole: open an embedded terminal') -install=$pkgname.install -source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$_pkgver.tar.bz2") -md5sums=('62a02db3f213bb76805ca6c958e9e263') - -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/krusader/krusader.install b/community/krusader/krusader.install deleted file mode 100644 index e70c054ec..000000000 --- a/community/krusader/krusader.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/libaccounts-glib/fix-docdir.patch b/community/libaccounts-glib/fix-docdir.patch deleted file mode 100644 index a535000ec..000000000 --- a/community/libaccounts-glib/fix-docdir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur -i libaccounts-glib-1.3.orig/Makefile.am libaccounts-glib-1.3/Makefile.am ---- libaccounts-glib-1.3.orig/Makefile.am 2012-03-13 15:18:32.000000000 +0100 -+++ libaccounts-glib-1.3/Makefile.am 2012-10-16 21:38:42.156352344 +0200 -@@ -12,7 +12,7 @@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libaccounts-glib.pc - --libaccountsdocdir = ${prefix}/doc/reference -+libaccountsdocdir = ${docdir} - libaccountsdoc_DATA= README COPYING AUTHORS ChangeLog INSTALL NEWS - - backupconfdir = ${prefix}/share/backup-framework/applications diff --git a/community/libaccounts-glib/make-tests-optional.patch b/community/libaccounts-glib/make-tests-optional.patch deleted file mode 100644 index a5c3d1ba5..000000000 --- a/community/libaccounts-glib/make-tests-optional.patch +++ /dev/null @@ -1,68 +0,0 @@ -commit c34f64423776d214fc5a24b76c7c606119988d7e -Author: David King <david.king@canonical.com> -Date: Mon Oct 22 08:12:40 2012 +0100 - - Make tests optional at configure time - - http://code.google.com/p/accounts-sso/issues/detail?id=124 - -diff --git a/Makefile.am b/Makefile.am -index 97979a6..358a923 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,7 +1,10 @@ --SUBDIRS = libaccounts-glib docs tests tools -+SUBDIRS = libaccounts-glib docs tools - if ENABLE_PYTHON - SUBDIRS += pygobject - endif -+if ENABLE_TESTS -+SUBDIRS += tests -+endif - - ACLOCAL_AMFLAGS = -I m4 - -diff --git a/configure.ac b/configure.ac -index cbaf8d5..50b95ea 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,25 @@ PKG_CHECK_MODULES( - AC_SUBST(LIBACCOUNTS_CFLAGS) - AC_SUBST(LIBACCOUNTS_LIBS) - --PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -+# Build tests. -+ -+CHECK_REQUIRED="check >= 0.9.4" -+ -+AC_ARG_ENABLE([tests], -+ [AS_HELP_STRING([--disable-tests], [build with testing support disabled])]) -+ -+AS_IF([test "x$enable_tests" != "xno"], -+ [PKG_CHECK_EXISTS([$CHECK_REQUIRED], [have_check=yes], [have_check=no])], -+ [have_check=no]) -+ -+AS_IF([test "x$have_check" = "xyes"], -+ [PKG_CHECK_MODULES([CHECK], [$CHECK_REQUIRED]) -+ AC_SUBST([CHECK_CFLAGS]) -+ AC_SUBST([CHECK_LIBS])], -+ [AS_IF([test "x$enable_tests" = "xyes"], -+ [AC_MSG_ERROR([tests enabled but required dependencies were not found])])]) -+ -+AM_CONDITIONAL([ENABLE_TESTS], [test "x$have_check" = "xyes"]) - - AC_ISC_POSIX - AC_PROG_CC -diff --git a/tests/Makefile.am b/tests/Makefile.am -index db5aa3f..f6c8dbf 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -7,7 +7,7 @@ dist_check_SCRIPTS = \ - check_SCRIPTS = accounts-glib-test.sh - - accounts_glib_testsuite_SOURCES = check_ag.c --accounts_glib_testsuite_CFLAGS = $(CHECK_FLAGS) -I$(top_srcdir) -+accounts_glib_testsuite_CFLAGS = $(CHECK_CFLAGS) -I$(top_srcdir) - accounts_glib_testsuite_LDADD = \ - $(CHECK_LIBS) \ - $(LIBACCOUNTS_LIBS) \ diff --git a/community/libdlna/ffmpeg-0.8.patch b/community/libdlna/ffmpeg-0.8.patch deleted file mode 100644 index 63b33a451..000000000 --- a/community/libdlna/ffmpeg-0.8.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -aur libdlna-0.2.3/src/profiles.c libdlna-0.2.3.new/src/profiles.c ---- libdlna-0.2.3/src/profiles.c 2007-11-26 21:47:43.000000000 +0100 -+++ libdlna-0.2.3.new/src/profiles.c 2011-10-31 16:06:34.000000000 +0100 -@@ -205,13 +205,13 @@ - for (i = 0; i < ctx->nb_streams; i++) - { - if (audio_stream == -1 && -- ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) -+ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO) - { - audio_stream = i; - continue; - } - else if (video_stream == -1 && -- ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) -+ ctx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { - video_stream = i; - continue; diff --git a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch b/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch deleted file mode 100644 index 8620ab2eb..000000000 --- a/community/libdlna/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch +++ /dev/null @@ -1,89 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=297872 -http://hg.geexbox.org/libdlna/raw-rev/4113a728a2ca - -From 81130b9ade274bfc53900999ccc6f963ae9ce9d7 Mon Sep 17 00:00:00 2001 -From: Jeremy Olexa <darkside@gentoo.org> -Date: Tue, 22 Dec 2009 00:22:42 -0600 -Subject: [PATCH] Update reference to ffmpeg header files - ---- - configure | 4 ++-- - src/av_mpeg4_part10.c | 2 +- - src/av_mpeg4_part2.c | 2 +- - src/containers.c | 2 +- - src/profiles.h | 4 ++-- - 5 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure b/configure -index 8acbd9d..85c1091 100755 ---- a/configure -+++ b/configure -@@ -610,9 +610,9 @@ if [ -n "$ffmpegdir" ]; then - fi - - echolog "Checking for libavformat ..." --check_lib ffmpeg/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" -+check_lib libavformat/avformat.h av_register_all -lavformat || die "Error, can't find libavformat !" - echolog "Checking for libavcodec ..." --check_lib ffmpeg/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" -+check_lib libavcodec/avcodec.h avcodec_register_all -lavcodec || die "Error, can't find libavcodec !" - - ################################################# - # version -diff --git a/src/av_mpeg4_part10.c b/src/av_mpeg4_part10.c -index bd17022..f9c8ee5 100644 ---- a/src/av_mpeg4_part10.c -+++ b/src/av_mpeg4_part10.c -@@ -26,7 +26,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - #include "dlna_internals.h" - #include "profiles.h" -diff --git a/src/av_mpeg4_part2.c b/src/av_mpeg4_part2.c -index 0148384..823e1b6 100644 ---- a/src/av_mpeg4_part2.c -+++ b/src/av_mpeg4_part2.c -@@ -26,7 +26,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - --#include <ffmpeg/avcodec.h> -+#include <libavcodec/avcodec.h> - - #include "dlna_internals.h" - #include "profiles.h" -diff --git a/src/containers.c b/src/containers.c -index 71b51f7..ca0819b 100644 ---- a/src/containers.c -+++ b/src/containers.c -@@ -4,7 +4,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - --#include <ffmpeg/avformat.h> -+#include <libavformat/avformat.h> - - #include "containers.h" - #include "profiles.h" -diff --git a/src/profiles.h b/src/profiles.h -index 7b86d33..a7fc0fd 100644 ---- a/src/profiles.h -+++ b/src/profiles.h -@@ -22,8 +22,8 @@ - #ifndef _PROFILES_H_ - #define _PROFILES_H_ - --#include <ffmpeg/avcodec.h> --#include <ffmpeg/avformat.h> -+#include <libavcodec/avcodec.h> -+#include <libavformat/avformat.h> - - #include "dlna_internals.h" - #include "containers.h" --- -1.6.4.4 - diff --git a/community/libmatio/PKGBUILD b/community/libmatio/PKGBUILD deleted file mode 100644 index df42830cd..000000000 --- a/community/libmatio/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 70169 2012-05-01 11:20:31Z andrea $ -# Maintainer: -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=libmatio -pkgver=1.5.0 -pkgrel=1 -pkgdesc="A C library with a fortran 90/95 module interface for reading/writing MATLAB MAT-files" -arch=('i686' 'x86_64' 'mips64el') -license=('LGPL') -url="http://sourceforge.net/projects/matio" -depends=('zlib') -options=('!libtool') -source=("http://downloads.sourceforge.net/matio/matio-$pkgver.tar.gz") -sha1sums=('70dbf09984ade6adfb38c1b62ae5585ff7f85e05') - -build() { - cd "${srcdir}"/matio-$pkgver - ./configure --prefix=/usr --enable-shared - make -} - -package() { - cd "${srcdir}"/matio-$pkgver - make DESTDIR="${pkgdir}" install -} diff --git a/community/libpqxx/build-fix.patch b/community/libpqxx/build-fix.patch deleted file mode 100644 index 12795e517..000000000 --- a/community/libpqxx/build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur libpqxx-3.1/include/pqxx/compiler-internal.hxx libpqxx-3.1.my/include/pqxx/compiler-internal.hxx ---- libpqxx-3.1/include/pqxx/compiler-internal.hxx 2010-02-16 02:21:36.000000000 +0300 -+++ libpqxx-3.1.my/include/pqxx/compiler-internal.hxx 2011-11-21 15:56:00.000000000 +0400 -@@ -18,6 +18,7 @@ - #ifndef PQXX_H_COMPILER_INTERNAL - #define PQXX_H_COMPILER_INTERNAL - -+#include <cstddef> - - // Workarounds & definitions needed to compile libpqxx into a library - #include "pqxx/config-internal-compiler.h" diff --git a/community/libquicktime/PKGBUILD b/community/libquicktime/PKGBUILD deleted file mode 100644 index 3003dbd3a..000000000 --- a/community/libquicktime/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 80154 2012-11-16 23:35:56Z ioni $ -# Maintainer: Mateusz Herych <heniekk@gmail.com> - -pkgname=libquicktime -pkgver=1.2.4 -pkgrel=3 -pkgdesc="A library for reading and writing quicktime files" -arch=('i686' 'x86_64') -license=('GPL') -url="http://libquicktime.sourceforge.net/" -depends=('gtk2' 'ffmpeg' 'libxv' 'libgl' 'libxaw' 'faad2' 'faac') -options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('1c53359c33b31347b4d7b00d3611463fe5e942cae3ec0fefe0d2fd413fd47368') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr \ - --enable-gpl \ - --with-ffmpeg \ - --with-x264 \ - --without-doxygen - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - diff --git a/community/libtlen/PKGBUILD b/community/libtlen/PKGBUILD deleted file mode 100644 index 04cb44677..000000000 --- a/community/libtlen/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 67517 2012-03-12 22:14:18Z lcarlier $ -# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com> - -pkgname=libtlen -pkgver=20041113 -pkgrel=5 -pkgdesc="A Tlen.pl protocol library" -arch=('i686' 'x86_64' 'mips64el') -url="http://libtlen.sourceforge.net/" -license=("GPL") -depends=(glibc) -source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('b77c0a3234a21d1b79df8a8b9a9b9534') - -build() { - cd ${srcdir}/$pkgname-$pkgver - - ./configure --prefix=/usr - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - - make DESTDIR=${pkgdir} install -} diff --git a/community/libvirt/libvirt-libnl3.patch b/community/libvirt/libvirt-libnl3.patch deleted file mode 100644 index 1e5f141b9..000000000 --- a/community/libvirt/libvirt-libnl3.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff -wbBur libvirt-0.9.12/configure.ac libvirt-0.9.12.my/configure.ac ---- libvirt-0.9.12/configure.ac 2012-05-14 06:15:40.000000000 +0400 -+++ libvirt-0.9.12.my/configure.ac 2012-05-17 13:18:22.000000000 +0400 -@@ -71,7 +71,7 @@ - LIBCURL_REQUIRED="7.18.0" - OPENWSMAN_REQUIRED="2.2.3" - LIBPCAP_REQUIRED="1.0.0" --LIBNL_REQUIRED="1.1" -+LIBNL_REQUIRED="3.2" - LIBSSH2_REQUIRED="1.0" - LIBBLKID_REQUIRED="2.17" - DBUS_REQUIRED="1.0.0" -@@ -2652,21 +2652,9 @@ - PKG_CHECK_MODULES([LIBNL], [libnl-3.0], [ - have_libnl=yes - AC_DEFINE([HAVE_LIBNL3], [1], [Use libnl-3.0]) -- AC_DEFINE([HAVE_LIBNL], [1], [whether the netlink library is available]) - PKG_CHECK_MODULES([LIBNL_ROUTE3], [libnl-route-3.0]) - LIBNL_CFLAGS="$LIBNL_CFLAGS $LIBNL_ROUTE3_CFLAGS" - LIBNL_LIBS="$LIBNL_LIBS $LIBNL_ROUTE3_LIBS" -- ], [PKG_CHECK_MODULES([LIBNL], [libnl-1 >= $LIBNL_REQUIRED], [ -- have_libnl=yes -- AC_DEFINE_UNQUOTED([HAVE_LIBNL], [1], -- [whether the netlink library is available]) -- AC_DEFINE_UNQUOTED([HAVE_LIBNL1], [1], -- [whether the netlink v1 library is available]) -- ], [ -- if test "$with_macvtap" = "yes"; then -- AC_MSG_ERROR([libnl-devel >= $LIBNL_REQUIRED is required for macvtap support]) -- fi -- ]) - ]) - fi - AM_CONDITIONAL([HAVE_LIBNL], [test "$have_libnl" = "yes"]) -diff -wbBur libvirt-0.9.12/daemon/Makefile.am libvirt-0.9.12.my/daemon/Makefile.am ---- libvirt-0.9.12/daemon/Makefile.am 2012-04-20 08:25:25.000000000 +0400 -+++ libvirt-0.9.12.my/daemon/Makefile.am 2012-05-17 13:18:22.000000000 +0400 -@@ -96,6 +96,7 @@ - $(LIBXML_CFLAGS) $(GNUTLS_CFLAGS) $(SASL_CFLAGS) \ - $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ - $(WARN_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - $(COVERAGE_CFLAGS) \ - -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ - -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" -diff -wbBur libvirt-0.9.12/src/Makefile.am libvirt-0.9.12.my/src/Makefile.am ---- libvirt-0.9.12/src/Makefile.am 2012-05-05 16:53:48.000000000 +0400 -+++ libvirt-0.9.12.my/src/Makefile.am 2012-05-17 13:18:22.000000000 +0400 -@@ -16,6 +16,7 @@ - - AM_CFLAGS = $(DRIVER_MODULE_CFLAGS) \ - $(LIBXML_CFLAGS) \ -+ $(LIBNL_CFLAGS) \ - $(WARN_CFLAGS) \ - $(LOCK_CHECKING_CFLAGS) \ - $(WIN32_EXTRA_CFLAGS) \ -diff -wbBur libvirt-0.9.12/src/util/virnetdevmacvlan.c libvirt-0.9.12.my/src/util/virnetdevmacvlan.c ---- libvirt-0.9.12/src/util/virnetdevmacvlan.c 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetdevmacvlan.c 2012-05-17 13:25:21.000000000 +0400 -@@ -27,6 +27,10 @@ - - #include <config.h> - -+#include <netlink/msg.h> -+#include <linux/rtnetlink.h> -+#include <linux/if_link.h> -+ - #include "virnetdevmacvlan.h" - #include "virmacaddr.h" - #include "util.h" -diff -wbBur libvirt-0.9.12/src/util/virnetdevvportprofile.c libvirt-0.9.12.my/src/util/virnetdevvportprofile.c ---- libvirt-0.9.12/src/util/virnetdevvportprofile.c 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetdevvportprofile.c 2012-05-17 13:27:54.000000000 +0400 -@@ -22,6 +22,10 @@ - - #include <config.h> - -+#include <netlink/msg.h> -+#include <linux/rtnetlink.h> -+#include <linux/if_link.h> -+ - #include "virnetdevvportprofile.h" - #include "virterror_internal.h" - -diff -wbBur libvirt-0.9.12/src/util/virnetlink.c libvirt-0.9.12.my/src/util/virnetlink.c ---- libvirt-0.9.12/src/util/virnetlink.c 2012-05-09 16:41:41.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetlink.c 2012-05-17 13:38:08.000000000 +0400 -@@ -49,7 +49,7 @@ - - #define NETLINK_ACK_TIMEOUT_S 2 - --#if defined(__linux__) && defined(HAVE_LIBNL) -+#if defined(__linux__) && defined(HAVE_LIBNL3) - /* State for a single netlink event handle */ - struct virNetlinkEventHandle { - int watch; -diff -wbBur libvirt-0.9.12/src/util/virnetlink.h libvirt-0.9.12.my/src/util/virnetlink.h ---- libvirt-0.9.12/src/util/virnetlink.h 2012-05-09 05:21:54.000000000 +0400 -+++ libvirt-0.9.12.my/src/util/virnetlink.h 2012-05-17 13:27:37.000000000 +0400 -@@ -23,9 +23,10 @@ - # include "config.h" - # include "internal.h" - --# if defined(__linux__) && defined(HAVE_LIBNL) -+# if defined(__linux__) && defined(HAVE_LIBNL3) - - # include <netlink/msg.h> -+# include <stdint.h> - - # else - diff --git a/community/libvirt/openbsd-netcat-default.patch b/community/libvirt/openbsd-netcat-default.patch deleted file mode 100644 index 5538c892d..000000000 --- a/community/libvirt/openbsd-netcat-default.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -wbBur libvirt-0.10.0.org/src/qemu/qemu_migration.c libvirt-0.10.0/src/qemu/qemu_migration.c ---- libvirt-0.10.0.org/src/qemu/qemu_migration.c 2012-08-27 06:12:21.000000000 +0400 -+++ libvirt-0.10.0/src/qemu/qemu_migration.c 2012-08-29 13:36:23.000000000 +0400 -@@ -1910,7 +1910,7 @@ - spec->dest.unix_socket.file); - } else { - const char *args[] = { -- "nc", "-U", spec->dest.unix_socket.file, NULL -+ "nc.openbsd", "-U", spec->dest.unix_socket.file, NULL - }; - ret = qemuMonitorMigrateToCommand(priv->mon, migrate_flags, args); - } -diff -wbBur libvirt-0.10.0.org/src/remote/remote_driver.c libvirt-0.10.0/src/remote/remote_driver.c ---- libvirt-0.10.0.org/src/remote/remote_driver.c 2012-08-27 06:12:21.000000000 +0400 -+++ libvirt-0.10.0/src/remote/remote_driver.c 2012-08-29 13:36:32.000000000 +0400 -@@ -693,7 +693,7 @@ - username, - !tty, - !verify, -- netcat ? netcat : "nc", -+ netcat ? netcat : "nc.openbsd", - keyfile, - sockname))) - goto failed; -diff -wbBur libvirt-0.10.0.org/src/rpc/virnetclient.c libvirt-0.10.0/src/rpc/virnetclient.c ---- libvirt-0.10.0.org/src/rpc/virnetclient.c 2012-08-28 07:44:50.000000000 +0400 -+++ libvirt-0.10.0/src/rpc/virnetclient.c 2012-08-29 13:36:38.000000000 +0400 -@@ -469,7 +469,7 @@ - DEFAULT_VALUE(host, "localhost"); - DEFAULT_VALUE(port, "22"); - DEFAULT_VALUE(username, "root"); -- DEFAULT_VALUE(netcatPath, "nc"); -+ DEFAULT_VALUE(netcatPath, "nc.openbsd"); - DEFAULT_VALUE(knownHostsVerify, "normal"); - - virBufferEscapeShell(&buf, netcatPath); -diff -wbBur libvirt-0.10.0.org/src/rpc/virnetsocket.c libvirt-0.10.0/src/rpc/virnetsocket.c ---- libvirt-0.10.0.org/src/rpc/virnetsocket.c 2012-08-22 14:00:59.000000000 +0400 -+++ libvirt-0.10.0/src/rpc/virnetsocket.c 2012-08-29 13:36:44.000000000 +0400 -@@ -698,7 +698,7 @@ - virCommandAddArgList(cmd, "-o", "StrictHostKeyChecking=no", NULL); - - if (!netcat) -- netcat = "nc"; -+ netcat = "nc.openbsd"; - - virCommandAddArgList(cmd, nodename, "sh", "-c", NULL); - -diff -wbBur libvirt-0.10.0.org/tests/virnetsockettest.c libvirt-0.10.0/tests/virnetsockettest.c ---- libvirt-0.10.0.org/tests/virnetsockettest.c 2012-08-10 06:26:04.000000000 +0400 -+++ libvirt-0.10.0/tests/virnetsockettest.c 2012-08-29 13:36:53.000000000 +0400 -@@ -593,7 +593,7 @@ - - struct testSSHData sshData7 = { - .nodename = "somehost", -- .netcat = "nc -4", -+ .netcat = "nc.openbsd -4", - .path = "/tmp/socket", - .expectOut = "somehost sh -c 'if ''nc -4'' -q 2>&1 | grep \"requires an argument\" >/dev/null 2>&1; then " - "ARG=-q0;" diff --git a/community/libvirt/xdg.patch b/community/libvirt/xdg.patch deleted file mode 100644 index 0a12c83b5..000000000 --- a/community/libvirt/xdg.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c -index 0b32ffe..08dfbb0 100644 ---- a/src/rpc/virnetsocket.c -+++ b/src/rpc/virnetsocket.c -@@ -97,6 +97,9 @@ static int virNetSocketForkDaemon(const char *binary) - NULL); - - virCommandAddEnvPassCommon(cmd); -+ virCommandAddEnvPass(cmd, "XDG_CACHE_HOME"); -+ virCommandAddEnvPass(cmd, "XDG_CONFIG_HOME"); -+ virCommandAddEnvPass(cmd, "XDG_RUNTIME_DIR"); - virCommandClearCaps(cmd); - virCommandDaemonize(cmd); - ret = virCommandRun(cmd, NULL); diff --git a/community/luaexpat/newconfig b/community/luaexpat/newconfig deleted file mode 100644 index bc5b25d8f..000000000 --- a/community/luaexpat/newconfig +++ /dev/null @@ -1,26 +0,0 @@ -LUA_LIBDIR= usr/lib/lua/5.2 -LUA_DIR= usr/share/lua/5.2 -LUA_INC= /usr/include -EXPAT_INC= /usr/include - -# OS dependent -LIB_OPTION= -shared - -LIBNAME= $T.so.$V -LUA_VERSION_NUM= 521 -COMPAT_DIR= ../compat/src - -# Compilation parameters -CWARNS = -Wall -pedantic \ - -Waggregate-return \ - -Wcast-align \ - -Wmissing-prototypes \ - -Wstrict-prototypes \ - -Wnested-externs \ - -Wpointer-arith \ - -Wshadow \ - -Wwrite-strings - -CFLAGS = $(CWARNS) -ansi -O2 -I$(LUA_INC) \ - -I$(COMPAT_DIR) -I$(EXPAT_INC) -fPIC -CC = gcc diff --git a/community/luajit/luaconf.patch b/community/luajit/luaconf.patch deleted file mode 100644 index ba9373b52..000000000 --- a/community/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/luajit/luajit-arch.patch b/community/luajit/luajit-arch.patch deleted file mode 100644 index 689a87d4e..000000000 --- a/community/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/luarocks/PKGBUILD b/community/luarocks/PKGBUILD deleted file mode 100644 index 2c710e072..000000000 --- a/community/luarocks/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 73676 2012-07-13 11:41:36Z cbrannon $ -# Maintainer: Chris Brannon <cmbrannon79@gmail.com> -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> - -pkgname=luarocks -pkgver=2.0.10 -pkgrel=1 -pkgdesc='Deployment and management system for Lua modules' -arch=('i686' 'x86_64' 'mips64el') -url="http://luarocks.org/" -depends=('lua' 'unzip' 'zip' 'curl') -optdepends=('cvs: for fetching sources from CVS repositories' - 'git: for fetching sources from git repositories' - 'mercurial: for fetching sources from mercurial repositories' - 'luasec: HTTPS support' - 'cmake: for building rocks that use the cmake build system') -license=('custom') -options=('!makeflags') -source=(http://luarocks.org/releases/$pkgname-$pkgver.tar.gz) - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # I added --with-downloader=curl, because luarocks already uses curl - # for uploading. May as well use curl for downloading. - ./configure --prefix=/usr --sysconfdir=/etc/luarocks --with-downloader=curl - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make install DESTDIR="$pkgdir" - install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -md5sums=('85cccdbd995b489ae1a9aab33c14b7fc') diff --git a/community/luarocks/packbinary.patch b/community/luarocks/packbinary.patch deleted file mode 100644 index 59a46f6e1..000000000 --- a/community/luarocks/packbinary.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua -index af098f3..3c7f440 100644 ---- a/src/luarocks/build.lua -+++ b/src/luarocks/build.lua -@@ -3,6 +3,7 @@ - -- Builds a rock, compiling its C parts if any. - module("luarocks.build", package.seeall) - -+local pack = require("luarocks.pack") - local path = require("luarocks.path") - local util = require("luarocks.util") - local rep = require("luarocks.rep") diff --git a/community/luasec/ChangeLog b/community/luasec/ChangeLog deleted file mode 100644 index 4a64bc6a7..000000000 --- a/community/luasec/ChangeLog +++ /dev/null @@ -1,60 +0,0 @@ -2010-02-15 Dwayne Bent <dbb.1@liqd.org> - - * PKGBUILD: - Install license file - [ea00bf4731a9] [tip] - - * PKGBUILD: - Updated email address - [7dbb9017cecc] - -2009-12-19 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.4-1 for changeset 91906cc7dfbd - [3c36a2298de6] - - * PKGBUILD, luasec.patch: - New upstream version - [91906cc7dfbd] [v0.4-1] - -2009-08-19 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.3.3-1 for changeset 9635074f31a3 - [e6b3934bbbba] - - * PKGBUILD: - New upstream version - [9635074f31a3] [v0.3.3-1] - -2009-07-01 Dwayne Bent <dbb.0@liqd.org> - - * PKGBUILD, luasec.patch: - Changed to using custom patch - [30893f6a9840] - - * PKGBUILD: - Added minimum versions to dependencies - [b538b6270f60] - -2009-05-22 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.3.2-1 for changeset eacacff733b2 - [f93b17e1495c] - - * PKGBUILD: - New upstream version - [eacacff733b2] [v0.3.2-1] - -2009-05-11 Dwayne Bent <dbb.0@liqd.org> - - * .hgtags: - Added tag v0.3.1-1 for changeset 9f9bd46fe838 - [9d25feaa12a5] - - * PKGBUILD: - Initial commit. - [9f9bd46fe838] [v0.3.1-1] - diff --git a/community/luasec/luasec.patch b/community/luasec/luasec.patch deleted file mode 100644 index 7b0c9d6cc..000000000 --- a/community/luasec/luasec.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.orig 2009-12-19 14:54:45.000000000 -0500 -+++ Makefile 2009-12-19 14:57:22.000000000 -0500 -@@ -1,11 +1,11 @@ - # Inform the location to intall the modules --LUAPATH=/usr/local/share/lua/5.1 --LUACPATH=/usr/local/lib/lua/5.1 -+LUAPATH=/usr/share/lua/5.1 -+LUACPATH=/usr/lib/lua/5.1 - - # Edit the lines below to inform new path, if necessary - # --#INCDIR=-I/usr/local/lua-5.1/include -I/usr/local/openssl-0.9.8/include --#LIBDIR=-L/usr/local/openssl-0.9.8/lib -R/usr/local/openssl-0.9.8/lib -+INCDIR=-I/usr/include -I/usr/include/openssl -+LIBDIR=-L/usr/lib - - # For Mac OS X: set the system version - MACOSX_VERSION=10.4 -@@ -26,7 +26,7 @@ - @echo " * macosx" - - install: -- @cd src ; $(MAKE) LUACPATH="$(LUACPATH)" LUAPATH="$(LUAPATH)" install -+ @cd src ; $(MAKE) LUACPATH="$(DESTDIR)$(LUACPATH)" LUAPATH="$(DESTDIR)$(LUAPATH)" install - - linux: - @echo "---------------------" diff --git a/community/luasocket/lua52.patch b/community/luasocket/lua52.patch deleted file mode 100644 index 4eef574ee..000000000 --- a/community/luasocket/lua52.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff -wbBur luasocket-2.0.2/src/auxiliar.c luasocket-2.0.2.my/src/auxiliar.c ---- luasocket-2.0.2/src/auxiliar.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/auxiliar.c 2012-11-14 18:23:14.000000000 +0400 -@@ -24,7 +24,7 @@ - * Creates a new class with given methods - * Methods whose names start with __ are passed directly to the metatable. - \*-------------------------------------------------------------------------*/ --void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func) { -+void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func) { - luaL_newmetatable(L, classname); /* mt */ - /* create __index table to place methods */ - lua_pushstring(L, "__index"); /* mt,"__index" */ -diff -wbBur luasocket-2.0.2/src/auxiliar.h luasocket-2.0.2.my/src/auxiliar.h ---- luasocket-2.0.2/src/auxiliar.h 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/auxiliar.h 2012-11-14 18:23:42.000000000 +0400 -@@ -35,7 +35,7 @@ - #include "lauxlib.h" - - int auxiliar_open(lua_State *L); --void auxiliar_newclass(lua_State *L, const char *classname, luaL_reg *func); -+void auxiliar_newclass(lua_State *L, const char *classname, luaL_Reg *func); - void auxiliar_add2group(lua_State *L, const char *classname, const char *group); - void auxiliar_setclass(lua_State *L, const char *classname, int objidx); - void *auxiliar_checkclass(lua_State *L, const char *classname, int objidx); -diff -wbBur luasocket-2.0.2/src/except.c luasocket-2.0.2.my/src/except.c ---- luasocket-2.0.2/src/except.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/except.c 2012-11-14 18:23:23.000000000 +0400 -@@ -21,7 +21,7 @@ - static int do_nothing(lua_State *L); - - /* except functions */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - {"newtry", global_newtry}, - {"protect", global_protect}, - {NULL, NULL} -diff -wbBur luasocket-2.0.2/src/inet.c luasocket-2.0.2.my/src/inet.c ---- luasocket-2.0.2/src/inet.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/inet.c 2012-11-14 18:23:47.000000000 +0400 -@@ -21,7 +21,7 @@ - static int inet_global_gethostname(lua_State *L); - - /* DNS functions */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - { "toip", inet_global_toip }, - { "tohostname", inet_global_tohostname }, - { "gethostname", inet_global_gethostname}, -diff -wbBur luasocket-2.0.2/src/luasocket.c luasocket-2.0.2.my/src/luasocket.c ---- luasocket-2.0.2/src/luasocket.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/luasocket.c 2012-11-14 18:23:26.000000000 +0400 -@@ -47,7 +47,7 @@ - /*-------------------------------------------------------------------------*\ - * Modules and functions - \*-------------------------------------------------------------------------*/ --static const luaL_reg mod[] = { -+static const luaL_Reg mod[] = { - {"auxiliar", auxiliar_open}, - {"except", except_open}, - {"timeout", timeout_open}, -@@ -59,7 +59,7 @@ - {NULL, NULL} - }; - --static luaL_reg func[] = { -+static luaL_Reg func[] = { - {"skip", global_skip}, - {"__unload", global_unload}, - {NULL, NULL} -diff -wbBur luasocket-2.0.2/src/mime.c luasocket-2.0.2.my/src/mime.c ---- luasocket-2.0.2/src/mime.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/mime.c 2012-11-14 18:23:31.000000000 +0400 -@@ -48,7 +48,7 @@ - static size_t qppad(UC *input, size_t size, luaL_Buffer *buffer); - - /* code support functions */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - { "dot", mime_global_dot }, - { "b64", mime_global_b64 }, - { "eol", mime_global_eol }, -diff -wbBur luasocket-2.0.2/src/select.c luasocket-2.0.2.my/src/select.c ---- luasocket-2.0.2/src/select.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/select.c 2012-11-14 18:23:35.000000000 +0400 -@@ -27,7 +27,7 @@ - static int global_select(lua_State *L); - - /* functions in library namespace */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - {"select", global_select}, - {NULL, NULL} - }; -diff -wbBur luasocket-2.0.2/src/tcp.c luasocket-2.0.2.my/src/tcp.c ---- luasocket-2.0.2/src/tcp.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/tcp.c 2012-11-14 18:23:38.000000000 +0400 -@@ -38,7 +38,7 @@ - static int meth_dirty(lua_State *L); - - /* tcp object methods */ --static luaL_reg tcp[] = { -+static luaL_Reg tcp[] = { - {"__gc", meth_close}, - {"__tostring", auxiliar_tostring}, - {"accept", meth_accept}, -@@ -73,7 +73,7 @@ - }; - - /* functions in library namespace */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - {"tcp", global_create}, - {NULL, NULL} - }; -diff -wbBur luasocket-2.0.2/src/timeout.c luasocket-2.0.2.my/src/timeout.c ---- luasocket-2.0.2/src/timeout.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/timeout.c 2012-11-14 18:23:21.000000000 +0400 -@@ -33,7 +33,7 @@ - static int timeout_lua_gettime(lua_State *L); - static int timeout_lua_sleep(lua_State *L); - --static luaL_reg func[] = { -+static luaL_Reg func[] = { - { "gettime", timeout_lua_gettime }, - { "sleep", timeout_lua_sleep }, - { NULL, NULL } -diff -wbBur luasocket-2.0.2/src/udp.c luasocket-2.0.2.my/src/udp.c ---- luasocket-2.0.2/src/udp.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/udp.c 2012-11-14 18:23:44.000000000 +0400 -@@ -43,7 +43,7 @@ - static int meth_dirty(lua_State *L); - - /* udp object methods */ --static luaL_reg udp[] = { -+static luaL_Reg udp[] = { - {"__gc", meth_close}, - {"__tostring", auxiliar_tostring}, - {"close", meth_close}, -@@ -76,7 +76,7 @@ - }; - - /* functions in library namespace */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - {"udp", global_create}, - {NULL, NULL} - }; -diff -wbBur luasocket-2.0.2/src/unix.c luasocket-2.0.2.my/src/unix.c ---- luasocket-2.0.2/src/unix.c 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/src/unix.c 2012-11-14 18:23:17.000000000 +0400 -@@ -39,7 +39,7 @@ - static const char *unix_trybind(p_unix un, const char *path); - - /* unix object methods */ --static luaL_reg un[] = { -+static luaL_Reg un[] = { - {"__gc", meth_close}, - {"__tostring", auxiliar_tostring}, - {"accept", meth_accept}, -@@ -71,7 +71,7 @@ - }; - - /* our socket creation function */ --static luaL_reg func[] = { -+static luaL_Reg func[] = { - {"unix", global_create}, - {NULL, NULL} - }; diff --git a/community/luasocket/luasocket-arch.patch b/community/luasocket/luasocket-arch.patch deleted file mode 100644 index f578831eb..000000000 --- a/community/luasocket/luasocket-arch.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -wbBur luasocket-2.0.2/config luasocket-2.0.2.my/config ---- luasocket-2.0.2/config 2007-10-15 08:21:05.000000000 +0400 -+++ luasocket-2.0.2.my/config 2007-10-15 12:22:16.000000000 +0400 -@@ -30,8 +30,8 @@ - # - #INSTALL_TOP_SHARE=/usr/local/share/lua/5.0 - #INSTALL_TOP_LIB=/usr/local/lib/lua/5.0 --INSTALL_TOP_SHARE=/usr/local/share/lua/5.1 --INSTALL_TOP_LIB=/usr/local/lib/lua/5.1 -+INSTALL_TOP_SHARE=$(DESTDIR)/usr/share/lua/5.1 -+INSTALL_TOP_LIB=$(DESTDIR)/usr/lib/lua/5.1 - - INSTALL_DATA=cp - INSTALL_EXEC=cp diff --git a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch deleted file mode 100644 index 8472a7422..000000000 --- a/community/luminancehdr/luminance-hdr-2.1.0-libraw.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig -+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp -@@ -94,7 +94,6 @@ - RawProcessor.set_progress_handler(cb, callback_data); - int ret; - -- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC; - OUT.output_bps = 16; - - //OUT.gamm[0] = 1/2.4; //sRGB diff --git a/community/luxrender/boost_1.50_fix.diff b/community/luxrender/boost_1.50_fix.diff deleted file mode 100644 index d7231867e..000000000 --- a/community/luxrender/boost_1.50_fix.diff +++ /dev/null @@ -1,131 +0,0 @@ -diff -rup luxrender-lux-008805644181/core/film.cpp luxrender-lux-008805644181.new/core/film.cpp ---- luxrender-lux-008805644181/core/film.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/film.cpp 2012-07-07 15:44:59.867492295 +0200 -@@ -618,7 +618,7 @@ Film::Film(u_int xres, u_int yres, Filte - int yRealHeight = Floor2Int(yPixelStart + .5f + yPixelCount + filter->yWidth) - Floor2Int(yPixelStart + .5f - filter->yWidth); - samplePerPass = xRealWidth * yRealHeight; - -- boost::xtime_get(&creationTime, boost::TIME_UTC); -+ boost::xtime_get(&creationTime, boost::TIME_UTC_); - - //Queryable parameters - AddIntAttribute(*this, "xResolution", "Horizontal resolution (pixels)", &Film::GetXResolution); -@@ -855,7 +855,7 @@ void Film::AddSampleCount(float count) { - if (haltTime > 0) { - // Check if we have met the enough rendering time condition - boost::xtime t; -- boost::xtime_get(&t, boost::TIME_UTC); -+ boost::xtime_get(&t, boost::TIME_UTC_); - if (t.sec - creationTime.sec > haltTime) - enoughSamplesPerPixel = true; - } -diff -rup luxrender-lux-008805644181/core/photonmap.cpp luxrender-lux-008805644181.new/core/photonmap.cpp ---- luxrender-lux-008805644181/core/photonmap.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/photonmap.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -474,13 +474,13 @@ void PhotonMapPreprocess(const RandomGen - - boost::xtime photonShootingStartTime; - boost::xtime lastUpdateTime; -- boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC); -- boost::xtime_get(&lastUpdateTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingStartTime, boost::TIME_UTC_); -+ boost::xtime_get(&lastUpdateTime, boost::TIME_UTC_); - u_int nshot = 0; - while ((!radianceDone || !directDone || !causticDone || !indirectDone) && !scene.terminated) { - // Dade - print some progress information - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - ss.str(""); - ss << "Photon shooting progress: Direct[" << directPhotons.size(); -@@ -686,7 +686,7 @@ void PhotonMapPreprocess(const RandomGen - return; - - boost::xtime photonShootingEndTime; -- boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC); -+ boost::xtime_get(&photonShootingEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Photon shooting done (" << ( photonShootingEndTime.sec - photonShootingStartTime.sec ) << "s)"; - - if (computeRadianceMap) { -@@ -700,7 +700,7 @@ void PhotonMapPreprocess(const RandomGen - for (u_int i = 0; i < radiancePhotons.size(); ++i) { - // Dade - print some progress info - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - if (currentTime.sec - lastUpdateTime.sec > 5) { - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computation progress: " << i << " (" << (100 * i / radiancePhotons.size()) << "%)"; - -@@ -740,7 +740,7 @@ void PhotonMapPreprocess(const RandomGen - - - boost::xtime radianceComputeEndTime; -- boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC); -+ boost::xtime_get(&radianceComputeEndTime, boost::TIME_UTC_); - LOG(LUX_INFO,LUX_NOERROR) << "Radiance photon map computed (" << ( radianceComputeEndTime.sec - photonShootingEndTime.sec ) << "s)"; - } - -diff -rup luxrender-lux-008805644181/core/renderfarm.cpp luxrender-lux-008805644181.new/core/renderfarm.cpp ---- luxrender-lux-008805644181/core/renderfarm.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/core/renderfarm.cpp 2012-07-07 15:44:59.870825579 +0200 -@@ -100,7 +100,7 @@ void FilmUpdaterThread::updateFilm(FilmU - // Dade - thread to update the film with data from servers - - boost::xtime reft; -- boost::xtime_get(&reft, boost::TIME_UTC); -+ boost::xtime_get(&reft, boost::TIME_UTC_); - - while (filmUpdaterThread->signal == SIG_NONE) { - // Dade - check signal every 1 sec -@@ -108,7 +108,7 @@ void FilmUpdaterThread::updateFilm(FilmU - for(;;) { - // Dade - sleep for 1 sec - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - -diff -rup luxrender-lux-008805644181/film/fleximage.cpp luxrender-lux-008805644181.new/film/fleximage.cpp ---- luxrender-lux-008805644181/film/fleximage.cpp 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/film/fleximage.cpp 2012-07-07 15:44:59.877492150 +0200 -@@ -191,7 +191,7 @@ FlexImageFilm::FlexImageFilm(u_int xres, - m_CameraResponseEnabled = d_CameraResponseEnabled = m_CameraResponseFile != ""; - - // init timer -- boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC); -+ boost::xtime_get(&lastWriteImageTime, boost::TIME_UTC_); - lastWriteFLMTime = lastWriteImageTime; - } - -@@ -812,7 +812,7 @@ void FlexImageFilm::CheckWriteOuputInter - { - // Check write output interval - boost::xtime currentTime; -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - bool timeToWriteImage = (currentTime.sec - lastWriteImageTime.sec > writeInterval); - bool timeToWriteFLM = (currentTime.sec - lastWriteFLMTime.sec > flmWriteInterval); - -@@ -834,7 +834,7 @@ void FlexImageFilm::CheckWriteOuputInter - // WriteImage can take a very long time to be executed (i.e. by saving - // the film. It is better to refresh timestamps after the - // execution of WriteImage instead than before. -- boost::xtime_get(¤tTime, boost::TIME_UTC); -+ boost::xtime_get(¤tTime, boost::TIME_UTC_); - - if (timeToWriteImage) - lastWriteImageTime = currentTime; -diff -rup luxrender-lux-008805644181/renderers/sppmrenderer.h luxrender-lux-008805644181.new/renderers/sppmrenderer.h ---- luxrender-lux-008805644181/renderers/sppmrenderer.h 2012-06-02 08:40:33.000000000 +0200 -+++ luxrender-lux-008805644181.new/renderers/sppmrenderer.h 2012-07-07 15:44:59.874158864 +0200 -@@ -126,7 +126,7 @@ public: - { - while (state == PAUSE && !boost::this_thread::interruption_requested()) { - boost::xtime xt; -- boost::xtime_get(&xt, boost::TIME_UTC); -+ boost::xtime_get(&xt, boost::TIME_UTC_); - xt.sec += 1; - boost::thread::sleep(xt); - } diff --git a/community/lxde-common/PKGBUILD b/community/lxde-common/PKGBUILD deleted file mode 100644 index 2bf03bb55..000000000 --- a/community/lxde-common/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 53456 2011-08-03 20:00:26Z angvp $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Maintainer: Juergen Hoetzel <juergen@archlinux.org> - -pkgname=lxde-common -pkgver=0.5.5 -pkgrel=1 -pkgdesc="Common files of the LXDE Desktop" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -groups=('lxde') -depends=('libx11' 'glib2' 'lxde-icon-theme') -url="http://lxde.org/" -# startlxde is useless without lxsession -makedepends=(automake) -optdepends=(lxsession-lite) -backup=(etc/xdg/lxsession/LXDE/{desktop.conf,autostart}) -source=("http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz") -md5sums=('e51a6b2a815a89fda1f497b509465a97') - - -build() { - cd "$srcdir/$pkgname-$pkgver" - autoreconf - ./configure --sysconfdir=/etc --prefix=/usr -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -Dm644 lxde-logout.desktop \ - ${pkgdir}/usr/share/applications/lxde-logout.desktop -} diff --git a/community/lxde-common/lxde-common.install b/community/lxde-common/lxde-common.install deleted file mode 100644 index d2226670d..000000000 --- a/community/lxde-common/lxde-common.install +++ /dev/null @@ -1,13 +0,0 @@ -ICON_PATH=usr/share/icons/nuoveXT2 - -post_install() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - gtk-update-icon-cache -q -t -f ${ICON_PATH} -} diff --git a/community/lxdm/lxdm-daemon b/community/lxdm/lxdm-daemon deleted file mode 100644 index 68eb6225d..000000000 --- a/community/lxdm/lxdm-daemon +++ /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/mac/PKGBUILD b/community/mac/PKGBUILD deleted file mode 100644 index 3e9bef667..000000000 --- a/community/mac/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Maintainer: schuay <jakob.gruber@gmail.com> -# Contributor: stonecrest <stonecrest[at]gmail[dot]com> - -pkgname=mac -pkgver='3.99u4b5' -_pkgver='3.99-u4-b5-s7' -pkgrel=5 -pkgdesc='APE codec and decompressor' -arch=('i686' 'x86_64') -url='http://etree.org/shnutils/shntool/' -license=('custom') -depends=('gcc-libs') -makedepends=('yasm') -_baseurl='http://etree.org/shnutils/shntool/support/formats/ape/unix' -source=("${_baseurl}/${_pkgver}/${pkgname}-${_pkgver}.tar.gz") -md5sums=('74df3c96476636387ddd12255b03bebe') - -build() { - cd "${srcdir}"/${pkgname}-${_pkgver} - - ./configure --prefix=/usr --enable-assembly=yes - make -} -package() { - cd "${srcdir}"/${pkgname}-${_pkgver} - - make DESTDIR="${pkgdir}" install - install -Dm644 src/License.htm \ - "${pkgdir}"/usr/share/licenses/${pkgname}/license.htm -} diff --git a/community/mailman/mailman.rc b/community/mailman/mailman.rc deleted file mode 100644 index 79c1cd661..000000000 --- a/community/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/mailman/rc.mailman b/community/mailman/rc.mailman deleted file mode 100644 index 07660e530..000000000 --- a/community/mailman/rc.mailman +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting mailman Daemon" - /usr/lib/mailman/bin/mailmanctl start &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon mailman - stat_done - fi - ;; - stop) - stat_busy "Stopping mailman Daemon" - /usr/lib/mailman/bin/mailmanctl stop &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon mailman - stat_done - fi - ;; - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/mapnik/gcc47.patch b/community/mapnik/gcc47.patch deleted file mode 100644 index 0532e0c21..000000000 --- a/community/mapnik/gcc47.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- mapnik-0.7.1/include/mapnik/factory.hpp~ 2010-03-22 16:40:04.000000000 +0000 -+++ mapnik-0.7.1/include/mapnik/factory.hpp 2012-04-05 15:55:13.460191219 +0000 -@@ -84,7 +84,7 @@ - { - return (pos->second)(file); - } -- return on_unknown_type(key); -+ return this->on_unknown_type(key); - } - }; - } diff --git a/community/mariadb/mysqld b/community/mariadb/mysqld deleted file mode 100755 index e9fe8f5a8..000000000 --- a/community/mariadb/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting MariaDB Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping MariaDB Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/medit/medit-terminal.patch b/community/medit/medit-terminal.patch deleted file mode 100644 index 434bb4829..000000000 --- a/community/medit/medit-terminal.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- moo/moopython/plugins/terminal.py.org 2011-12-03 13:12:42.000000000 +0100 -+++ moo/moopython/plugins/terminal.py 2011-12-03 13:15:19.000000000 +0100 -@@ -60,8 +60,8 @@ - moo.prefs_set_string(COLOR_SCHEME_KEY, None) - - def font_item_activated(self, *whatever): -- dlg = moo.FontSelectionDialog(D_("Pick a Font", "gtk20")) -- dlg.fontsel.set_property('monospace', True) -+ dlg = gtk.FontSelectionDialog(D_("Pick a Font", "gtk20")) -+ # dlg.fontsel.set_property('monospace', True) - old_font = self.get_font() - if old_font: - dlg.set_font_name(old_font.to_string()) diff --git a/community/mednafen/ChangeLog b/community/mednafen/ChangeLog deleted file mode 100644 index 54b01d58f..000000000 --- a/community/mednafen/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2012-02-23 Allan McRae <allan@archlinux.org> - * Rebuild for libcdio soname bumps - -2011-05-17 Angel Velasquez <angvp@archlinux.org> - * Updated to 0.8.D.3 - * Removed fix_build patch - * Cleaned PKGBUILD - * Adding ChangeLog - diff --git a/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch b/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch deleted file mode 100644 index 9437f76ce..000000000 --- a/community/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- mednafen.orig/src/file.cpp -+++ mednafen/src/file.cpp -@@ -229,7 +229,7 @@ - goto doret; - } - -- while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0) -+ while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0) - { - cur_size += howmany; - cur_alloced <<= 1; -@@ -282,7 +282,7 @@ - } - else if(type == MDFN_FILETYPE_GZIP) - { -- gzclose(tz); -+ gzclose((gzFile)tz); - } - else if(type == MDFN_FILETYPE_ZIP) - { -@@ -444,7 +444,7 @@ - - if(!(fceufp = MakeMemWrap(t, 1))) - { -- gzclose(t); -+ gzclose((gzFile)t); - return(0); - } - diff --git a/community/midori/0.4.7-private-mode.patch b/community/midori/0.4.7-private-mode.patch deleted file mode 100644 index 599780b78..000000000 --- a/community/midori/0.4.7-private-mode.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -aur midori-0.4.7/katze/midori-paths.vala midori-0.4.7.patch/katze/midori-paths.vala ---- midori-0.4.7/katze/midori-paths.vala 2012-09-19 23:17:43.000000000 +0200 -+++ midori-0.4.7.patch/katze/midori-paths.vala 2012-09-24 20:36:04.585209437 +0200 -@@ -74,7 +74,7 @@ - else if (mode == RuntimeMode.PRIVATE || mode == RuntimeMode.APP) { - /* Use mock folders in development builds */ - if ("." in MIDORI_VERSION_SUFFIX) -- config_dir = cache_dir = user_data_dir = config_base; -+ config_dir = cache_dir = user_data_dir = config_base ?? Path.DIR_SEPARATOR_S; - else - config_dir = cache_dir = user_data_dir = "/"; - readonly_dir = config_base ?? Path.build_path (Path.DIR_SEPARATOR_S, diff --git a/community/midori/0001-Fix-libsoup-version-check-defines.patch b/community/midori/0001-Fix-libsoup-version-check-defines.patch deleted file mode 100644 index 2debc92fe..000000000 --- a/community/midori/0001-Fix-libsoup-version-check-defines.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c7c172f7ffc9316be5954c920654e1deb9f470b7 Mon Sep 17 00:00:00 2001 -From: Christian Dywan <christian@twotoasts.de> -Date: Mon, 16 Apr 2012 17:17:23 +0000 -Subject: Fix libsoup version check #defines - -Fixes: https://bugs.launchpad.net/midori/+bug/983137 ---- -diff --git a/wscript b/wscript -index db74324..c7a0c87 100644 ---- a/wscript -+++ b/wscript -@@ -260,11 +260,11 @@ def configure (conf): - check_pkg ('libsoup-2.4', '2.27.90') - conf.define ('LIBSOUP_VERSION', conf.check_cfg (modversion='libsoup-2.4')) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 3): -- conf.define ('LIBSOUP_2_29_3', 1) -+ conf.define ('HAVE_LIBSOUP_2_29_3', 1) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 29, 91): -- conf.define ('LIBSOUP_2_29_91', 1) -+ conf.define ('HAVE_LIBSOUP_2_29_91', 1) - if check_version (conf.env['LIBSOUP_VERSION'], 2, 37, 1): -- conf.define ('LIBSOUP_2_37_1', 1) -+ conf.define ('HAVE_LIBSOUP_2_37_1', 1) - check_pkg ('libxml-2.0', '2.6') - check_pkg ('sqlite3', '3.0', True, var='SQLITE') - --- -cgit v0.9.0.3 diff --git a/community/midori/webkit_search.diff b/community/midori/webkit_search.diff deleted file mode 100644 index 620cdc96f..000000000 --- a/community/midori/webkit_search.diff +++ /dev/null @@ -1,59 +0,0 @@ -From 648d869e4ff69f121da97484a0fd553b005ca751 Mon Sep 17 00:00:00 2001 -From: Christian Dywan <christian@twotoasts.de> -Date: Wed, 21 Sep 2011 21:50:51 +0000 -Subject: Use DOM API to get selected text in WebKitGTK+ 1.5.1 - -Fixes: https://bugs.launchpad.net/midori/+bug/799603 ---- -diff --git a/midori/midori-view.c b/midori/midori-view.c -index 0d7a96e..e426e7f 100644 ---- a/midori/midori-view.c -+++ b/midori/midori-view.c -@@ -39,9 +39,11 @@ - #include <sys/utsname.h> - #endif - -+#if !WEBKIT_CHECK_VERSION (1, 5, 1) - /* This is unstable API, so we need to declare it */ - gchar* - webkit_web_view_get_selected_text (WebKitWebView* web_view); -+#endif - - static void - midori_view_construct_web_view (MidoriView* view); -@@ -4167,10 +4169,33 @@ midori_view_get_link_uri (MidoriView* view) - gboolean - midori_view_has_selection (MidoriView* view) - { -+#if WEBKIT_CHECK_VERSION (1, 5, 1) -+ WebKitDOMDocument* doc; -+ WebKitDOMDOMWindow* window; -+ WebKitDOMDOMSelection* selection; -+ WebKitDOMRange* range; -+#endif -+ - g_return_val_if_fail (MIDORI_IS_VIEW (view), FALSE); - -+ -+#if WEBKIT_CHECK_VERSION (1, 5, 1) -+ doc = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view->web_view)); -+ window = webkit_dom_document_get_default_view (doc); -+ selection = webkit_dom_dom_window_get_selection (window); -+ if (selection == NULL) -+ return FALSE; -+ -+ range = webkit_dom_dom_selection_get_range_at (selection, 0, NULL); -+ if (range == NULL) -+ return FALSE; -+ -+ katze_assign (view->selected_text, webkit_dom_range_get_text (range)); -+#else - katze_assign (view->selected_text, webkit_web_view_get_selected_text ( - WEBKIT_WEB_VIEW (view->web_view))); -+#endif -+ - if (view->selected_text && *view->selected_text) - return TRUE; - else --- -cgit diff --git a/community/milkytracker/milkytracker.desktop b/community/milkytracker/milkytracker.desktop deleted file mode 100644 index 0309121cc..000000000 --- a/community/milkytracker/milkytracker.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=MilkyTracker -Type=Application -Comment=FastTracker 2 inspired music tracker -Exec=milkytracker -TryExec=milkytracker -Icon=milkytracker.png -Categories=AudioVideo;Audio;AudioVideoEditing; diff --git a/community/minidlna/ffmpeg-compat.patch b/community/minidlna/ffmpeg-compat.patch deleted file mode 100644 index aa6f982e5..000000000 --- a/community/minidlna/ffmpeg-compat.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -wbBur minidlna-1.0.24/genconfig.sh minidlna-1.0.24.my/genconfig.sh ---- minidlna-1.0.24/genconfig.sh 2012-01-21 04:34:13.000000000 +0400 -+++ minidlna-1.0.24.my/genconfig.sh 2012-07-09 09:51:09.000000000 +0400 -@@ -47,15 +47,15 @@ - [ ! -e "/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" - [ ! -e "/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" - [ ! -e "/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" --[ ! -e "/usr/include/ffmpeg/avutil.h" -a \ -+[ ! -e "/usr/include/ffmpeg-compat/avutil.h" -a \ - ! -e "/usr/include/libavutil/avutil.h" -a \ -- ! -e "/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" --[ ! -e "/usr/include/ffmpeg/avformat.h" -a \ -+ ! -e "/usr/include/ffmpeg-compat/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" -+[ ! -e "/usr/include/ffmpeg-compat/avformat.h" -a \ - ! -e "/usr/include/libavformat/avformat.h" -a \ -- ! -e "/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" --[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ -+ ! -e "/usr/include/ffmpeg-compat/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" -+[ ! -e "/usr/include/ffmpeg-compat/avcodec.h" -a \ - ! -e "/usr/include/libavcodec/avcodec.h" -a \ -- ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" -+ ! -e "/usr/include/ffmpeg-compat/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" - if [ -n "$MISSING" ]; then - echo -e "\nERROR! Cannot continue." - echo -e "The following required libraries are either missing, or are missing development headers:\n" -diff -wbBur minidlna-1.0.24/Makefile minidlna-1.0.24.my/Makefile ---- minidlna-1.0.24/Makefile 2012-01-18 02:49:01.000000000 +0400 -+++ minidlna-1.0.24.my/Makefile 2012-07-09 10:01:10.000000000 +0400 -@@ -13,9 +13,9 @@ - #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG - #CFLAGS = -Wall -g -Os -D_GNU_SOURCE - CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ -- -I/usr/include/ffmpeg \ -- -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ -- -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat -+ -I/usr/include/ffmpeg-compat \ -+ -I/usr/include/ffmpeg-compat/libavutil -I/usr/include/ffmpeg-compat/libavcodec -I/usr/include/ffmpeg-compat/libavformat -+LDFLAGS+= -L/usr/lib/ffmpeg-compat -Wl,-rpath -Wl,/usr/lib/ffmpeg-compat - #STATIC_LINKING: CFLAGS += -DSTATIC - #STATIC_LINKING: LDFLAGS = -static - CC = gcc -@@ -64,7 +64,7 @@ - $(INSTALL) -d $(ETCINSTALLDIR) - $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) - --minidlna: $(BASEOBJS) $(LNXOBJS) $(LIBS) -+minidlna: $(BASEOBJS) $(LNXOBJS) - @echo Linking $@ - @$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(BASEOBJS) $(LNXOBJS) $(LIBS) - diff --git a/community/minidlna/ffmpeg_0.11.diff b/community/minidlna/ffmpeg_0.11.diff deleted file mode 100644 index f43831add..000000000 --- a/community/minidlna/ffmpeg_0.11.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -rup minidlna-1.0.24/metadata.c minidlna-1.0.24.new/metadata.c ---- minidlna-1.0.24/metadata.c 2012-02-14 19:44:56.000000000 +0100 -+++ minidlna-1.0.24.new/metadata.c 2012-07-10 10:28:01.373163002 +0200 -@@ -1514,10 +1548,10 @@ GetVideoMetadata(const char * path, char - { - if( ctx->metadata ) - { -- AVMetadataTag *tag = NULL; -+ AVDictionaryEntry *tag = NULL; - - //DEBUG DPRINTF(E_DEBUG, L_METADATA, "Metadata:\n"); -- while( (tag = av_metadata_get(ctx->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX)) ) -+ while( (tag = av_dict_get(ctx->metadata, "", tag, AV_DICT_IGNORE_SUFFIX)) ) - { - //DEBUG DPRINTF(E_DEBUG, L_METADATA, " %-16s: %s\n", tag->key, tag->value); - if( strcmp(tag->key, "title") == 0 ) diff --git a/community/minidlna/minidlna.conf b/community/minidlna/minidlna.conf deleted file mode 100644 index 98be33c0d..000000000 --- a/community/minidlna/minidlna.conf +++ /dev/null @@ -1,4 +0,0 @@ -# systemd tmpfile settings for minidlna -# See tmpfiles.d(5) for details - -d /var/run/minidlna 0755 nobody nobody - diff --git a/community/minitube/fix-build.patch b/community/minitube/fix-build.patch deleted file mode 100644 index 9ac61d21b..000000000 --- a/community/minitube/fix-build.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- minitube/src/qtsingleapplication/qtlocalpeer.cpp~ 2012-06-29 18:13:35.133070928 +0000 -+++ minitube/src/qtsingleapplication/qtlocalpeer.cpp 2012-06-29 18:14:16.359420453 +0000 -@@ -57,6 +57,8 @@ - static PProcessIdToSessionId pProcessIdToSessionId = 0; - #endif - #if defined(Q_OS_UNIX) -+#include <sys/types.h> -+#include <unistd.h> - #include <time.h> - #endif - diff --git a/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch b/community/mongodb/0001-Backport-for-mongodb-2.0.4-Ignore-fork-and-logpath-w.patch deleted file mode 100644 index 40dd48b42..000000000 --- a/community/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/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch b/community/mongodb/0002-Backport-for-mongodb-2.0.4-Don-t-check-proc-pid-exe-.patch deleted file mode 100644 index aff066450..000000000 --- a/community/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/mongodb/boost-1.50.patch b/community/mongodb/boost-1.50.patch deleted file mode 100644 index 4ccb898ec..000000000 --- a/community/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/mp3splt-gtk/mp3splt-gtk.desktop b/community/mp3splt-gtk/mp3splt-gtk.desktop deleted file mode 100644 index 3862295bf..000000000 --- a/community/mp3splt-gtk/mp3splt-gtk.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Mp3splt-gtk audio splitter -GenericName=Sound Splitter -Comment=Split mp3 and ogg files without decoding -Comment[cs]=Rozdělit mp3 a ogg soubory bez dekódování -Icon=mp3splt-gtk_ico -Exec=mp3splt-gtk -StartupNotify=false -Terminal=false -Categories=Audio;AudioVideo;AudioVideoEditing; -MimeType=application/ogg;audio/x-mp3; - diff --git a/community/mpdscribble/mpdscribble b/community/mpdscribble/mpdscribble deleted file mode 100644 index 8071c0dbe..000000000 --- a/community/mpdscribble/mpdscribble +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/mpdscribble` -case "$1" in - start) - stat_busy "Starting mpdscribble" - [ -z "$PID" ] && /usr/bin/mpdscribble & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/mpdscribble.pid - add_daemon mpdscribble - stat_done - fi - ;; - stop) - stat_busy "Stopping mpdscribble" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/mpdscribble.pid - rm_daemon mpdscribble - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/mpdscribble/rc.d b/community/mpdscribble/rc.d deleted file mode 100644 index 8071c0dbe..000000000 --- a/community/mpdscribble/rc.d +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/mpdscribble` -case "$1" in - start) - stat_busy "Starting mpdscribble" - [ -z "$PID" ] && /usr/bin/mpdscribble & - if [ $? -gt 0 ]; then - stat_fail - else - echo $PID > /var/run/mpdscribble.pid - add_daemon mpdscribble - stat_done - fi - ;; - stop) - stat_busy "Stopping mpdscribble" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm /var/run/mpdscribble.pid - rm_daemon mpdscribble - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac diff --git a/community/mplayer-vaapi/PKGBUILD b/community/mplayer-vaapi/PKGBUILD deleted file mode 100644 index ddc3302cb..000000000 --- a/community/mplayer-vaapi/PKGBUILD +++ /dev/null @@ -1,74 +0,0 @@ -# $Id: PKGBUILD 80155 2012-11-16 23:35:57Z ioni $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Ionut Biru <ibiru@archlinux.org> -# Contributor: Hugo Doria <hugo@archlinux.org> - -pkgname=mplayer-vaapi -pkgver=35107 -pkgrel=3 -pkgdesc="A movie player, compiled with vaapi support" -arch=('i686' 'x86_64') -url="http://gitorious.org/vaapi/mplayer" -license=('GPL') -depends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libcdio' 'libxinerama' 'sdl' - 'lame' 'fontconfig' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'glu' - 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faac' 'faad2' - 'lirc-utils' 'ttf-dejavu' 'libxvmc' 'enca' 'opencore-amr' 'libdca' - 'a52dec' 'schroedinger' 'mpg123' 'libvpx' 'libpulse' 'fribidi' - 'libbluray' 'libva' 'libass' 'desktop-file-utils') -makedepends=('unzip' 'live-media' 'yasm' 'ladspa' 'git' 'mesa') -provides=("mplayer=$pkgver") -conflicts=('mplayer') -backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf') -source=(http://pkgbuild.com/~foutrelis/mplayer-vaapi-$pkgver.tar.xz - tweak-desktop-file.patch) -options=('!buildflags' '!emptydirs') -install=mplayer-vaapi.install -sha256sums=('a6c645625cc2cd6ca48764db302c926049f831e757857ece351b37b674e05e56' - '5a09fb462729a4e573568f9e8c1f57dbe7f69c0b68cfa4f6d70b3e52c450d93b') - -build() { - cd "$srcdir/mplayer-vaapi-$pkgver" - - patch -d etc -Np0 -i "$srcdir/tweak-desktop-file.patch" - - ./configure \ - --prefix=/usr \ - --enable-runtime-cpudetection \ - --disable-gui \ - --disable-arts \ - --disable-liblzo \ - --disable-speex \ - --disable-cdparanoia \ - --disable-openal \ - --disable-libdv \ - --disable-musepack \ - --disable-esd \ - --disable-mga \ - --disable-ass-internal \ - --enable-xvmc \ - --enable-radio \ - --enable-radio-capture \ - --disable-vdpau \ - --enable-vaapi \ - --language=all \ - --confdir=/etc/mplayer - - [[ $CARCH == i686 ]] && sed -i 's|-march=i486|-march=i686|g' config.mak - - make -} - -package() { - cd "$srcdir/mplayer-vaapi-$pkgver" - - make DESTDIR="$pkgdir" install-mplayer install-mplayer-man - install -Dm644 etc/{codecs.conf,input.conf,example.conf} "$pkgdir/etc/mplayer/" - install -Dm644 etc/mplayer.desktop "$pkgdir/usr/share/applications/mplayer.desktop" - install -d "$pkgdir/usr/share/mplayer/" - ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "$pkgdir/usr/share/mplayer/subfont.ttf" - rm -rf "$pkgdir/usr/share/mplayer/font" - install -Dm644 etc/mplayer256x256.png "$pkgdir/usr/share/pixmaps/mplayer.png" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/mplayer-vaapi/mplayer-vaapi.install b/community/mplayer-vaapi/mplayer-vaapi.install deleted file mode 100644 index a44f19aef..000000000 --- a/community/mplayer-vaapi/mplayer-vaapi.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - update-desktop-database -q -} -post_upgrade() { - post_install -} -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/mplayer-vaapi/tweak-desktop-file.patch b/community/mplayer-vaapi/tweak-desktop-file.patch deleted file mode 100644 index 606e356b0..000000000 --- a/community/mplayer-vaapi/tweak-desktop-file.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- mplayer.desktop.orig 2012-07-08 22:18:27.000000000 +0300 -+++ mplayer.desktop 2012-07-08 22:19:08.000000000 +0300 -@@ -23,8 +23,9 @@ Comment[fr]=Lit les films et musiques - Comment[it]=Riproduce filmati e musica - Comment[ja]=動画や音声のファイルを再生します - Icon=mplayer --TryExec=gmplayer --Exec=gmplayer %F -+TryExec=mplayer -+Exec=mplayer -really-quiet %F - Terminal=false -+NoDisplay=true - Categories=GTK;AudioVideo;Audio;Video;Player;TV; - MimeType=application/mxf;application/x-netshow-channel;application/ogg;application/ram;application/vnd.rn-realmedia;application/x-shockwave-flash;application/smil;audio/ac3;audio/x-adpcm;audio/x-aiff;audio/AMR;audio/AMR-WB;audio/x-ape;audio/basic;audio/flac;audio/x-flac;audio/x-flac+ogg;audio/x-m4b;audio/x-matroska;audio/mp2;audio/mp4;audio/mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/ogg;audio/vnd.rn-realaudio;audio/x-scpls;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;video/3gpp;video/3gpp2;video/dv;video/x-flic;video/x-flv;video/x-matroska;video/mp2t;video/mp4;video/mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;video/x-nsv;video/ogg;video/x-ogm+ogg;video/quicktime;video/vnd.rn-realvideo;video/x-theora+ogg;video/webm; diff --git a/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch b/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch deleted file mode 100644 index a50161305..000000000 --- a/community/mplayer2/mplayer2-20120729-fix-vf_lavc-compilation.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f5e0365c8e76e2ef797027134f1819e613764d7e Mon Sep 17 00:00:00 2001 -From: Anton Khirnov <anton@khirnov.net> -Date: Wed, 19 Sep 2012 12:00:01 +0000 -Subject: vf_lavc: fix compilation with latest libav - -Remove a pointless and broken check for avctx->codec->encode. - -1) The check does not test for anything useful. -2) AVCodecContext.encode is a private field and is not supposed to be - accessed from outside of lavc. -2a) AVCodecContext.encode does not exist anymore in latest libavcodec, - so this block fails to build. ---- -diff --git a/libmpcodecs/vf_lavc.c b/libmpcodecs/vf_lavc.c -index b2c1dd7..65e93a1 100644 ---- a/libmpcodecs/vf_lavc.c -+++ b/libmpcodecs/vf_lavc.c -@@ -76,11 +76,6 @@ static int config(struct vf_instance *vf, - return 0; - } - -- if (lavc_venc_context.codec->encode == NULL) { -- mp_msg(MSGT_VFILTER,MSGL_ERR,"avcodec init failed (ctx->codec->encode == NULL)!\n"); -- return 0; -- } -- - return vf_next_config(vf,width,height,d_width,d_height,flags,IMGFMT_MPEGPES); - } - --- -cgit v0.9 diff --git a/community/mplayer2/mplayer2-20120729-libquvi-support.patch b/community/mplayer2/mplayer2-20120729-libquvi-support.patch deleted file mode 100644 index f27fa690d..000000000 --- a/community/mplayer2/mplayer2-20120729-libquvi-support.patch +++ /dev/null @@ -1,277 +0,0 @@ -From 37c124805c00ae0f2570c95f9543e39ce69793a6 Mon Sep 17 00:00:00 2001 -From: wm4 <wm4@mplayer2.org> -Date: Fri, 02 Mar 2012 19:24:34 +0000 -Subject: quvi: Add support for streaming sites using libquvi - -This enables playing URLs from libquvi supported streaming sites -directly, e.g. "mplayer http://www.youtube.com/watch?v=...." - -Anything opened with mplayer is checked with libquvi. If it looks like -a URL of a supported streaming site, libquvi is used to extract the -media URL, which is then passed to the lower level mplayer code -instead of the HTML URL. Hopefully the libquvi URL checker works well -enough that it doesn't cause any problems with normal URLs, files, or -whatever else mplayer's stream layer accepts. - -Add the --quvi-format option. The option value is directly passed -to libquvi as requested format. The only values that seem to work for -any streaming site seem to be "best" (best quality) and "default" -(lowest quality). The mplayer option defaults to "best" (overriding -libquvi's default). - -Outstanding issues: -- Does libquvi checking every opened file really not cause problems? - Should there be a runtime option to disable libquvi use? - (Probably not an issue.) -- Should we check/set the supported protocol? By default libquvi has - support for all protocols enabled. In the worst case, it might - return an URL using a protocol not supported by mplayer, even though - it could extract URLs with other protocols too. - (Probably not an issue.) -- Somehow export metadata (like media title) to the mplayer frontend? ---- -diff --git a/cfg-mplayer.h b/cfg-mplayer.h -index 5440de9..d8d556a 100644 ---- a/cfg-mplayer.h -+++ b/cfg-mplayer.h -@@ -517,6 +517,8 @@ const m_option_t common_opts[] = { - - OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0), - -+ OPT_STRING("quvi-format", quvi_format, 0), -+ - { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - -diff --git a/configure b/configure -index 5c1e288..18bc404 100755 ---- a/configure -+++ b/configure -@@ -335,6 +335,7 @@ Optional features: - --enable-winsock2_h enable winsock2_h [autodetect] - --enable-smb enable Samba (SMB) input [autodetect] - --enable-live enable LIVE555 Streaming Media [disable] -+ --enable-libquvi enable libquvi [autodetect] - --enable-nemesi enable Nemesi Streaming Media [autodetect] - --disable-vcd disable VCD support [autodetect] - --disable-bluray disable Blu-ray support [autodetect] -@@ -650,6 +651,7 @@ _pvr=auto - networking=yes - _winsock2_h=auto - _smb=auto -+_libquvi=auto - _joystick=no - _xvid=auto - _libnut=auto -@@ -1009,6 +1011,8 @@ for ac_option do - --disable-winsock2_h) _winsock2_h=no ;; - --enable-smb) _smb=yes ;; - --disable-smb) _smb=no ;; -+ --enable-libquvi) _libquvi=yes ;; -+ --disable-libquvi) _libquvi=no ;; - --enable-joystick) _joystick=yes ;; - --disable-joystick) _joystick=no ;; - --enable-xvid) _xvid=yes ;; -@@ -3610,6 +3614,19 @@ else - fi - echores "$_smb" - -+echocheck "libquvi support" -+if test "$_libquvi" = auto ; then -+ _libquvi=no -+ if pkg_config_add libquvi ; then -+ _libquvi=yes -+ fi -+fi -+if test "$_libquvi" = yes; then -+ def_libquvi="#define CONFIG_LIBQUVI 1" -+else -+ def_libquvi="#undef CONFIG_LIBQUVI" -+fi -+echores "$_libquvi" - - ######### - # VIDEO # -@@ -6325,6 +6342,7 @@ LIBNEMESI = $_nemesi - LIBNUT = $_libnut - LIBPOSTPROC = $libpostproc - LIBSMBCLIENT = $_smb -+LIBQUVI = $_libquvi - LIBTHEORA = $_theora - LIRC = $_lirc - LIVE555 = $_live -@@ -6668,6 +6686,7 @@ $def_live - $def_nemesi - $def_networking - $def_smb -+$def_libquvi - $def_socklen_t - $def_vstream - -diff --git a/options.h b/options.h -index 48f5c53..89324bd 100644 ---- a/options.h -+++ b/options.h -@@ -78,6 +78,7 @@ typedef struct MPOpts { - char **audio_lang; - char **sub_lang; - int hr_mp3_seek; -+ char *quvi_format; - - char *audio_stream; - int audio_stream_cache; -diff --git a/stream/open.c b/stream/open.c -index ce0a415..91e9ae2 100644 ---- a/stream/open.c -+++ b/stream/open.c -@@ -26,12 +26,14 @@ - - #include "config.h" - #include "mp_msg.h" -+#include "talloc.h" - - #ifdef __FreeBSD__ - #include <sys/cdrio.h> - #endif - - #include "m_option.h" -+#include "options.h" - #include "stream.h" - #include "libmpdemux/demuxer.h" - -@@ -42,6 +44,62 @@ char* cdrom_device=NULL; - char* dvd_device=NULL; - int dvd_title=0; - -+#ifdef CONFIG_LIBQUVI -+ -+#include <quvi/quvi.h> -+ -+static const char *resolve_quvi(const char *url, struct MPOpts *opts) -+{ -+ char *media_title, *media_url; -+ quvi_media_t m; -+ QUVIcode rc; -+ quvi_t q; -+ -+ rc = quvi_init(&q); -+ if (rc != QUVI_OK) -+ return NULL; -+ -+ // Don't try to use quvi on an URL that's not directly supported, since -+ // quvi will do a network access anyway in order to check for HTTP -+ // redirections etc. -+ // The documentation says this will fail on "shortened" URLs. -+ if (quvi_supported(q, (char *)url) != QUVI_OK) { -+ quvi_close(&q); -+ return NULL; -+ } -+ -+ mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Checking URL...\n"); -+ -+ // Can use quvi_query_formats() to get a list of formats like this: -+ // "fmt05_240p|fmt18_360p|fmt34_360p|fmt35_480p|fmt43_360p|fmt44_480p" -+ // (This example is youtube specific.) -+ // That call requires an extra net access. quvi_next_media_url() doesn't -+ // seem to do anything useful. So we can't really do anything useful -+ // except pass through the user's format setting. -+ quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format -+ ? opts->quvi_format : "best"); -+ -+ rc = quvi_parse(q, (char *)url, &m); -+ if (rc != QUVI_OK) { -+ mp_msg(MSGT_OPEN, MSGL_ERR, "[quvi] %s\n", quvi_strerror(q, rc)); -+ quvi_close(&q); -+ return NULL; -+ } -+ -+ quvi_getprop(m, QUVIPROP_PAGETITLE, &media_title); -+ quvi_getprop(m, QUVIPROP_MEDIAURL, &media_url); -+ -+ mp_msg(MSGT_OPEN, MSGL_INFO, "[quvi] Site media title: '%s'\n", -+ media_title); -+ media_url = talloc_strdup(NULL, media_url); -+ -+ quvi_parse_close(&m); -+ quvi_close(&q); -+ -+ return media_url; -+} -+#endif -+ - // Open a new stream (stdin/file/vcd/url) - - stream_t* open_stream(const char *filename, struct MPOpts *options, -@@ -59,7 +117,16 @@ if(!filename) { - return NULL; - } - --//============ Open STDIN or plain FILE ============ -+ const char *resolved = NULL; -+ -+#ifdef CONFIG_LIBQUVI -+ resolved = resolve_quvi(filename, options); -+#endif -+ -+ if (resolved) -+ filename = resolved; - -- return open_stream_full(filename,STREAM_READ,options,file_format); -+ stream_t *res = open_stream_full(filename,STREAM_READ,options,file_format); -+ talloc_free((void *)resolved); -+ return res; - } --- -cgit v0.9 -From 86f7fe1ba61a465fb25bc30deaaa4fcf12600a43 Mon Sep 17 00:00:00 2001 -From: wm4 <wm4@nowhere> -Date: Sun, 02 Sep 2012 18:45:11 +0000 -Subject: configure: add version check for libquvi - -I do not know what exactly is the minimum working version. Require the -latest version currently released, which is about half a year old. ---- -diff --git a/configure b/configure -index 2cf7aff..6a3298f 100755 ---- a/configure -+++ b/configure -@@ -3445,7 +3445,7 @@ echores "$_smb" - echocheck "libquvi support" - if test "$_libquvi" = auto ; then - _libquvi=no -- if pkg_config_add libquvi ; then -+ if pkg_config_add 'libquvi >= 0.4.1' ; then - _libquvi=yes - fi - fi --- -cgit v0.9 -diff --git a/cfg-mplayer.h b/cfg-mplayer.h -index b889661..8b07091 100644 ---- a/cfg-mplayer.h -+++ b/cfg-mplayer.h -@@ -485,7 +485,7 @@ const m_option_t common_opts[] = { - - OPT_MAKE_FLAGS("hr-mp3-seek", hr_mp3_seek, 0), - -- OPT_STRING("quvi-format", quvi_format, 0), -+ OPT_STRING("quvi-format", quvi_format, 0, OPTDEF_STR("best")), - - { "rawaudio", (void *)&demux_rawaudio_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, - { "rawvideo", (void *)&demux_rawvideo_opts, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL}, -diff --git a/stream/open.c b/stream/open.c -index 91e9ae2..16d0dc3 100644 ---- a/stream/open.c -+++ b/stream/open.c -@@ -76,8 +76,7 @@ static const char *resolve_quvi(const char *url, struct MPOpts *opts) - // That call requires an extra net access. quvi_next_media_url() doesn't - // seem to do anything useful. So we can't really do anything useful - // except pass through the user's format setting. -- quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format -- ? opts->quvi_format : "best"); -+ quvi_setopt(q, QUVIOPT_FORMAT, opts->quvi_format); - - rc = quvi_parse(q, (char *)url, &m); - if (rc != QUVI_OK) { --- -cgit v0.9 diff --git a/community/multipath-tools/PKGBUILD b/community/multipath-tools/PKGBUILD deleted file mode 100644 index fb733c493..000000000 --- a/community/multipath-tools/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 81789 2012-12-30 08:24:14Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor: Thomas S Hatch <thatch45 ar gmail dot com> -# Contributor: Michael P <ptchinster@archlinux.us> -# Contributor: Matt Heagney <matt@heagney.com> - -pkgname=multipath-tools -pkgver=0.4.9 -pkgrel=12 -pkgdesc='Multipath tools for Linux' -arch=('i686' 'x86_64' 'mips64el') -url="http://christophe.varoqui.free.fr/" -license=('GPL') -depends=('bash' 'libaio' 'device-mapper') -backup=('etc/multipath.conf' 'etc/multipath.conf.annotated') -install=multipath-tools.install -options=(!emptydirs) -source=(http://christophe.varoqui.free.fr/multipath-tools/$pkgname-$pkgver.tar.bz2 - rc.d service multipath.conf multipath.conf.annotated - fix-build.patch buffer-overflows.patch log_enquery_overflow.patch - blacklist-cciss-devices.patch explicitly-include-posix_types.h.patch) -md5sums=('a6d4b48afc28f1f50f5ee4b1b06d2765' - '7c04ef96441363b0d43a2ebb13a87659' - '4843e91a83660e4b3acfb2d804fa344e' - '9324ff0ba8330dcb21b2fcf64988026f' - 'be11462922eeeb9fcd2ba5f3f137b7d9' - '885c0ba9c90b73cc93aa3f78005f81d6' - 'c5aab36777b0304a3525533cdd31bddc' - '00eae05e02f1b85062e998574ab1b833' - '61b4038c4c145ca52e836145ea6bdd6c' - 'd99beb6d8a9b84f90125c7cacf8a6006') - -build() { - patch -Np1 -i fix-build.patch - patch -Np1 -i buffer-overflows.patch - patch -Np1 -i log_enquery_overflow.patch - patch -Np1 -i blacklist-cciss-devices.patch - patch -Np1 -i explicitly-include-posix_types.h.patch - - # Needs to be fixed upstream. Refer to - # https://bbs.archlinux.org/viewtopic.php?pid=793814#p793814 - export LDFLAGS=${LDFLAGS/-Wl,--as-needed} - - make LIB='usr/lib' -} - -package() { - make LIB='usr/lib' \ - DESTDIR="$pkgdir" \ - bindir='/usr/bin' \ - libudevdir='/usr/lib/udev' install - - install -Dm644 multipath.conf "$pkgdir"/etc/multipath.conf - install -Dm644 multipath.conf.annotated "$pkgdir"/etc/multipath.conf.annotated - install -Dm755 rc.d "$pkgdir"/etc/rc.d/multipathd - install -Dm644 service "$pkgdir"/usr/lib/systemd/system/multipathd.service - - sed -i 's/sbin/bin/g' "$pkgdir"/usr/lib/udev/rules.d/*.rules -} diff --git a/community/multipath-tools/blacklist-cciss-devices.patch b/community/multipath-tools/blacklist-cciss-devices.patch deleted file mode 100644 index 497121c36..000000000 --- a/community/multipath-tools/blacklist-cciss-devices.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Fri, 3 Oct 2008 12:39:48 +0200 -Subject: [PATCH] blacklist cciss devices - -cciss support isn't complete in 0.4.8 and the half functioning causes -problems in d-i among other things. -Closes: #500991 ---- - libmultipath/blacklist.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c -index f369517..2e5efc8 100644 ---- a/libmultipath/blacklist.c -+++ b/libmultipath/blacklist.c -@@ -121,6 +121,12 @@ setup_default_blist (struct config * conf) - if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) - return 1; - -+ str = STRDUP("^cciss!c[0-9]d[0-9]*"); -+ if (!str) -+ return 1; -+ if (store_ble(conf->blist_devnode, str, ORIGIN_DEFAULT)) -+ return 1; -+ - vector_foreach_slot (conf->hwtable, hwe, i) { - if (hwe->bl_product) { - if (alloc_ble_device(conf->blist_device)) --- diff --git a/community/multipath-tools/buffer-overflows.patch b/community/multipath-tools/buffer-overflows.patch deleted file mode 100644 index 38719aceb..000000000 --- a/community/multipath-tools/buffer-overflows.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c 2010-11-28 12:22:12.037228583 -0800 -@@ -94,7 +94,7 @@ - if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK) - return 0; - -- snprintf(vendor, 9, "%.8s\n", inqBuffp + 8); -+ snprintf(vendor, 8, "%.8s\n", inqBuffp + 8); - snprintf(product, 17, "%.16s", inqBuffp + 16); - snprintf(luname, 21, "%.19s", inqBuffp + 36); - snprintf(wwpn, 17, "%.16s", inqBuffp + 96); ---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c 2010-05-22 05:01:58.000000000 -0700 -+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c 2010-11-28 12:22:44.199483997 -0800 -@@ -123,7 +123,7 @@ - return -1; - } - -- snprintf (vendor, 9, "%.8s", inqBuffp + 8); -+ snprintf (vendor, 8, "%.8s", inqBuffp + 8); - snprintf (product, 17, "%.16s", inqBuffp + 16); - snprintf (serial, 5, "%.4s", inqBuffp + 40); - snprintf (ldev, 5, "%.4s", inqBuffp + 44); diff --git a/community/multipath-tools/explicitly-include-posix_types.h.patch b/community/multipath-tools/explicitly-include-posix_types.h.patch deleted file mode 100644 index 6cbbc3ba1..000000000 --- a/community/multipath-tools/explicitly-include-posix_types.h.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> -Date: Sat, 5 Dec 2009 18:11:00 +0100 -Subject: [PATCH] explicitly include posix_types.h - -to get the correct type for __kernel_old_dev_t - -Closes: #558990 ---- - kpartx/lopart.c | 13 +------------ - 1 files changed, 1 insertions(+), 12 deletions(-) - -Index: mpath/kpartx/lopart.c -=================================================================== ---- mpath.orig/kpartx/lopart.c 2012-02-09 18:02:23.808800332 +0530 -+++ mpath/kpartx/lopart.c 2012-02-09 18:15:24.400671080 +0530 -@@ -26,18 +26,7 @@ - #include <sys/stat.h> - #include <sys/mman.h> - #include <sysmacros.h> -- --#if defined(__hppa__) || defined(__powerpc64__) || defined (__alpha__) \ -- || defined (__x86_64__) --typedef unsigned long __kernel_old_dev_t; --#elif defined(__powerpc__) || defined(__ia64__) || (defined(__sparc__) && defined (__arch64__)) --typedef unsigned int __kernel_old_dev_t; --#else --typedef unsigned short __kernel_old_dev_t; --#endif -- --#define dev_t __kernel_old_dev_t -- -+#include <asm/posix_types.h> - #include <linux/loop.h> - - #include "lopart.h" diff --git a/community/multipath-tools/fix-build.patch b/community/multipath-tools/fix-build.patch deleted file mode 100644 index ff8f6824c..000000000 --- a/community/multipath-tools/fix-build.patch +++ /dev/null @@ -1,209 +0,0 @@ -diff -rupN upstream/Makefile.inc devel/Makefile.inc ---- upstream/Makefile.inc 2010-05-22 14:01:58.000000000 +0200 -+++ devel/Makefile.inc 2012-05-26 10:14:46.969786387 +0200 -@@ -32,11 +32,10 @@ rcdir = $(prefix)/etc/init.d - syslibdir = $(prefix)/$(LIB) - libdir = $(prefix)/$(LIB)/multipath - --GZIP = /bin/gzip -9 -c - INSTALL_PROGRAM = install - --OPTFLAGS = -pipe -g -Wall -Wunused -Wstrict-prototypes --CFLAGS = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" -+OPTFLAGS = -Wall -Wunused -Wstrict-prototypes -+CFLAGS += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\" - SHARED_FLAGS = -shared - - %.o: %.c -diff -rupN upstream/kpartx/Makefile devel/kpartx/Makefile ---- upstream/kpartx/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/kpartx/Makefile 2012-05-26 10:23:38.909780754 +0200 -@@ -6,7 +6,7 @@ include ../Makefile.inc - - CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 - --LDFLAGS = -ldevmapper -+LIBS = -ldevmapper - OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \ - gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o - EXEC = kpartx -@@ -14,22 +14,22 @@ EXEC = kpartx - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: $(EXEC) $(EXEC).8 - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir) - $(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir) -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)/usr/lib/udev/rules.d/66-kpartx.rules - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) -diff -rupN upstream/kpartx/kpartx.rules devel/kpartx/kpartx.rules ---- upstream/kpartx/kpartx.rules 2010-05-22 14:01:58.000000000 +0200 -+++ devel/kpartx/kpartx.rules 2012-05-26 10:30:32.769776372 +0200 -@@ -27,9 +27,9 @@ ENV{DM_PART}=="?*", \ - - # Create dm tables for partitions - ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="mpath-*", \ -- RUN+="/sbin/kpartx -a -p -part /dev/$name" -+ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" - ENV{DM_STATE}=="ACTIVE", ENV{DM_UUID}=="dmraid-*", \ -- RUN+="/sbin/kpartx -a -p -part /dev/$name" -+ RUN+="/usr/sbin/kpartx -a -p -part /dev/$name" - - LABEL="kpartx_end" - -diff -rupN upstream/multipath/Makefile devel/multipath/Makefile ---- upstream/multipath/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath/Makefile 2012-05-26 10:22:38.819781391 +0200 -@@ -7,32 +7,30 @@ include ../Makefile.inc - OBJS = main.o - - CFLAGS += -I$(multipathdir) --LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) -+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath - - EXEC = multipath - - all: $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -- $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/ -- $(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d -- $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/ -+ $(INSTALL_PROGRAM) -d $(DESTDIR)/usr/lib/udev/rules.d -+ $(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir) - - uninstall: -- rm $(DESTDIR)/etc/udev/rules.d/multipath.rules -- rm $(DESTDIR)$(bindir)/$(EXEC) -- rm $(DESTDIR)$(mandir)/$(EXEC).8.gz -- rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz -+ rm -f $(DESTDIR)/usr/lib/udev/rules.d/65-multipath.rules -+ rm -f $(DESTDIR)$(bindir)/$(EXEC) -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 -+ rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5 - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) -diff -rupN upstream/multipath/multipath.rules devel/multipath/multipath.rules ---- upstream/multipath/multipath.rules 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath/multipath.rules 2012-05-26 10:17:34.849784609 +0200 -@@ -1,7 +1,24 @@ --# --# udev rules for multipathing. --# The persistent symlinks are created with the kpartx rules --# -+# multipath wants the devmaps presented as meaninglful device names -+# so name them after their devmap name -+SUBSYSTEM!="block", GOTO="end_mpath" - --# socket for uevents --SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event" -+ENV{MPATH_SBIN_PATH}="/sbin" -+TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" -+ -+ACTION=="add", ENV{DEVTYPE}!="partition", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}!="1", \ -+ PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -c $tempnode", \ -+ ENV{DM_MULTIPATH_DEVICE_PATH}="1" -+ -+ENV{DM_MULTIPATH_DEVICE_PATH}=="1", ENV{DEVTYPE}!="partition", \ -+ RUN+="/sbin/partx -d --nr 1-1024 $env{DEVNAME}" -+ -+RUN+="socket:/org/kernel/dm/multipath_event" -+KERNEL!="dm-*", GOTO="end_mpath" -+ACTION!="change", GOTO="end_mpath" -+ENV{DM_UUID}=="mpath-?*|part[0-9]*-mpath-?*", OPTIONS+="link_priority=10" -+ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" -+ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" -+ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" -+RUN+="$env{MPATH_SBIN_PATH}/kpartx -a -p p $tempnode" -+LABEL="end_mpath" -diff -rupN upstream/multipath-tools.spec.in devel/multipath-tools.spec.in ---- upstream/multipath-tools.spec.in 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipath-tools.spec.in 2012-05-26 10:24:16.989780353 +0200 -@@ -47,8 +47,8 @@ rm -rf $RPM_BUILD_ROOT - %{prefix}/usr/share/man/man8/multipathd.8.gz - %{prefix}/usr/share/man/man5/multipath.conf.5.gz - %{prefix}/sbin/multipathd --%{prefix}/etc/udev/rules.d/multipath.rules --%{prefix}/etc/udev/rules.d/kpartx.rules -+%{prefix}/usr/lib/udev/rules.d/multipath.rules -+%{prefix}/usr/lib/udev/rules.d/kpartx.rules - %{prefix}/lib/udev/kpartx_id - %{prefix}/lib/multipath/*.so - -diff -rupN upstream/multipathd/Makefile devel/multipathd/Makefile ---- upstream/multipathd/Makefile 2010-05-22 14:01:58.000000000 +0200 -+++ devel/multipathd/Makefile 2012-05-26 10:14:46.969786387 +0200 -@@ -6,8 +6,8 @@ include ../Makefile.inc - # basic flags setting - # - CFLAGS += -I$(multipathdir) --LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ -- -lmultipath -L$(multipathdir) -+LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ -+ -L$(multipathdir) -lmultipath - - # - # debuging stuff -@@ -28,21 +28,20 @@ OBJS = main.o pidfile.o uxlsnr.o uxclnt. - all : $(EXEC) - - $(EXEC): $(OBJS) -- $(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS) -- $(GZIP) $(EXEC).8 > $(EXEC).8.gz -+ $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC) - - install: - $(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir) - $(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir) -- $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) -+ $(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir) - - uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)$(rcdir)/$(EXEC) -- rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz -+ rm -f $(DESTDIR)$(mandir)/$(EXEC).8 - - clean: -- rm -f core *.o $(EXEC) *.gz -+ rm -f core *.o $(EXEC) - diff --git a/community/multipath-tools/log_enquery_overflow.patch b/community/multipath-tools/log_enquery_overflow.patch deleted file mode 100644 index 67367c9f4..000000000 --- a/community/multipath-tools/log_enquery_overflow.patch +++ /dev/null @@ -1,69 +0,0 @@ -From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001 -From: Arkadiusz Miskiewicz <arekm@maven.pl> -Date: Sat, 27 Nov 2010 19:21:21 +0100 -Subject: [PATCH] multipath-tools overflow - -On Saturday 27 of November 2010, you wrote: - -[...] - -> the whole logarea is memset to 0 by logarea_init(), and each dequeued -> message is also memset to 0 by log_dequeue(), so it seems normal that -> msg->str value is 0x0, but it's really its address that matters. - -Ok, got it. Pointers, memory areas in my debugging session - are looking -good then. - -> -> It's not clear to me : are you actually hitting a bug or is it your -> debug session that puzzles you ? - -I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think -the bug is strcpy usage instead of memcpy because I'm building with --O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow -detection. - -That detection seem to be smart enough to know that &str area is not -a string memory and aborts the program. - -Found similar problem discussed here -http://sourceware.org/ml/binutils/2005-11/msg00308.html - -glibc aborts the program: -[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24}, -{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9 -/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117 - -same for valgrind: -**13436** *** strcpy_chk: buffer overflow detected ***: program terminated -==13436== at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477) -==13436== by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781) -==13436== by 0x40EDC06: log_enqueue (string3.h:107) -==13436== by 0x40ED68A: log_safe (log_pthread.c:24) -==13436== by 0x40E296A: dlog (debug.c:36) -==13436== by 0x804ECEC: pidfile_create (pidfile.c:37) -==13436== by 0x804E731: main (main.c:1424) - -The bug is not visible if I run multipathd in debug mode (-d). - -This patch fixes the problem for me by avoiding false positive on strcpy_chk. ---- - libmultipath/log.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libmultipath/log.c b/libmultipath/log.c -index e56e46b..57b7696 100644 ---- a/libmultipath/log.c -+++ b/libmultipath/log.c -@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap) - la->empty = 0; - msg = (struct logmsg *)la->tail; - msg->prio = prio; -- strcpy((void *)&msg->str, buff); -+ memcpy((void *)&msg->str, buff, strlen(buff) + 1); - lastmsg->next = la->tail; - msg->next = la->head; - --- -1.7.6.5 - diff --git a/community/multipath-tools/multipath-tools.install b/community/multipath-tools/multipath-tools.install deleted file mode 100644 index fa58bbc35..000000000 --- a/community/multipath-tools/multipath-tools.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - - echo " * For full functonality ensure that the dm_multipath kernel module is loaded" -} diff --git a/community/multipath-tools/multipath.conf b/community/multipath-tools/multipath.conf deleted file mode 100644 index 6dacf093d..000000000 --- a/community/multipath-tools/multipath.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Very Basic Multipath Configuration File -# - -defaults { - getuid_callout "/usr/lib/udev/scsi_id -g -u -d /dev/%n" -} - diff --git a/community/multipath-tools/multipath.conf.annotated b/community/multipath-tools/multipath.conf.annotated deleted file mode 100644 index b79488413..000000000 --- a/community/multipath-tools/multipath.conf.annotated +++ /dev/null @@ -1,362 +0,0 @@ -## -## This is a template multipath-tools configuration file -## Uncomment the lines relevent to your environment -## -# -## -## name : defaults -## desc : multipath-tools default settings -## -#defaults { -# # -# # name : udev_dir -# # desc : directory where udev creates its device nodes -# # default : /dev -# # -# udev_dir /dev -# -# # -# # name : polling_interval -# # scope : multipathd -# # desc : interval between two path checks in seconds -# # default : 5 -# # -# polling_interval 10 -# -# # -# # name : selector -# # scope : multipath -# # desc : the default path selector algorithm to use -# # these algorithms are offered by the kernel multipath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# selector "round-robin 0" -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : the default path grouping policy to apply to unspecified -# # multipaths -# # default : multibus -# # -# path_grouping_policy multibus -# -# # -# # name : getuid_callout -# # scope : multipath -# # desc : the default program and args to callout to obtain a unique -# # path identifier. Absolute path required -# # default : /usr/lib/udev/scsi_id -g -u -s -# # -# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" -# -# # -# # name : prio_callout -# # scope : multipath -# # desc : the default program and args to callout to obtain a path -# # priority value. The ALUA bits in SPC-3 provide an -# # exploitable prio value for example. "none" is a valid value -# # default : (null) -# # -# #prio_callout "/bin/true" -# -# # -# # name : path_checker -# # scope : multipath & multipathd -# # desc : the default method used to determine the paths' state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# #path_checker directio -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# -# # -# # name : rr_weight -# # scope : multipath -# # desc : if set to priorities the multipath configurator will assign -# # path weights as "path prio * rr_min_io" -# # values : priorities|uniform -# # default : uniform -# # -# rr_weight priorities -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback manual -# -# # -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) -# # -# #no_path_retry queue -# -# # -# # name : user_friendly_names -# # scope : multipath -# # desc : If set to "yes", using the bindings file -# # /var/lib/multipath/bindings to assign a persistent and -# # unique alias to the multipath, in the form of mpath<n>. -# # If set to "no" use the WWID as the alias. In either case -# # this be will be overriden by any specific aliases in this -# # file. -# # values : yes|no -# # default : no -# user_friendly_names no -# -#} -# -## -## name : blacklist -## scope : multipath & multipathd -## desc : list of device names to discard as not multipath candidates -## default : cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop -## -#blacklist { -# wwid 26353900f02796769 -# devnode "^(ram|raw|loop|fd|md|dm-|sr|scd|st)[0-9]*" -# devnode "^hd[a-z][[0-9]*]" -# devnode "^cciss!c[0-9]d[0-9]*[p[0-9]*]" -# device { -# vendor DEC.* -# product MSA[15]00 -# } -#} -## -## name : blacklist_exceptions -## scope : multipath & multipathd -## desc : list of device names to be treated as multipath candidates -## even if they are on the blacklist. -## Note: blacklist exceptions are only valid in the same class. -## It is not possible to blacklist devices using the devnode keyword -## and to exclude some devices of them using the wwid keyword. -## default : - -## -#blacklist_exceptions { -# devnode "^dasd[c-d]+[0-9]*" -# wwid "IBM.75000000092461.4d00.34" -# wwid "IBM.75000000092461.4d00.35" -# wwid "IBM.75000000092461.4d00.36" -#} -# -## -## name : multipaths -## scope : multipath & multipathd -## desc : list of multipaths finest-grained settings -## -#multipaths { -# # -# # name : multipath -# # scope : multipath & multipathd -# # desc : container for settings that apply to one specific multipath -# # -# multipath { -# # -# # name : wwid -# # scope : multipath & multipathd -# # desc : index of the container -# # -# wwid 3600508b4000156d700012000000b0000 -# -# # -# # name : alias -# # scope : multipath -# # desc : symbolic name for the multipath -# # -# alias yellow -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : path grouping policy to apply to this multipath -# # values : failover, multibus, group_by_serial -# # default : failover -# # -# path_grouping_policy multibus -# -# # -# # name : path_checker -# # scope : multipathd -# # desc : path checking alorithm to use to check path state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# # path_checker directio -# -# # -# # name : path_selector -# # desc : the path selector algorithm to use for this mpath -# # these algo are offered by the kernel mpath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# path_selector "round-robin 0" -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback manual -# -# # -# # name : no_path_retry -# # scope : multipath & multipathd -# # desc : tell the number of retries until disable queueing, or -# # "fail" means immediate failure (no queueing), -# # "queue" means never stop queueing -# # values : queue|fail|n (>0) -# # default : (null) -# # -# #no_path_retry queue -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# } -# multipath { -# wwid 1DEC_____321816758474 -# alias red -# rr_weight priorities -# } -#} -# -## -## name : devices -## scope : multipath & multipathd -## desc : list of per storage controller settings -## overrides default settings (device_maps block) -## overriden by per multipath settings (multipaths block) -## -#devices { -# # -# # name : device -# # scope : multipath & multipathd -# # desc : settings for this specific storage controller -# # -# device { -# # -# # name : vendor, product -# # scope : multipath & multipathd -# # desc : index for the block -# # -# vendor "COMPAQ " -# product "HSV110 (C)COMPAQ" -# -# # -# # name : path_grouping_policy -# # scope : multipath -# # desc : path grouping policy to apply to multipath hosted -# # by this storage controller -# # values : failover = 1 path per priority group -# # multibus = all valid paths in 1 priority -# # group -# # group_by_serial = 1 priority group per detected -# # serial number -# # default : failover -# # -# path_grouping_policy multibus -# -# # -# # name : getuid_callout -# # scope : multipath -# # desc : the program and args to callout to obtain a unique -# # path identifier. Absolute path required -# # default : /usr/lib/udev/scsi_id -g -u -s -# # -# getuid_callout "/usr/lib/udev/scsi_id -g -u -s /block/%n" -# -# # -# # name : prio_callout -# # scope : multipath -# # desc : the program and args to callout to obtain a path -# # weight. Weights are summed for each path group to -# # determine the next PG to use case of failure. -# # "none" is a valid value. -# # default : no callout, all paths equals -# # -# prio_callout "/sbin/mpath_prio_balance_units %d" -# -# # -# # name : path_checker -# # scope : multipathd -# # desc : path checking alorithm to use to check path state -# # values : readsector0|tur|emc_clariion|hp_sw|directio -# # default : directio -# # -# path_checker directio -# -# # -# # name : path_selector -# # desc : the path selector algorithm to use for this mpath -# # these algo are offered by the kernel mpath target -# # values : "round-robin 0" -# # default : "round-robin 0" -# # -# path_selector "round-robin 0" -# -# # -# # name : failback -# # scope : multipathd -# # desc : tell the daemon to manage path group failback, or not to. -# # 0 means immediate failback, values >0 means deffered failback -# # expressed in seconds. -# # values : manual|immediate|n > 0 -# # default : immediate -# # -# failback 30 -# -# # -# # name : rr_min_io -# # scope : multipath -# # desc : the number of IO to route to a path before switching -# # to the next in the same path group -# # default : 1000 -# # -# rr_min_io 100 -# -# # -# # name : product_blacklist -# # scope : multipath & multipathd -# # desc : product strings to blacklist for this vendor -# # default : none -# # -# product_blacklist LUN_Z -# } -# device { -# vendor "COMPAQ " -# product "MSA1000 " -# path_grouping_policy multibus -# path_checker tur -# rr_weight priorities -# } -#} diff --git a/community/multipath-tools/multipathd.rc b/community/multipath-tools/multipathd.rc deleted file mode 100644 index 7f5ef5d6a..000000000 --- a/community/multipath-tools/multipathd.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting multipathd" - /usr/bin/multipathd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon multipathd - stat_done - fi - ;; - stop) - stat_busy "Stopping multipathd" - [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon multipathd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/multipath-tools/rc.d b/community/multipath-tools/rc.d deleted file mode 100644 index 7f5ef5d6a..000000000 --- a/community/multipath-tools/rc.d +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting multipathd" - /usr/bin/multipathd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon multipathd - stat_done - fi - ;; - stop) - stat_busy "Stopping multipathd" - [ -f /var/run/multipathd.pid ] && kill `cat /var/run/multipathd.pid` >/dev/null 2>&1 - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon multipathd - stat_done - fi - ;; - restart) - $0 stop - sleep 2 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/multipath-tools/service b/community/multipath-tools/service deleted file mode 100644 index a70d0ee1f..000000000 --- a/community/multipath-tools/service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Device-Mapper Multipath Device Controller -After=syslog.target - -[Service] -Type=forking -PIDFile=/var/run/multipathd.pid -ExecStart=/sbin/multipathd -ExecReload=/sbin/multipathd reconfigure - -[Install] -WantedBy=multi-user.target diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD deleted file mode 100644 index c7835c0f0..000000000 --- a/community/mupen64plus/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# $Id: PKGBUILD 78487 2012-10-19 16:17:59Z jelle $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Zephyr - -pkgname=mupen64plus -pkgver=1.99.5 -pkgrel=3 -pkgdesc='Nintendo64 Emulator' -arch=('i686' 'x86_64') -url='http://code.google.com/p/mupen64plus/' -license=('GPL') -depends=('glu' 'libgl' 'libsamplerate' 'libpng' 'sdl' 'freetype2') -makedepends=('mesa') -source=("http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-${pkgver}.tar.gz") -md5sums=('93772a6d6fc6a63353462deae8a6db71') - -build() { - cd mupen64plus-bundle-src-${pkgver} - - sh m64p_build.sh -} - -package() { - cd mupen64plus-bundle-src-$pkgver - - # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid - ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man/man6' LDCONFIG='true' -} - -# vim: ts=2:sw=2:et diff --git a/community/mythplugins/php54.patch b/community/mythplugins/php54.patch deleted file mode 100644 index afbe8f953..000000000 --- a/community/mythplugins/php54.patch +++ /dev/null @@ -1,35 +0,0 @@ -*** includes/sorting.php.old 2011-04-03 06:05:31.000000000 -0500 ---- includes/sorting.php 2012-03-27 05:05:51.000000000 -0500 -*************** -*** 123,129 **** - function by_user_choice(&$a, &$b) { - foreach ($GLOBALS['user_sort_choice'] as $sort) { - $function = 'by_'.$sort['field']; -! $response = $function(&$a, &$b); - // Identical response, go on to the next sort choice - if (!$response) - continue; ---- 123,129 ---- - function by_user_choice(&$a, &$b) { - foreach ($GLOBALS['user_sort_choice'] as $sort) { - $function = 'by_'.$sort['field']; -! $response = $function($a, $b); - // Identical response, go on to the next sort choice - if (!$response) - continue; -*** modules/tv/tmpl/default/schedules.php.old 2011-04-03 06:05:31.000000000 -0500 ---- modules/tv/tmpl/default/schedules.php 2012-03-27 05:37:40.000000000 -0500 -*************** -*** 90,95 **** ---- 90,100 ---- - </tr> - </thead> - <?php -+ // Hack: Disable warnings about "Creating default -+ // object from empty value" from below line -+ // "$schedule->channel->name = '[ '.t('Any').' ]';" -+ ini_set('error_reporting', E_ERROR); -+ - $prev_group = ''; - $cur_group = ''; - foreach ($the_schedules as $schedule) { diff --git a/community/mythtv/mythtv_0.25_gcc_4.7.patch b/community/mythtv/mythtv_0.25_gcc_4.7.patch deleted file mode 100644 index 83c8244a0..000000000 --- a/community/mythtv/mythtv_0.25_gcc_4.7.patch +++ /dev/null @@ -1,107 +0,0 @@ -*** a/libs/libmythbase/compat.h 2012-03-31 20:52:30.430461503 -0400 ---- b/libs/libmythbase/compat.h 2012-03-31 20:59:05.935585911 -0400 -*************** -*** 44,49 **** ---- 44,51 ---- - # include <sys/resource.h> // for setpriority - # include <sys/socket.h> - # include <sys/wait.h> // For WIFEXITED on Mac OS X -+ # include <stdio.h> // for snprintf(), used by inline dlerror() -+ # include <unistd.h> // for usleep() - #endif - - #ifdef USING_MINGW -*** a/libs/libmyth/rssparse.h 2012-03-31 20:52:30.427453729 -0400 ---- b/libs/libmyth/rssparse.h 2012-03-31 21:51:11.687438044 -0400 -*************** -*** 13,18 **** ---- 13,19 ---- - #include <QPair> - #include <QMap> - #include <QVariant> -+ #include <sys/types.h> - - #include "mythexp.h" - -*** a/libs/libmythtv/audioinput.h 2012-03-31 22:41:55.626923063 -0400 ---- b/libs/libmythtv/audioinput.h 2012-03-31 22:41:22.478248297 -0400 -*************** -*** 22,27 **** ---- 22,28 ---- - #define _AUDIOINPUT_H_ - - #include <QString> -+ #include <unistd.h> - - class AudioInput - { -*** a/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 20:52:29.923150437 -0400 ---- b/external/FFmpeg/libavcodec/x86/h264_qpel_mmx.c 2012-03-31 21:58:48.422270780 -0400 -*************** -*** 398,404 **** - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ ---- 398,404 ---- - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -*************** -*** 446,452 **** - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ - : "memory"\ - );\ - tmp += 4;\ ---- 446,452 ---- - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -*************** -*** 823,829 **** - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ ---- 823,829 ---- - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -! : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -*************** -*** 878,884 **** - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -! : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" ---- 878,884 ---- - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -! : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/community/ndisc6/rdnssd.confd b/community/ndisc6/rdnssd.confd deleted file mode 100644 index 306c3d7f6..000000000 --- a/community/ndisc6/rdnssd.confd +++ /dev/null @@ -1,8 +0,0 @@ - -# This default merge hook adds IPv6 DNS resolvers -# before the existing IPv4 ones in /etc/resolv.conf. -MERGEHOOK="/etc/rdnssd/merge-hook" - -# User who runs rdnssd. -RUN_AS="nobody" - diff --git a/community/ndisc6/rdnssd.rc.d b/community/ndisc6/rdnssd.rc.d deleted file mode 100644 index 3c0a6a53c..000000000 --- a/community/ndisc6/rdnssd.rc.d +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rdnssd - -PIDFILE="/var/run/rdnssd.pid" -PID=`cat "$PIDFILE" 2>/dev/null` -case "$1" in - start) - stat_busy "Starting RDNSS Daemon" - if [ ! -z "$PID" -a -e "/proc/$PID" ]; then - stat_append "-- Already running" - stat_die - else - /usr/sbin/rdnssd -p "$PIDFILE" \ - ${MERGEHOOK/*/-H} "$MERGEHOOK" \ - ${RUN_AS/*/-u} "$RUN_AS" - - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon rdnssd - stat_done - fi - fi - ;; - stop) - stat_busy "Stopping RDNSS Daemon" - if [ -z "$PID" ]; then - stat_append "-- Not running" - stat_die - else - kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sshd - stat_done - fi - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ndiswrapper/PKGBUILD b/community/ndiswrapper/PKGBUILD deleted file mode 100644 index 873b2ab9b..000000000 --- a/community/ndiswrapper/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# $Id: PKGBUILD 79177 2012-10-31 07:25:04Z tpowa $ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> -# Contributor: SpepS <dreamspepser at yahoo dot it> -# Contributor: Tobias Powalowski <tpowa@archlinux.org> - -_extramodules=extramodules-3.6-ARCH -pkgname=ndiswrapper -pkgver=1.57 -pkgrel=26 -pkgdesc="Module for NDIS (Windows Network Drivers) drivers supplied by vendors." -license=('GPL') -arch=('i686' 'x86_64') -url="http://ndiswrapper.sourceforge.net" -install=ndiswrapper.install -depends=('linux>=3.6' 'linux<3.7' 'wireless_tools' 'perl') -makedepends=('linux-headers') -provides=("$pkgname-utils" "$pkgname-bin") -replaces=("$pkgname-utils" "$pkgname-bin") -source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" - "linux33.patch") -options=('!strip') -md5sums=('7a401dc540938bf07893c67f418b6152' - '061e59a934ca3ae4be55a86d86b2c1f5') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - _kver="$(cat /usr/lib/modules/${_extramodules}/version)" - - # modinfo path fix - sed -i "/modinfo/s/s/usr\//" driver/Makefile - patch -i "$srcdir/linux33.patch" -N -p0 - - # make sure we point to the right build directory - sed -i "/^KBUILD/ s,.*,KBUILD = $(readlink -f /usr/lib/modules/$_kver/build)," driver/Makefile - - make KVERS=$_kver -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - _kver="$(cat /usr/lib/modules/${_extramodules}/version)" - - make INST_DIR="usr/lib/modules/$_extramodules" \ - KVERS=$_kver DESTDIR="$pkgdir/" install - - gzip "$pkgdir/usr/lib/modules/$_extramodules/$pkgname.ko" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/ndiswrapper/linux33.patch b/community/ndiswrapper/linux33.patch deleted file mode 100644 index 3998c8450..000000000 --- a/community/ndiswrapper/linux33.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- driver/ndis.c 2011-12-31 21:30:16.000000000 +0100 -+++ driver/ndis.c.new 2012-04-08 11:14:16.746614153 +0200 -@@ -2654,9 +2654,15 @@ - (ULONG *idle, ULONG *kernel_user, ULONG *index) - { - int cpu = smp_processor_id(); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0) -+ *idle = kcpustat_cpu(cpu).cpustat[CPUTIME_IDLE]; -+ *kernel_user = kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM] + -+ kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; -+#else - *idle = kstat_cpu(cpu).cpustat.idle; - *kernel_user = kstat_cpu(cpu).cpustat.system + - kstat_cpu(cpu).cpustat.user; -+#endif - *index = cpu; - } - ---- driver/wrapndis.c 2011-12-31 21:30:16.000000000 +0100 -+++ driver/wrapndis.c.new 2012-04-08 11:13:00.574116936 +0200 -@@ -1684,6 +1684,7 @@ - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) - static u32 ndis_get_rx_csum(struct net_device *dev) - { - struct ndis_device *wnd = netdev_priv(dev); -@@ -1735,18 +1736,21 @@ - else - return -EOPNOTSUPP; - } -+#endif - - static struct ethtool_ops ndis_ethtool_ops = { - .get_drvinfo = ndis_get_drvinfo, - .get_link = ndis_get_link, - .get_wol = ndis_get_wol, - .set_wol = ndis_set_wol, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) - .get_tx_csum = ndis_get_tx_csum, - .get_rx_csum = ndis_get_rx_csum, - .set_tx_csum = ndis_set_tx_csum, - .set_rx_csum = ndis_set_rx_csum, - .get_sg = ndis_get_sg, - .set_sg = ndis_set_sg, -+#endif - }; - - static int notifier_event(struct notifier_block *notifier, unsigned long event, diff --git a/community/ndiswrapper/ndiswrapper.install b/community/ndiswrapper/ndiswrapper.install deleted file mode 100644 index ef505811a..000000000 --- a/community/ndiswrapper/ndiswrapper.install +++ /dev/null @@ -1,17 +0,0 @@ -post_install() -{ - post_upgrade -} - -post_upgrade() -{ - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_remove() -{ - post_upgrade -} - -# vim:set ts=2 sw=2 et: diff --git a/community/nestopia/nestopia b/community/nestopia/nestopia deleted file mode 100644 index 52bd2b2b3..000000000 --- a/community/nestopia/nestopia +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -if [ ! -e $HOME/.nestopia ]; then - echo "Running NEStopia for the first time..." - echo "Copying required files to ~/.nestopia..." - mkdir $HOME/.nestopia - cp /usr/share/nestopia/{nstcontrols,NstDatabase.xml} $HOME/.nestopia/ -fi - -nestopia-bin "$@" diff --git a/community/nestopia/nestopia_bogus_error_on_save_settings.patch b/community/nestopia/nestopia_bogus_error_on_save_settings.patch deleted file mode 100644 index 63f33bc72..000000000 --- a/community/nestopia/nestopia_bogus_error_on_save_settings.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- source/linux/settings.cpp.old 2008-10-23 05:45:58.000000000 +0200 -+++ source/linux/settings.cpp 2008-12-04 23:17:59.000000000 +0100 -@@ -16,7 +16,7 @@ - using namespace LinuxNst; - - #define READ_SETTING(x) fread(&x, sizeof(x), 1, f) --#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != sizeof(x)) std::cout << "Error writing setting!\n" -+#define WRITE_SETTING(x) if (fwrite(&x, sizeof(x), 1, f) != 1) std::cout << "Error writing setting!\n" - - static int rates[4] = { 11025, 22050, 44100, 48000 }; - diff --git a/community/netperf/PKGBUILD b/community/netperf/PKGBUILD deleted file mode 100644 index 9ff232229..000000000 --- a/community/netperf/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 73456 2012-07-08 00:07:29Z seblu $ -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> -# Contributor: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Tilman Blumenbach <tilman (at) ax86 (dot) net> - -pkgname=netperf -pkgver=2.6.0 -pkgrel=1 -pkgdesc='Benchmarking tool for many different types of networking' -url='http://www.netperf.org/' -license=('custom') -arch=('i686' 'x86_64') -depends=('glibc' 'libsmbios' 'lksctp-tools') -install=$pkgname.install -source=( - "ftp://ftp.netperf.org/netperf/$pkgname-$pkgver.tar.bz2" - "$pkgname.rc" - "$pkgname.conf" - "$pkgname.service") -md5sums=('9654ffdfd4c4f2c93ce3733cd9ed9236' - '4f11bf24fcd7a44c17bbe27cdc7dae01' - '14836578ba49bbfa9e928feeca8346f1' - '9a8b47101fb2b0bf8fb9bbfb73ba6486') - -build() { - cd $pkgname-$pkgver - ./configure \ - --prefix=/usr \ - --enable-demo \ - --enable-unixdomain \ - --enable-dccp \ - --enable-sctp - make -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # install license - install -D -m 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" - # install initscripts & systemd files - install -D -m 755 ../$pkgname.rc "$pkgdir/etc/rc.d/$pkgname" - install -D -m 644 ../$pkgname.conf "$pkgdir/etc/conf.d/$pkgname" - install -D -m 644 ../$pkgname.service \ - "$pkgdir/usr/lib/systemd/system/$pkgname.service" -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/netperf/netperf.conf b/community/netperf/netperf.conf deleted file mode 100644 index b8e36c203..000000000 --- a/community/netperf/netperf.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -#DAEMON_OPTS='-d' diff --git a/community/netperf/netperf.install b/community/netperf/netperf.install deleted file mode 100644 index fcb9ba6ae..000000000 --- a/community/netperf/netperf.install +++ /dev/null @@ -1,20 +0,0 @@ -infodir=/usr/share/info -filelist=(netperf.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in "${filelist[@]}"; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in "${filelist[@]}"; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} diff --git a/community/netperf/netperf.rc b/community/netperf/netperf.rc deleted file mode 100644 index f2a2de582..000000000 --- a/community/netperf/netperf.rc +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/bin/netserver -PID=$(pidof -o %PPID $DAEMON) - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && - </dev/null &>/dev/null $DAEMON $DAEMON_OPTS && - 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/netperf/netperf.service b/community/netperf/netperf.service deleted file mode 100644 index ce3c9cab8..000000000 --- a/community/netperf/netperf.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=Netperf Benchmark Server - -[Service] -ExecStart=/usr/bin/netserver -D - -[Install] -WantedBy=multi-user.target diff --git a/community/nginx/nginx b/community/nginx/nginx deleted file mode 100644 index 9de10e99a..000000000 --- a/community/nginx/nginx +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# general config - -NGINX_CONFIG="/etc/nginx/conf/nginx.conf" - -. /etc/conf.d/nginx -. /etc/rc.conf -. /etc/rc.d/functions - -function check_config { - stat_busy "Checking configuration" - /usr/sbin/nginx -t -q -c "$NGINX_CONFIG" - 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 "$NGINX_CONFIG" &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - add_daemon nginx - stat_done - fi - ;; - stop) - stat_busy "Stopping Nginx" - NGINX_PID=`cat /var/run/nginx.pid 2>/dev/null` - kill -QUIT $NGINX_PID &>/dev/null - if [ $? -ne 0 ]; then - stat_fail - else - for i in `seq 1 10`; do - [ -d /proc/$NGINX_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/nvclock/PKGBUILD b/community/nvclock/PKGBUILD deleted file mode 100644 index ce2f5bbfc..000000000 --- a/community/nvclock/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 63680 2012-02-05 12:06:13Z ibiru $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Markus Meissner <markus@meissna.de> -# Contributor: Andreas Radke <andyrtr@archlinux.org> - -pkgname=nvclock -pkgver=0.8b4 -pkgrel=3 -pkgdesc='A small utility which allows users to overclock NVIDIA based video cards.' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.linuxhardware.org/nvclock/' -license=('GPL') -depends=('gtk2') -optdepends=('gksu: to start nvclock via the desktop menu entry') -install='nvclock.install' -options=('!makeflags') -source=("http://www.linuxhardware.org/${pkgname}/${pkgname}${pkgver}.tar.gz" - 'nvclock-0.8b4-buildfix.patch' - 'nvclock-0.8b4-linkfix.patch' - 'nvclock.desktop-use-gksu.patch') -md5sums=('23f1b3ebf40f35d76d5fdac50f66ab11' - '1da24b50dd6a8c4704fa550a3e1a8b53' - 'b812646787ea44e693fd2288612f25ad' - '98fc1995721d0b0e8ff6d448869eee6d') - -build(){ - cd "${srcdir}/${pkgname}${pkgver}" - - # build and link fixes from Fedora - patch -Np1 -i "${srcdir}/nvclock-0.8b4-buildfix.patch" - patch -Np1 -i "${srcdir}/nvclock-0.8b4-linkfix.patch" - - # Make ".desktop" file use gksu(1). - patch -Np0 -i "${srcdir}/nvclock.desktop-use-gksu.patch" - - sed -i 's:${prefix}/man:${prefix}\/share\/man:' "${srcdir}/${pkgname}${pkgver}/Makefile.in" - - ./configure --prefix=/usr --bindir=/usr/bin - make -} - -package() { - cd "${srcdir}/${pkgname}${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/nvclock/nvclock-0.8b4-buildfix.patch b/community/nvclock/nvclock-0.8b4-buildfix.patch deleted file mode 100644 index cdc9f5c88..000000000 --- a/community/nvclock/nvclock-0.8b4-buildfix.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -upNr nvclock0.8b4.orign/src/Makefile.in nvclock0.8b4/src/Makefile.in ---- nvclock0.8b4.orign/src/Makefile.in 2009-01-03 18:02:54.000000000 +0100 -+++ nvclock0.8b4/src/Makefile.in 2009-01-07 11:37:39.000000000 +0100 -@@ -50,8 +50,8 @@ distclean: distclean-recursive clean-app - install: install-recursive install-app - install-app: - mkdir -p $(bindir) -- $(INSTALL) -c nvclock $(DESTDIR)$(bindir)/nvclock -- $(INSTALL) -c smartdimmer $(DESTDIR)$(bindir)/smartdimmer -+ $(INSTALL) -c nvclock $(bindir)/nvclock -+ $(INSTALL) -c smartdimmer $(bindir)/smartdimmer - - - uninstall: uninstall-recursive uninstall-app - - diff --git a/community/nvclock/nvclock-0.8b4-linkfix.patch b/community/nvclock/nvclock-0.8b4-linkfix.patch deleted file mode 100644 index 0029d1c74..000000000 --- a/community/nvclock/nvclock-0.8b4-linkfix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -upNr nvclock0.8b4.orign/src/gtk/Makefile.in nvclock0.8b4/src/gtk/Makefile.in ---- nvclock0.8b4.orign/src/gtk/Makefile.in 2008-05-11 12:25:46.000000000 +0200 -+++ nvclock0.8b4/src/gtk/Makefile.in 2010-02-13 19:56:24.204078277 +0100 -@@ -20,12 +20,12 @@ endif - ifeq ($(HAVE_NVCONTROL), yes) - DEPS=$(libbackend) $(libnvcontrol) - INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I.. -I../.. -- LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -+ LIBS=@GTK_LIBS@ -L../backend -lbackend -L../nvcontrol -lnvcontrol -lX11 -lXext -ldl - OBJECTS=banner.o gl.o hw.o main.o settings.o - else - DEPS=$(libbackend) - INCLUDES=-I./backend -I./nvcontrol -I.. -I../.. -- LIBS=@GTK_LIBS@ -L../backend -lbackend -+ LIBS=@GTK_LIBS@ -L../backend -lbackend -lX11 -lXext -ldl - OBJECTS=banner.o hw.o main.o settings.o - endif - diff --git a/community/nvclock/nvclock.desktop-use-gksu.patch b/community/nvclock/nvclock.desktop-use-gksu.patch deleted file mode 100644 index a372f5de8..000000000 --- a/community/nvclock/nvclock.desktop-use-gksu.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- nvclock.desktop.orig 2011-01-16 15:15:55.764977836 +0100 -+++ nvclock.desktop 2011-01-16 15:16:07.827408839 +0100 -@@ -2,7 +2,7 @@ - Encoding=UTF-8 - Name=NVCLOCK - Comment=Overclock and Monitor NVIDIA cards --Exec=nvclock_gtk -+Exec=gksu nvclock_gtk - Icon=nvclock.png - Terminal=false - Type=Application diff --git a/community/nvclock/nvclock.install b/community/nvclock/nvclock.install deleted file mode 100644 index d59dca6e8..000000000 --- a/community/nvclock/nvclock.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/nvidia-cg-toolkit/PKGBUILD b/community/nvidia-cg-toolkit/PKGBUILD deleted file mode 100644 index ed07e852e..000000000 --- a/community/nvidia-cg-toolkit/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $Id: PKGBUILD 74692 2012-08-02 07:39:38Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Adam Griffiths -# Contributor: Nick B <Shirakawasuna at gmail _dot_ com> -pkgname=nvidia-cg-toolkit -pkgver=3.1 -_date="April2012" -pkgrel=2 -pkgdesc="NVIDIA Cg libraries" -arch=('i686' 'x86_64') -url="http://developer.nvidia.com/object/cg_toolkit.html" -license=('custom') -depends=('glibc' 'mesa') -source=(http://developer.download.nvidia.com/cg/Cg_${pkgver}/Cg-${pkgver}_${_date}_${CARCH/i686/x86}.tgz) -[ "$CARCH" = "i686" ] && - md5sums=('9a9fc5108154808f3b10eafa54df1c74') -[ "$CARCH" = "x86_64" ] && -md5sums=('88ba727cdbe0261fac465c4d84f44762') - -build() { - return 0 -} - -package() { - install -Dm755 ${srcdir}/usr/bin/cgc ${pkgdir}/usr/bin/cgc - install -dm755 ${pkgdir}/usr/include/Cg - install -m644 ${srcdir}/usr/include/Cg/* ${pkgdir}/usr/include/Cg - install -dm755 ${pkgdir}/usr/lib - [ "$CARCH" = "i686" ] && install -m644 ${srcdir}/usr/lib/* ${pkgdir}/usr/lib - [ "$CARCH" = "x86_64" ] && install -m644 ${srcdir}/usr/lib64/* ${pkgdir}/usr/lib - install -Dm644 ${srcdir}/usr//local/Cg/docs/license.txt ${pkgdir}/usr/share/licenses/nvidia-cg-toolkit/license.txt - cp -r ${srcdir}/usr/local/Cg ${pkgdir}/usr/share/ - find $pkgdir/usr/share/ -type d -exec chmod -R 755 '{}' ';' - find $pkgdir/usr/share/ -type f -exec chmod -R 644 '{}' ';' -} - -# vim: sw=2:ts=2 et: diff --git a/community/ogre/PKGBUILD b/community/ogre/PKGBUILD deleted file mode 100644 index 78d169da2..000000000 --- a/community/ogre/PKGBUILD +++ /dev/null @@ -1,89 +0,0 @@ -# $Id: PKGBUILD 77653 2012-10-13 11:44:20Z allan $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgbase=ogre -pkgname=('ogre' 'ogre-docs') -pkgver=1.8.1 -pkgrel=2 -pkgdesc="A scene-oriented, flexible 3D engine written in C++" -arch=('i686' 'x86_64') -url='http://www.ogre3d.org' -license=('custom:MIT') -depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' - 'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu') -makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa') -optdepends=('cppunit: unit testing' - 'intel-tbb: better threading support' - 'poco: portability' - 'boost: for developing using ogre') -install=ogre.install -source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}_src_v${pkgver//./-}.tar.bz2") -md5sums=('b85e3dcf370a46b3a8624d4fdd722d39') - -build() { - cd ${srcdir}/${pkgname}_src_v${pkgver//./-} - - # get a clean build dir - [[ -d build ]] && rm -rf build - mkdir build && cd build - - # generate CMake Makefile - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOGRE_INSTALL_PLUGINS_HEADERS=TRUE \ - -DOGRE_INSTALL_SAMPLES=TRUE \ - -DOGRE_INSTALL_DOCS=TRUE \ - -DOGRE_INSTALL_MEDIA=TRUE \ - -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \ - -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version - - # compile - make - - # generate docs - if [[ $(which dot) && $(which doxygen) ]]; then - make doc - fi -} - -package_ogre() { - optdepends=('ogre-docs: documentation') - - cd ${srcdir}/${pkgname}_src_v${pkgver//./-}/build - - # install the bugger - make DESTDIR=${pkgdir} install - - # fix up samples - install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/ - mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/ - mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/ - - # make sample launcher - echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser - echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser - chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser - - # install license - install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html - - # move docs out of this package - mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs -} - -package_ogre-docs() { - pkgdesc="Documentation for ogre" - depends=() - - cd ${srcdir}/${pkgbase}_src_v${pkgver//./-}/build - - # move docs into this package - install -dm755 ${pkgdir}/usr/share/doc - mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/ - - # symlink for docs - install -dm755 ${pkgdir}/usr/share/OGRE/ - cd ${pkgdir}/usr/share - ln -s doc/OGRE/ OGRE/docs -} - -# vim:set ts=2 sw=2 et: diff --git a/community/ogre/ogre.install b/community/ogre/ogre.install deleted file mode 100644 index 5db668d9e..000000000 --- a/community/ogre/ogre.install +++ /dev/null @@ -1,4 +0,0 @@ -post_install() { - echo "To view the OGRE samples just run OgreSampleBrowser or launch" - echo "it directly in /opt/OGRE/samples/" -} diff --git a/community/oidentd/oidentd.default b/community/oidentd/oidentd.default deleted file mode 100644 index 5eefa80e2..000000000 --- a/community/oidentd/oidentd.default +++ /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/oidentd/oidentd.rc b/community/oidentd/oidentd.rc deleted file mode 100644 index 8b3c04c45..000000000 --- a/community/oidentd/oidentd.rc +++ /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/onboard/1012_1011.diff b/community/onboard/1012_1011.diff deleted file mode 100644 index 233478ac9..000000000 --- a/community/onboard/1012_1011.diff +++ /dev/null @@ -1,17 +0,0 @@ -=== modified file 'setup.py' ---- setup.py 2012-08-09 13:21:31 +0000 -+++ setup.py 2012-10-18 17:17:38 +0000 -@@ -11,12 +11,6 @@ - from distutils.core import Extension, Command - from distutils import version - --# Work around encoding error in python3-distutils-extra --# when building in pbuilder with LANG=C (LP# 1017468). --if sys.version_info.major == 3: -- import locale -- locale.getpreferredencoding = lambda: 'UTF-8' -- - try: - import DistUtilsExtra.auto - except ImportError: - diff --git a/community/onboard/1013_1012.diff b/community/onboard/1013_1012.diff deleted file mode 100644 index a00b4ecf9..000000000 --- a/community/onboard/1013_1012.diff +++ /dev/null @@ -1,22 +0,0 @@ -=== modified file 'Onboard/Config.py' ---- Onboard/Config.py 2012-10-18 16:17:12 +0000 -+++ Onboard/Config.py 2012-10-18 17:19:00 +0000 -@@ -73,7 +73,7 @@ - DEFAULT_RESIZE_HANDLES = list(Handle.RESIZERS) - - SCHEMA_VERSION_0_97 = Version(1, 0) # Onboard 0.97 --SCHEMA_VERSION_0_98 = Version(2, 0) # Onboard 0.97.1 -+SCHEMA_VERSION_0_98 = Version(2, 0) # Onboard 0.97.1 - SCHEMA_VERSION = SCHEMA_VERSION_0_98 - - -@@ -145,7 +145,7 @@ - Singleton magic. - """ - if not hasattr(cls, "self"): -- cls.self = object.__new__(cls, args, kwargs) -+ cls.self = object.__new__(cls, *args, **kwargs) - cls.self.construct() - return cls.self - - diff --git a/community/opera/PKGBUILD b/community/opera/PKGBUILD deleted file mode 100644 index cc9bb472c..000000000 --- a/community/opera/PKGBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: PKGBUILD 81340 2012-12-18 09:39:07Z idevolder $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> -# Maintainer: BlackEagle < ike DOT devolder AT gmail DOT com > -# Contributor: Mateusz Herych <heniekk@gmail.com> -# Contributor: ruario <ruario AT opera DOT com> -# Contributor: Daniel Isenmann <daniel AT archlinux DOT org> -# Contributor: dorphell <dorphell AT archlinux DOT org> -# Contributor: Sigitas Mazaliauskas <sigis AT gmail DOT com> - -pkgname=opera -_ver=12.12 -_build=1707 -pkgver=$_ver.$_build -pkgrel=1 -pkgdesc='Fast and secure web browser and Internet suite' -arch=('i686' 'x86_64') -url='http://www.opera.com/browser/' -license=('custom:opera') -depends=('gcc-libs' 'libxt' 'freetype2' 'libxext' 'glib2' - 'shared-mime-info' 'hicolor-icon-theme' 'desktop-file-utils') -optdepends=('gstreamer0.10-base-plugins: HTML5 Video support' - 'gstreamer0.10-good: HTML5 Video support') -install=$pkgname.install -options=(!strip !zipman) - -if [[ $CARCH == i686 ]]; then - _arch=i386 - source=(http://ftp.opera.com/pub/opera/linux/${_ver/./}/opera-${_ver}-${_build}.${_arch}.linux.tar.xz) - sha256sums=('7f766faa08d62be616ea43cf4bb026c8b6afb5a51fa8eae1227f16d5658779ca') -elif [[ $CARCH == x86_64 ]]; then - _arch=$CARCH - source=(http://ftp.opera.com/pub/opera/linux/${_ver/./}/opera-${_ver}-${_build}.${_arch}.linux.tar.xz) - sha256sums=('1ba428bd5acf4f17a8ef0f970fb9e1334477468abbf21612dd8c2eec5fff9129') -fi - -package() { - opera-${_ver}-${_build}.${_arch}.linux/install --prefix /usr --repackage $pkgdir/usr - install -Dm 644 $pkgdir/usr/share/$pkgname/defaults/license.txt $pkgdir/usr/share/licenses/$pkgname/license.txt -} diff --git a/community/opera/opera.install b/community/opera/opera.install deleted file mode 100644 index 1190e6fd6..000000000 --- a/community/opera/opera.install +++ /dev/null @@ -1,20 +0,0 @@ -available() { - which "$1" >/dev/null 2>&1 -} - -post_install() { - update-mime-database /usr/share/mime >/dev/null - update-desktop-database -q /usr/share/applications - - if available gtk-update-icon-cache; then - gtk-update-icon-cache -q /usr/share/icons/hicolor - fi -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/paintown/PKGBUILD b/community/paintown/PKGBUILD deleted file mode 100644 index 8fe359267..000000000 --- a/community/paintown/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 75859 2012-09-03 17:14:58Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Jschares <jacob.schares@gmail.com> -# Contributor: celmir <scibecelmir@tuxfamily.org> -# Contributor: Feufochmar <guill.delacourt@gmail.com> - -pkgname=paintown -pkgver=3.6.0 -pkgrel=1 -pkgdesc="Open source fighting game in the same genre as Streets of Rage and Teenage Mutant Ninja Turtles" -arch=('i686' 'x86_64') -url="http://paintown.sourceforge.net/" -license=('GPL') -depends=('python2' 'freetype2' 'sdl' 'libpng' 'mpg123' 'libogg' 'libvorbis') -makedepends=('cmake' 'gendesk') -#install=paintown.install -source=(http://downloads.sourceforge.net/sourceforge/paintown/$pkgname-$pkgver.tar.bz2 - paintown.png) -md5sums=('5c1160bee51fe2011a1141c490a5d368' - 'ed547f1377212ea079cf9b0a1ad2d587') - -build() { - cd "$srcdir" - gendesk - - cd "$pkgname-$pkgver" - - # fix python2 header - for file in $(find . -name '*.py' -print); do - sed -i "s#/usr/bin/python#/usr/bin/env python2#" $file - done - - #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_png.c - #sed -i "1 i #include <zlib.h>" src/util/sdl/image/IMG_savepng.c - - mkdir -p build && cd build - cmake .. - make - cp bin/paintown .. -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - mkdir -p $pkgdir/usr/{bin,share/{paintown,pixmaps,applications,licenses/paintown}} - sh install.sh -d $pkgdir/usr/share/paintown -b $pkgdir/usr/bin - # correct the gnerated file to remove the wrong path (because $pkgdir/usr/bin is written in the file) - sed -i "s#$pkgdir##g" $pkgdir/usr/bin/paintown - install -m644 $srcdir/paintown.desktop $pkgdir/usr/share/applications/paintown.desktop - install -m644 $srcdir/paintown.png $pkgdir/usr/share/pixmaps/paintown.png - install -m644 LICENSE $pkgdir/usr/share/licenses/paintown/LICENSE - install -m644 LEGAL $pkgdir/usr/share/licenses/paintown/LEGAL -} - -# vim:set ts=2 sw=2 et: diff --git a/community/paintown/libpng15.patch b/community/paintown/libpng15.patch deleted file mode 100644 index 516c3ec01..000000000 --- a/community/paintown/libpng15.patch +++ /dev/null @@ -1,343 +0,0 @@ ------------------------------------------------------------------------- -r7015 | kazzmir | 2012-02-18 22:19:01 +0100 (Sa, 18 Feb 2012) | 1 line - -patch for sdl image to work with libpng1.4+ - -Index: src/util/sdl/image/IMG_png.c -=================================================================== ---- src/util/sdl/image/IMG_png.c (revision 7014) -+++ src/util/sdl/image/IMG_png.c (revision 7015) -@@ -71,6 +71,10 @@ - #endif - #include <png.h> - -+/* Check for the older version of libpng */ -+#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) -+#define LIBPNG_VERSION_12 -+#endif - - static struct { - int loaded; -@@ -80,6 +84,8 @@ - void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); - png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); - png_voidp (*png_get_io_ptr) (png_structp png_ptr); -+ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); -+ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); - png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); - png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); - void (*png_read_image) (png_structp png_ptr, png_bytepp image); -@@ -91,6 +97,9 @@ - void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); - void (*png_set_strip_16) (png_structp png_ptr); - int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); -+#ifndef LIBPNG_VERSION_12 -+ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); -+#endif - } lib; - - #ifdef LOAD_PNG_DYNAMIC -@@ -129,6 +138,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_channels = -+ (png_byte (*) (png_structp, png_infop)) -+ SDL_LoadFunction(lib.handle, "png_get_channels"); -+ if ( lib.png_get_channels == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_io_ptr = - (png_voidp (*) (png_structp)) - SDL_LoadFunction(lib.handle, "png_get_io_ptr"); -@@ -136,6 +152,13 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+ lib.png_get_PLTE = -+ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) -+ SDL_LoadFunction(lib.handle, "png_get_PLTE"); -+ if ( lib.png_get_PLTE == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } - lib.png_get_tRNS = - (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) - SDL_LoadFunction(lib.handle, "png_get_tRNS"); -@@ -213,6 +236,15 @@ - SDL_UnloadObject(lib.handle); - return -1; - } -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = -+ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) -+ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); -+ if ( lib.png_set_longjmp_fn == NULL ) { -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -+#endif - } - ++lib.loaded; - -@@ -236,7 +268,9 @@ - lib.png_create_read_struct = png_create_read_struct; - lib.png_destroy_read_struct = png_destroy_read_struct; - lib.png_get_IHDR = png_get_IHDR; -+ lib.png_get_channels = png_get_channels; - lib.png_get_io_ptr = png_get_io_ptr; -+ lib.png_get_PLTE = png_get_PLTE; - lib.png_get_tRNS = png_get_tRNS; - lib.png_get_valid = png_get_valid; - lib.png_read_image = png_read_image; -@@ -248,6 +282,9 @@ - lib.png_set_read_fn = png_set_read_fn; - lib.png_set_strip_16 = png_set_strip_16; - lib.png_sig_cmp = png_sig_cmp; -+#ifndef LIBPNG_VERSION_12 -+ lib.png_set_longjmp_fn = png_set_longjmp_fn; -+#endif - } - ++lib.loaded; - -@@ -347,7 +384,12 @@ - * 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) ) { -+#ifndef LIBPNG_VERSION_12 -+ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) -+#else -+ if ( setjmp(png_ptr->jmpbuf) ) -+#endif -+ { - error = "Error reading the PNG file."; - goto done; - } -@@ -416,9 +458,9 @@ - Rmask = 0x000000FF; - Gmask = 0x0000FF00; - Bmask = 0x00FF0000; -- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -+ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; - } else { -- int s = (info_ptr->channels == 4) ? 0 : 8; -+ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; - Rmask = 0xFF000000 >> s; - Gmask = 0x00FF0000 >> s; - Bmask = 0x0000FF00 >> s; -@@ -426,7 +468,7 @@ - } - } - surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -+ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); - if ( surface == NULL ) { - error = "Out of memory"; - goto done; -@@ -444,7 +486,7 @@ - - /* Create the array of pointers to image data */ - row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*height); -- if ( (row_pointers == NULL) ) { -+ if (row_pointers == NULL) { - error = "Out of memory"; - goto done; - } -@@ -467,6 +509,9 @@ - /* Load the palette, if any */ - palette = surface->format->palette; - if ( palette ) { -+ int png_num_palette; -+ png_colorp png_palette; -+ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); - if(color_type == PNG_COLOR_TYPE_GRAY) { - palette->ncolors = 256; - for(i = 0; i < 256; i++) { -@@ -474,12 +519,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( 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( 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; - } - } - } -Index: src/util/sdl/image/sdl-image-1.2.10-libpng15.patch -=================================================================== ---- src/util/sdl/image/sdl-image-1.2.10-libpng15.patch (revision 0) -+++ src/util/sdl/image/sdl-image-1.2.10-libpng15.patch (revision 7015) -@@ -0,0 +1,160 @@ -+--- IMG_png.c -++++ IMG_png.c -+@@ -71,6 +71,10 @@ -+ #endif -+ #include <png.h> -+ -++/* Check for the older version of libpng */ -++#if (PNG_LIBPNG_VER_MAJOR == 1) && (PNG_LIBPNG_VER_MINOR < 4) -++#define LIBPNG_VERSION_12 -++#endif -+ -+ static struct { -+ int loaded; -+@@ -80,6 +84,8 @@ -+ void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); -+ png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); -+ png_voidp (*png_get_io_ptr) (png_structp png_ptr); -++ png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); -++ png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); -+ png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); -+ png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); -+ void (*png_read_image) (png_structp png_ptr, png_bytepp image); -+@@ -91,6 +97,9 @@ -+ void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); -+ void (*png_set_strip_16) (png_structp png_ptr); -+ int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); -++#ifndef LIBPNG_VERSION_12 -++ jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); -++#endif -+ } lib; -+ -+ #ifdef LOAD_PNG_DYNAMIC -+@@ -129,6 +138,13 @@ -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -++ lib.png_get_channels = -++ (png_byte (*) (png_structp, png_infop)) -++ SDL_LoadFunction(lib.handle, "png_get_channels"); -++ if ( lib.png_get_channels == NULL ) { -++ SDL_UnloadObject(lib.handle); -++ return -1; -++ } -+ lib.png_get_io_ptr = -+ (png_voidp (*) (png_structp)) -+ SDL_LoadFunction(lib.handle, "png_get_io_ptr"); -+@@ -136,6 +152,13 @@ -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -++ lib.png_get_PLTE = -++ (png_uint_32 (*) (png_structp, png_infop, png_colorp *, int *)) -++ SDL_LoadFunction(lib.handle, "png_get_PLTE"); -++ if ( lib.png_get_PLTE == NULL ) { -++ SDL_UnloadObject(lib.handle); -++ return -1; -++ } -+ lib.png_get_tRNS = -+ (png_uint_32 (*) (png_structp, png_infop, png_bytep *, int *, png_color_16p *)) -+ SDL_LoadFunction(lib.handle, "png_get_tRNS"); -+@@ -213,6 +236,15 @@ -+ SDL_UnloadObject(lib.handle); -+ return -1; -+ } -++#ifndef LIBPNG_VERSION_12 -++ lib.png_set_longjmp_fn = -++ (jmp_buf * (*) (png_structp, png_longjmp_ptr, size_t)) -++ SDL_LoadFunction(lib.handle, "png_set_longjmp_fn"); -++ if ( lib.png_set_longjmp_fn == NULL ) { -++ SDL_UnloadObject(lib.handle); -++ return -1; -++ } -++#endif -+ } -+ ++lib.loaded; -+ -+@@ -236,7 +268,9 @@ -+ lib.png_create_read_struct = png_create_read_struct; -+ lib.png_destroy_read_struct = png_destroy_read_struct; -+ lib.png_get_IHDR = png_get_IHDR; -++ lib.png_get_channels = png_get_channels; -+ lib.png_get_io_ptr = png_get_io_ptr; -++ lib.png_get_PLTE = png_get_PLTE; -+ lib.png_get_tRNS = png_get_tRNS; -+ lib.png_get_valid = png_get_valid; -+ lib.png_read_image = png_read_image; -+@@ -248,6 +282,9 @@ -+ lib.png_set_read_fn = png_set_read_fn; -+ lib.png_set_strip_16 = png_set_strip_16; -+ lib.png_sig_cmp = png_sig_cmp; -++#ifndef LIBPNG_VERSION_12 -++ lib.png_set_longjmp_fn = png_set_longjmp_fn; -++#endif -+ } -+ ++lib.loaded; -+ -+@@ -347,7 +384,12 @@ -+ * 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) ) { -++#ifndef LIBPNG_VERSION_12 -++ if ( setjmp(*lib.png_set_longjmp_fn(png_ptr, longjmp, sizeof (jmp_buf))) ) -++#else -++ if ( setjmp(png_ptr->jmpbuf) ) -++#endif -++ { -+ error = "Error reading the PNG file."; -+ goto done; -+ } -+@@ -416,9 +458,9 @@ -+ Rmask = 0x000000FF; -+ Gmask = 0x0000FF00; -+ Bmask = 0x00FF0000; -+- Amask = (info_ptr->channels == 4) ? 0xFF000000 : 0; -++ Amask = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0xFF000000 : 0; -+ } else { -+- int s = (info_ptr->channels == 4) ? 0 : 8; -++ int s = (lib.png_get_channels(png_ptr, info_ptr) == 4) ? 0 : 8; -+ Rmask = 0xFF000000 >> s; -+ Gmask = 0x00FF0000 >> s; -+ Bmask = 0x0000FF00 >> s; -+@@ -426,7 +468,7 @@ -+ } -+ } -+ surface = SDL_AllocSurface(SDL_SWSURFACE, width, height, -+- bit_depth*info_ptr->channels, Rmask,Gmask,Bmask,Amask); -++ bit_depth*lib.png_get_channels(png_ptr, info_ptr), Rmask,Gmask,Bmask,Amask); -+ if ( surface == NULL ) { -+ error = "Out of memory"; -+ goto done; -+@@ -467,6 +509,9 @@ -+ /* Load the palette, if any */ -+ palette = surface->format->palette; -+ if ( palette ) { -++ int png_num_palette; -++ png_colorp png_palette; -++ lib.png_get_PLTE(png_ptr, info_ptr, &png_palette, &png_num_palette); -+ if(color_type == PNG_COLOR_TYPE_GRAY) { -+ palette->ncolors = 256; -+ for(i = 0; i < 256; i++) { -+@@ -474,12 +519,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( 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( 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/paintown/paintown.png b/community/paintown/paintown.png Binary files differdeleted file mode 100644 index c7e4830e4..000000000 --- a/community/paintown/paintown.png +++ /dev/null diff --git a/community/pam-krb5/PKGBUILD b/community/pam-krb5/PKGBUILD deleted file mode 100644 index c0e35c92b..000000000 --- a/community/pam-krb5/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 78535 2012-10-20 10:30:17Z ebelanger $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Ryan Corder <ryanc@greengrey.org> - -pkgname=pam-krb5 -pkgver=4.6 -pkgrel=1 -pkgdesc='A PAM module providing Kerberos v5 support.' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.eyrie.org/~eagle/software/pam-krb5/' -license=('custom') -options=('!libtool') -depends=('krb5' 'pam') -source=(http://archives.eyrie.org/software/kerberos/$pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('296e9c8281419ce1fc41d537d18f74b8' - 'c68a521345d79d54fb129a3f4ca2767b') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --enable-reduced-depends \ - --libdir=/usr/lib - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR=$pkgdir install - install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE -} diff --git a/community/passenger/build-fix-git-2012-05-17.diff b/community/passenger/build-fix-git-2012-05-17.diff deleted file mode 100644 index b9aa6b538..000000000 --- a/community/passenger/build-fix-git-2012-05-17.diff +++ /dev/null @@ -1,547 +0,0 @@ -diff -wbBur passenger-3.0.12/bin/passenger-install-nginx-module passenger.git/bin/passenger-install-nginx-module ---- passenger-3.0.12/bin/passenger-install-nginx-module 2012-04-13 12:09:57.000000000 +0400 -+++ passenger.git/bin/passenger-install-nginx-module 2012-05-17 19:35:01.000000000 +0400 -@@ -162,7 +162,7 @@ - new_screen - color_puts "<banner>PCRE (required by Nginx) not installed, downloading it...</banner>" - -- url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz" -+ url = "http://downloads.sourceforge.net/project/pcre/pcre/#{PREFERRED_PCRE_VERSION}/pcre-#{PREFERRED_PCRE_VERSION}.tar.gz" - dirname = "pcre-#{PREFERRED_PCRE_VERSION}" - tarball = "#{@working_dir}/pcre.tar.gz" - -diff -wbBur passenger-3.0.12/build/basics.rb passenger.git/build/basics.rb ---- passenger-3.0.12/build/basics.rb 2012-04-13 12:09:57.000000000 +0400 -+++ passenger.git/build/basics.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -33,7 +33,6 @@ - require 'phusion_passenger/platform_info/curl' - require 'phusion_passenger/platform_info/zlib' - require 'phusion_passenger/platform_info/compiler' --require 'phusion_passenger/platform_info/documentation_tools' - - include PhusionPassenger - include PhusionPassenger::PlatformInfo -diff -wbBur passenger-3.0.12/build/documentation.rb passenger.git/build/documentation.rb ---- passenger-3.0.12/build/documentation.rb 2012-02-04 02:25:41.000000000 +0400 -+++ passenger.git/build/documentation.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -1,5 +1,5 @@ - # Phusion Passenger - http://www.modrails.com/ --# Copyright (c) 2010 Phusion -+# Copyright (c) 2010, 2011, 2012 Phusion - # - # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. - # -@@ -21,25 +21,34 @@ - # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - # THE SOFTWARE. - --ASCIIDOC_FLAGS = "-b html5 -a toc -a theme=flask -a numbered -a toclevels=3 -a icons" -- - desc "Generate all documentation" - task :doc => Packaging::ASCII_DOCS - - Packaging::ASCII_DOCS.each do |target| - source = target.sub(/\.html$/, '.txt') - file target => [source] + Dir["doc/users_guide_snippets/**/*"] do -- if PlatformInfo.asciidoc -+ if PlatformInfo.find_command('mizuho') - if target =~ /apache/i -- type = "-a apache" -+ type = "apache" -+ juvia_site_key = "5jpmkyjqlml8rktsfldfpbwth8ig7w9" - elsif target =~ /nginx/i -- type = "-a nginx" -+ type = "nginx" -+ juvia_site_key = "q0ptarhn8o9xanwomq8zkgewbtwffyz" -+ elsif target =~ /standalone/i -+ type = nil -+ juvia_site_key = "amggdy0k65hb4hbjg3dh7pnb9zd8dwy" - else - type = nil -+ juvia_site_key = nil -+ end -+ command = "mizuho '#{source}'" -+ command << " -a #{type}" if type -+ if juvia_site_key -+ command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}" - end -- sh "#{PlatformInfo.asciidoc} #{ASCIIDOC_FLAGS} #{type} '#{source}'" -+ sh(command) - else -- sh "echo 'asciidoc required to build docs' > '#{target}'" -+ sh "echo 'Mizuho required to build docs' > '#{target}'" - end - end - -diff -wbBur passenger-3.0.12/build/packaging.rb passenger.git/build/packaging.rb ---- passenger-3.0.12/build/packaging.rb 2012-02-04 02:25:41.000000000 +0400 -+++ passenger.git/build/packaging.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -1,5 +1,5 @@ - # Phusion Passenger - http://www.modrails.com/ --# Copyright (c) 2010 Phusion -+# Copyright (c) 2010, 2011, 2012 Phusion - # - # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. - # -@@ -42,7 +42,7 @@ - s.require_paths = ["lib"] - s.add_dependency 'rake', '>= 0.8.1' - s.add_dependency 'fastthread', '>= 1.0.1' -- s.add_dependency 'daemon_controller', '>= 0.2.5' -+ s.add_dependency 'daemon_controller', '>= 1.0.0' - s.add_dependency 'rack' - s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB] - s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES -diff -wbBur passenger-3.0.12/DEVELOPERS.TXT passenger.git/DEVELOPERS.TXT ---- passenger-3.0.12/DEVELOPERS.TXT 2012-04-13 12:09:57.000000000 +0400 -+++ passenger.git/DEVELOPERS.TXT 2012-05-17 19:35:01.000000000 +0400 -@@ -13,6 +13,7 @@ - * rspec >= 1.1.2 - * mime-types >= 1.15 - * sqlite3-ruby -+* daemon_controller >= 1.0.0 - - The following software is optional: - -diff -wbBur passenger-3.0.12/doc/Users guide Apache.txt passenger.git/doc/Users guide Apache.txt ---- passenger-3.0.12/doc/Users guide Apache.txt 2012-02-04 02:25:41.000000000 +0400 -+++ passenger.git/doc/Users guide Apache.txt 2012-05-17 19:35:01.000000000 +0400 -@@ -203,15 +203,7 @@ - - ==== Installing via a native Linux package ==== - --John Leach from Brightbox has kindly provided an Ubuntu Hardy package for Phusion Passenger. The package is available from the link:http://apt.brightbox.net[Brightbox repository]. -- --Please install the native Linux package, e.g.: -------------------------------------------------------- --sudo sh -c 'echo "deb http://apt.brightbox.net hardy main" > /etc/apt/sources.list.d/brightbox.list' --sudo sh -c 'wget -q -O - http://apt.brightbox.net/release.asc | apt-key add -' --sudo apt-get update --sudo apt-get install libapache2-mod-passenger -------------------------------------------------------- -+John Leach from Brightbox has kindly provided a Ubuntu packages for Phusion Passenger. The package is available from the link:http://wiki.brightbox.co.uk/docs:phusion-passenger[Brightbox repository]. - - ==== What does the installer do? ==== - -@@ -635,7 +627,7 @@ - Allow from all - </Directory> - -- RackBaseURI /rails # <-- These lines have -+ RackBaseURI /rack # <-- These lines have - <Directory /websites/phusion/rails> # <-- been added. - Options -MultiViews # <-- - </Directory> # <-- -diff -wbBur passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp ---- passenger-3.0.12/ext/boost/config/stdlib/libstdcpp3.hpp 2012-02-04 02:25:42.000000000 +0400 -+++ passenger.git/ext/boost/config/stdlib/libstdcpp3.hpp 2012-05-17 19:35:01.000000000 +0400 -@@ -31,7 +31,8 @@ - - #ifdef __GLIBCXX__ // gcc 3.4 and greater: - # if defined(_GLIBCXX_HAVE_GTHR_DEFAULT) \ -- || defined(_GLIBCXX__PTHREADS) -+ || defined(_GLIBCXX__PTHREADS) \ -+ || defined(_GLIBCXX_HAS_GTHREADS) - // - // If the std lib has thread support turned on, then turn it on in Boost - // as well. We do this because some gcc-3.4 std lib headers define _REENTANT -diff -wbBur passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp passenger.git/ext/boost/exception/detail/error_info_impl.hpp ---- passenger-3.0.12/ext/boost/exception/detail/error_info_impl.hpp 2012-02-04 02:25:42.000000000 +0400 -+++ passenger.git/ext/boost/exception/detail/error_info_impl.hpp 2012-05-17 19:35:01.000000000 +0400 -@@ -30,7 +30,7 @@ - - protected: - -- ~error_info_base() throw() -+ virtual ~error_info_base() throw() - { - } - }; -diff -wbBur passenger-3.0.12/ext/common/StaticString.h passenger.git/ext/common/StaticString.h ---- passenger-3.0.12/ext/common/StaticString.h 2012-04-13 12:09:57.000000000 +0400 -+++ passenger.git/ext/common/StaticString.h 2012-05-17 19:35:01.000000000 +0400 -@@ -25,6 +25,7 @@ - #ifndef _PASSENGER_STATIC_STRING_H_ - #define _PASSENGER_STATIC_STRING_H_ - -+#include <sys/types.h> - #include <string> - #include <cstring> - #include <cstddef> -diff -wbBur passenger-3.0.12/ext/common/Watchdog.cpp passenger.git/ext/common/Watchdog.cpp ---- passenger-3.0.12/ext/common/Watchdog.cpp 2012-04-13 12:09:57.000000000 +0400 -+++ passenger.git/ext/common/Watchdog.cpp 2012-05-17 19:35:01.000000000 +0400 -@@ -975,7 +975,7 @@ - } else if (pid == -1) { - // Error - e = errno; -- throw SystemException("fork() failed", errno); -+ throw SystemException("fork() failed", e); - - } else { - // Parent -diff -wbBur passenger-3.0.12/ext/nginx/Configuration.c passenger.git/ext/nginx/Configuration.c ---- passenger-3.0.12/ext/nginx/Configuration.c 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/ext/nginx/Configuration.c 2012-05-17 19:35:01.000000000 +0400 -@@ -1,7 +1,7 @@ - /* - * Copyright (C) Igor Sysoev - * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com) -- * Copyright (C) 2010 Phusion -+ * Copyright (C) 2010, 2011, 2012 Phusion - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -335,6 +335,14 @@ - conf->upstream_config.pass_request_headers = NGX_CONF_UNSET; - conf->upstream_config.pass_request_body = NGX_CONF_UNSET; - -+#if (NGX_HTTP_CACHE) -+ conf->upstream_config.cache = NGX_CONF_UNSET_PTR; -+ conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT; -+ conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR; -+ conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR; -+ conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR; -+#endif -+ - conf->upstream_config.intercept_errors = NGX_CONF_UNSET; - - conf->upstream_config.cyclic_temp_file = 0; -@@ -511,8 +519,8 @@ - - if (conf->upstream_config.busy_buffers_size < size) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, -- "\"passenger_busy_buffers_size\" must be equal or bigger than " -- "maximum of the value of \"passenger_buffer_size\" and " -+ "\"passenger_busy_buffers_size\" must be equal to or greater " -+ "than the maximum of the value of \"passenger_buffer_size\" and " - "one of the \"passenger_buffers\""); - - return NGX_CONF_ERROR; -@@ -542,8 +550,8 @@ - - if (conf->upstream_config.temp_file_write_size < size) { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, -- "\"passenger_temp_file_write_size\" must be equal or bigger than " -- "maximum of the value of \"passenger_buffer_size\" and " -+ "\"passenger_temp_file_write_size\" must be equal to or greater than " -+ "the maximum of the value of \"passenger_buffer_size\" and " - "one of the \"passenger_buffers\""); - - return NGX_CONF_ERROR; -@@ -566,8 +574,8 @@ - { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "\"passenger_max_temp_file_size\" must be equal to zero to disable " -- "the temporary files usage or must be equal or bigger than " -- "maximum of the value of \"passenger_buffer_size\" and " -+ "temporary files usage or must be equal to or greater than " -+ "the maximum of the value of \"passenger_buffer_size\" and " - "one of the \"passenger_buffers\""); - - return NGX_CONF_ERROR; -@@ -639,6 +647,14 @@ - conf->cache_key = prev->cache_key; - } - -+ #if NGINX_VERSION_NUM >= 1002000 -+ ngx_conf_merge_value(conf->upstream_config.cache_lock, -+ prev->upstream_config.cache_lock, 0); -+ -+ ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout, -+ prev->upstream_config.cache_lock_timeout, 5000); -+ #endif -+ - #endif - - ngx_conf_merge_value(conf->upstream_config.pass_request_headers, -@@ -1273,7 +1289,7 @@ - NULL }, - - { ngx_string("passenger_pass_header"), -- NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG, -+ NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1, - ngx_conf_set_str_array_slot, - NGX_HTTP_LOC_CONF_OFFSET, - offsetof(passenger_loc_conf_t, upstream_config.pass_headers), -diff -wbBur passenger-3.0.12/ext/nginx/ContentHandler.c passenger.git/ext/nginx/ContentHandler.c ---- passenger-3.0.12/ext/nginx/ContentHandler.c 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/ext/nginx/ContentHandler.c 2012-05-17 19:35:01.000000000 +0400 -@@ -1,7 +1,7 @@ - /* - * Copyright (C) Igor Sysoev - * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com) -- * Copyright (C) 2010 Phusion -+ * Copyright (C) 2010, 2011, 2012 Phusion - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions -@@ -387,8 +387,8 @@ - app_type_string_len = sizeof("wsgi"); - break; - default: -- app_type_string = (const u_char *) "rails"; -- app_type_string_len = sizeof("rails"); -+ app_type_string = (const u_char *) "rack"; -+ app_type_string_len = sizeof("rack"); - break; - } - -@@ -931,7 +931,7 @@ - context = ngx_http_get_module_ctx(r, ngx_http_passenger_module); - - if (context == NULL) { -- return NGX_HTTP_INTERNAL_SERVER_ERROR; -+ return NGX_ERROR; - } - - rc = parse_status_line(r, context); -@@ -952,7 +952,6 @@ - } - #endif - -- r->http_version = NGX_HTTP_VERSION_9; - u->headers_in.status_n = NGX_HTTP_OK; - u->state->status = NGX_HTTP_OK; - -@@ -966,7 +965,7 @@ - u->headers_in.status_line.data = ngx_palloc(r->pool, - u->headers_in.status_line.len); - if (u->headers_in.status_line.data == NULL) { -- return NGX_HTTP_INTERNAL_SERVER_ERROR; -+ return NGX_ERROR; - } - - ngx_memcpy(u->headers_in.status_line.data, context->status_start, -diff -wbBur passenger-3.0.12/lib/phusion_passenger/dependencies.rb passenger.git/lib/phusion_passenger/dependencies.rb ---- passenger-3.0.12/lib/phusion_passenger/dependencies.rb 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/lib/phusion_passenger/dependencies.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -1,5 +1,5 @@ - # Phusion Passenger - http://www.modrails.com/ --# Copyright (c) 2010 Phusion -+# Copyright (c) 2010, 2011, 2012 Phusion - # - # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. - # -@@ -29,7 +29,6 @@ - require 'phusion_passenger/platform_info/ruby' - require 'phusion_passenger/platform_info/linux' - require 'phusion_passenger/platform_info/curl' --require 'phusion_passenger/platform_info/documentation_tools' - - module PhusionPassenger - -@@ -110,9 +109,9 @@ - return (!defined?(RUBY_ENGINE) || RUBY_ENGINE == "ruby") && RUBY_VERSION < "1.8.7" - end - -- # Returns whether asciidoc is required in order to be able to package all files -+ # Returns whether Mizuho is required in order to be able to package all files - # in the packaging list. -- def self.asciidoc_required? -+ def self.mizuho_required? - return Packaging::ASCII_DOCS.any? do |fn| - !File.exist?("#{SOURCE_ROOT}/#{fn}") - end -@@ -579,7 +578,7 @@ - end - - Daemon_Controller = Dependency.new do |dep| -- dep.name = "daemon_controller >= 0.2.5" -+ dep.name = "daemon_controller >= 1.0.0" - dep.install_instructions = "Please install RubyGems first, then run " << - "<b>#{PlatformInfo.gem_command || "gem"} install daemon_controller</b>" - dep.define_checker do |result| -@@ -591,7 +590,7 @@ - require 'daemon_controller' - begin - require 'daemon_controller/version' -- too_old = DaemonController::VERSION_STRING < '0.2.5' -+ too_old = DaemonController::VERSION_STRING < '1.0.0' - rescue LoadError - too_old = true - end -@@ -610,23 +609,18 @@ - end - end - -- AsciiDoc = Dependency.new do |dep| -- dep.name = "Asciidoc" -+ Mizuho = Dependency.new do |dep| -+ dep.name = "Mizuho" - dep.define_checker do |result| -- if PlatformInfo.asciidoc.nil? -+ mizuho = PlatformInfo.find_command('mizuho') -+ if mizuho.nil? - result.not_found - else -- result.found(PlatformInfo.asciidoc) -+ result.found(mizuho) - end - end -- if RUBY_PLATFORM =~ /darwin/ -- # Installing asciidoc with source-highlight is too much of a pain on OS X, -- # so recommend Mizuho instead. - dep.website = "http://github.com/FooBarWidget/mizuho" - dep.install_instructions = "Please install RubyGems first, then run <b>#{PlatformInfo.gem_command || "gem"} install mizuho</b>" -- else -- dep.website = "http://www.methods.co.nz/asciidoc/" -- end - end - end - -diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/command.rb passenger.git/lib/phusion_passenger/standalone/command.rb ---- passenger-3.0.12/lib/phusion_passenger/standalone/command.rb 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/lib/phusion_passenger/standalone/command.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -1,5 +1,5 @@ - # Phusion Passenger - http://www.modrails.com/ --# Copyright (c) 2010 Phusion -+# Copyright (c) 2010, 2011, 2012 Phusion - # - # "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui. - # -@@ -61,13 +61,13 @@ - require 'daemon_controller' - begin - require 'daemon_controller/version' -- too_old = DaemonController::VERSION_STRING < '0.2.5' -+ too_old = DaemonController::VERSION_STRING < '1.0.0' - rescue LoadError - too_old = true - end - if too_old - error "Your version of daemon_controller is too old. " << -- "You must install 0.2.5 or later. Please upgrade:\n\n" << -+ "You must install 1.0.0 or later. Please upgrade:\n\n" << - - " sudo gem uninstall FooBarWidget-daemon_controller\n" << - " sudo gem install daemon_controller" -@@ -210,24 +210,21 @@ - end - end - -- def ping_nginx -- require 'socket' unless defined?(UNIXSocket) -- if @options[:socket_file] -- UNIXSocket.new(@options[:socket_file]) -- else -- TCPSocket.new(@options[:address], nginx_ping_port) -- end -- end -- - def create_nginx_controller(extra_options = {}) - require_daemon_controller -+ require 'socket' unless defined?(UNIXSocket) - @temp_dir = "/tmp/passenger-standalone.#{$$}" - @config_filename = "#{@temp_dir}/config" -+ if @options[:socket_file] -+ ping_spec = [:unix, @options[:socket_file]] -+ else -+ ping_spec = [:tcp, @options[:address], nginx_ping_port] -+ end - opts = { - :identifier => 'Nginx', - :before_start => method(:write_nginx_config_file), - :start_command => method(:determine_nginx_start_command), -- :ping_command => method(:ping_nginx), -+ :ping_command => ping_spec, - :pid_file => @options[:pid_file], - :log_file => @options[:log_file], - :timeout => 25 -diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb ---- passenger-3.0.12/lib/phusion_passenger/standalone/runtime_installer.rb 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/lib/phusion_passenger/standalone/runtime_installer.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -91,8 +91,8 @@ - if Dependencies.fastthread_required? - result << Dependencies::FastThread - end -- if Dependencies.asciidoc_required? -- result << Dependencies::AsciiDoc -+ if Dependencies.mizuho_required? -+ result << Dependencies::Mizuho - end - return result - end -diff -wbBur passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb passenger.git/lib/phusion_passenger/standalone/start_command.rb ---- passenger-3.0.12/lib/phusion_passenger/standalone/start_command.rb 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/lib/phusion_passenger/standalone/start_command.rb 2012-05-17 19:35:01.000000000 +0400 -@@ -243,15 +243,32 @@ - end - end - -- def check_port_availability -- if !@options[:socket_file] -+ def check_port(address, port) -+ begin -+ socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0) -+ sockaddr = Socket.pack_sockaddr_in(port, address) -+ begin -+ socket.connect_nonblock(sockaddr) -+ rescue Errno::ENOENT, Errno::EINPROGRESS, Errno::EAGAIN, Errno::EWOULDBLOCK -+ if select(nil, [socket], nil, 0.1) - begin -- TCPSocket.new(@options[:address], @options[:port]).close -- port_taken = true -- rescue SystemCallError -- port_taken = false -+ socket.connect_nonblock(sockaddr) -+ rescue Errno::EISCONN -+ end -+ else -+ raise Errno::ECONNREFUSED -+ end - end -- if port_taken -+ return true -+ rescue Errno::ECONNREFUSED -+ return false -+ ensure -+ socket.close if socket -+ end -+ end -+ -+ def check_port_availability -+ if !@options[:socket_file] && check_port(@options[:address], @options[:port]) - error "The address #{@options[:address]}:#{@options[:port]} is already " << - "in use by another process, perhaps another Phusion Passenger " << - "Standalone instance.\n\n" << -@@ -261,7 +278,6 @@ - exit 1 - end - end -- end - - def should_watch_logs? - return !@options[:daemonize] && @options[:log_file] != "/dev/null" -diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb ---- passenger-3.0.12/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/lib/phusion_passenger/templates/apache2/apache_must_be_compiled_with_compatible_mpm.txt.erb 2012-05-17 19:35:01.000000000 +0400 -@@ -1,7 +1,7 @@ - <red>WARNING:</red> <yellow>Apache doesn't seem to be compiled with the 'prefork', 'worker' or 'event' MPM</yellow> - - Phusion Passenger has only been tested on Apache with the 'prefork', the --'worker' and the 'worker' MPM. Your Apache installation is compiled with -+'worker' and the 'event' MPM. Your Apache installation is compiled with - the '<%= @current_mpm %>' MPM. We recommend you to abort this installer and to recompile - Apache with either the 'prefork', the 'worker' or the 'event' MPM. - -diff -wbBur passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb passenger.git/lib/phusion_passenger/templates/standalone/config.erb ---- passenger-3.0.12/lib/phusion_passenger/templates/standalone/config.erb 2012-04-13 12:09:58.000000000 +0400 -+++ passenger.git/lib/phusion_passenger/templates/standalone/config.erb 2012-05-17 19:35:01.000000000 +0400 -@@ -27,7 +27,7 @@ - master_process on; - worker_processes 1; - daemon on; --error_log '<%= @options[:log_file] %>'; -+error_log '<%= @options[:log_file] %>' info; - pid '<%= @options[:pid_file] %>'; - <% if @options[:user] %>user <%= @options[:user] %> <%= default_group_for(@options[:user]) %>;<% end %> - -@@ -36,6 +36,7 @@ - } - - http { -+ log_format debug '[$time_local] $msec "$request" $status conn=$connection sent=$bytes_sent body_sent=$body_bytes_sent'; - include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types'; - passenger_ruby <%= PlatformInfo.ruby_command %>; - passenger_root '<%= passenger_root %>'; diff --git a/community/passenger/build-fix.patch b/community/passenger/build-fix.patch deleted file mode 100644 index cdbb78e68..000000000 --- a/community/passenger/build-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -wbBur passenger-3.0.15/ext/boost/thread/xtime.hpp passenger-3.0.15.my/ext/boost/thread/xtime.hpp ---- passenger-3.0.15/ext/boost/thread/xtime.hpp 2012-04-16 11:43:52.000000000 +0400 -+++ passenger-3.0.15.my/ext/boost/thread/xtime.hpp 2012-08-29 11:06:02.000000000 +0400 -@@ -18,6 +18,8 @@ - - namespace boost { - -+#undef TIME_UTC -+ - enum xtime_clock_types - { - TIME_UTC=1 diff --git a/community/passenger/passenger-install-apache2-module.patch b/community/passenger/passenger-install-apache2-module.patch deleted file mode 100644 index ee6080c1a..000000000 --- a/community/passenger/passenger-install-apache2-module.patch +++ /dev/null @@ -1,5 +0,0 @@ -105d104 -< wait -179,180d177 -< else -< wait diff --git a/community/pcsclite/pcscd b/community/pcsclite/pcscd deleted file mode 100644 index 1dc5e0166..000000000 --- a/community/pcsclite/pcscd +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -DAEMON=/usr/sbin/pcscd -NAME=pcscd -DESC="PC/SC smart card daemon" -PID_FILE=/run/pcscd/pcscd.pid -PCSCD_OPTIONS= - -case "$1" in - start) - stat_busy "Starting $DESC" - $DAEMON $PCSCD_OPTIONS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $NAME - stat_done - fi - ;; - - stop) - stat_busy "Stopping $DESC" - [ -f $PID_FILE ] && kill `cat $PID_FILE` &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $NAME - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - - status) - stat_busy "Checking $NAME status"; - ck_status $NAME - ;; - - *) - echo "usage: $0 {start|stop|restart|status}" - ;; - -esac - -exit 0 - diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD deleted file mode 100644 index 8533aab0f..000000000 --- a/community/pcsxr/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 66302 2012-02-23 13:44:59Z allan $ -## Maintainer: schuay <jakob.gruber@gmail.com> -## Contributor: quantax -- contact via Arch Linux forum or AUR -## Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> - -pkgname=pcsxr -pkgver=1.9.92 -pkgrel=4 -pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project' -arch=('i686' 'x86_64') -url='http://pcsxr.codeplex.com/' -license=('GPL') -depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'mesa') -conflicts=('pcsx-df') -_pkgurl="http://download.codeplex.com/Project/Download/FileDownload.aspx?ProjectName=$pkgname&DownloadId=140521&FileTime=129254829621800000&Build=$(wget -qO - http://www.codeplex.com/ | sed -nr 's/^[[:space:]]*Version [[:digit:]]{4}\.([[:digit:]]{1,2}\.){2}([[:digit:]]+)[[:space:]]*$/\2/p' | tail -n 1)" -source=($pkgname-$pkgver.tar.bz2::$_pkgurl) -md5sums=('28411aed0b4424f97227d94bdefaec83') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr --enable-libcdio --enable-opengl - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} - diff --git a/community/pdf2djvu/poppler-0.20.patch b/community/pdf2djvu/poppler-0.20.patch deleted file mode 100644 index 36d23f73a..000000000 --- a/community/pdf2djvu/poppler-0.20.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -wbBur pdf2djvu-0.7.12/configure pdf2djvu-0.7.12.my/configure ---- pdf2djvu-0.7.12/configure 2012-01-22 03:17:01.000000000 +0400 -+++ pdf2djvu-0.7.12.my/configure 2012-05-17 20:44:06.000000000 +0400 -@@ -6653,7 +6653,7 @@ - - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" -+ CXXFLAGS="$CXXFLAGS " - fi - - # Output files -diff -wbBur pdf2djvu-0.7.12/configure.ac pdf2djvu-0.7.12.my/configure.ac ---- pdf2djvu-0.7.12/configure.ac 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/configure.ac 2012-05-17 20:43:37.000000000 +0400 -@@ -225,7 +225,7 @@ - AX_CXXFLAGS_WARN_ALL(CXXFLAGS) - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -Werror=overloaded-virtual" -+ CXXFLAGS="$CXXFLAGS " - fi - - # Output files -diff -wbBur pdf2djvu-0.7.12/pdf-backend.cc pdf2djvu-0.7.12.my/pdf-backend.cc ---- pdf2djvu-0.7.12/pdf-backend.cc 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/pdf-backend.cc 2012-05-17 20:47:24.000000000 +0400 -@@ -32,10 +32,10 @@ - * ====================== - */ - --static void poppler_error_handler(int pos, char *message, va_list args) -+static void poppler_error_handler(void *data, ErrorCategory ec, int pos, char *message) - { - std::string format; -- std::string expanded_message = string_vprintf(message, args); -+ std::string expanded_message = message; - const char *c_message = expanded_message.c_str(); - if (pos >= 0) - { -@@ -61,7 +61,7 @@ - Cwd cwd(argv0_dir_name); - #endif - globalParams = new GlobalParams(); -- setErrorFunction(poppler_error_handler); -+ setErrorCallback(poppler_error_handler, 0); - } - - void pdf::Environment::set_antialias(bool value) -diff -wbBur pdf2djvu-0.7.12/pdf2djvu.cc pdf2djvu-0.7.12.my/pdf2djvu.cc ---- pdf2djvu-0.7.12/pdf2djvu.cc 2012-01-22 03:16:50.000000000 +0400 -+++ pdf2djvu-0.7.12.my/pdf2djvu.cc 2012-05-17 20:55:07.000000000 +0400 -@@ -1387,13 +1387,13 @@ - debug(0)++; - } - out1.reset(new pdf::Renderer(paper_color, config.monochrome)); -- out1->startDoc(doc->getXRef()); -+ out1->startDoc((PDFDoc*)doc->getXRef()); - outm.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); -- outm->startDoc(doc->getXRef()); -+ outm->startDoc((PDFDoc*)doc->getXRef()); - if (!config.monochrome) - { - outs.reset(new MutedRenderer(paper_color, config.monochrome, *page_files)); -- outs->startDoc(doc->getXRef()); -+ outs->startDoc((PDFDoc*)doc->getXRef()); - } - } - assert(doc.get() != NULL); diff --git a/community/pdns/2.9.18-default-mysql-options.patch b/community/pdns/2.9.18-default-mysql-options.patch deleted file mode 100755 index a9048e13e..000000000 --- a/community/pdns/2.9.18-default-mysql-options.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc pdns-2.9.18/modules/gmysqlbackend/smysql.cc ---- pdns-2.9.18.orig/modules/gmysqlbackend/smysql.cc 2005-04-23 23:40:15.000000000 +0200 -+++ pdns-2.9.18/modules/gmysqlbackend/smysql.cc 2005-07-17 10:38:35.363597586 +0200 -@@ -15,6 +15,9 @@ - const string &password) - { - mysql_init(&d_db); -+#if MYSQL_VERSION_ID > 32349 -+ mysql_options(&d_db, MYSQL_READ_DEFAULT_GROUP, "client"); -+#endif - if (!mysql_real_connect(&d_db, host.empty() ? 0 : host.c_str(), - user.empty() ? 0 : user.c_str(), - password.empty() ? 0 : password.c_str(), diff --git a/community/pdns/pdns-2.9.22-gcc44.patch b/community/pdns/pdns-2.9.22-gcc44.patch deleted file mode 100644 index 35c1c7777..000000000 --- a/community/pdns/pdns-2.9.22-gcc44.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -ur pdns-2.9.22.orig/pdns/dnsparser.cc pdns-2.9.22/pdns/dnsparser.cc ---- pdns-2.9.22.orig/pdns/dnsparser.cc 2008-11-15 22:32:46.000000000 +0200 -+++ pdns-2.9.22/pdns/dnsparser.cc 2009-07-06 22:09:02.000000000 +0300 -@@ -16,6 +16,7 @@ - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include <stdio.h> - #include "dnsparser.hh" - #include "dnswriter.hh" - #include <boost/lexical_cast.hpp> -diff -ur pdns-2.9.22.orig/pdns/rcpgenerator.cc pdns-2.9.22/pdns/rcpgenerator.cc ---- pdns-2.9.22.orig/pdns/rcpgenerator.cc 2008-11-15 23:20:27.000000000 +0200 -+++ pdns-2.9.22/pdns/rcpgenerator.cc 2009-07-06 22:07:26.000000000 +0300 -@@ -16,6 +16,7 @@ - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -+#include <stdio.h> - #include "rcpgenerator.hh" - #include "dnsparser.hh" - #include "misc.hh" diff --git a/community/pdnsd/pdnsd b/community/pdnsd/pdnsd deleted file mode 100755 index 34a541d18..000000000 --- a/community/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/pdnsd/pdnsd.service b/community/pdnsd/pdnsd.service deleted file mode 100644 index 5821dbcb2..000000000 --- a/community/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/pekwm/pekwm.desktop b/community/pekwm/pekwm.desktop deleted file mode 100644 index 2f59528bd..000000000 --- a/community/pekwm/pekwm.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=Pekwm -Comment=The pekwm window manager -Exec=pekwm -# no icon yet, only the top three are currently used -Icon= -Type=Application diff --git a/community/percona-server/mysqld b/community/percona-server/mysqld deleted file mode 100644 index 07f6b7e4c..000000000 --- a/community/percona-server/mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -# general config -. /etc/rc.conf -. /etc/rc.d/functions - -getPID() { - echo $(pgrep -u mysql mysqld 2>/dev/null); -} - -case "$1" in - start) - stat_busy "Starting Percona Server" - [ ! -d /var/run/mysqld ] && install -d -g mysql -o mysql /var/run/mysqld &>/dev/null - if [ -z "$(getPID)" ]; then - /usr/bin/mysqld_safe --user=mysql &>/dev/null & - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - timeo=30 - while [ $timeo -gt 0 ]; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 - let timeo=${timeo}-1 - done - if [ $timeo -eq 0 ]; then - stat_fail - exit 1 - else - echo $(getPID) > /var/run/mysqld/mysqld.pid - add_daemon mysqld - stat_done - fi - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping Percona Server" - if [ ! -z "$(getPID)" ]; then - timeo=30 - kill $(getPID) &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - fi - while [ ! -z "$(getPID)" -a $timeo -gt 0 ]; do - sleep 1 - let timeo=${timeo}-1 - done - if [ -z "$(getPID)" ]; then - rm -f /var/run/mysqld/mysqld.pid &>/dev/null - rm_daemon mysqld - stat_done - else - stat_fail - exit 1 - fi - else - stat_fail - exit 1 - fi - ;; - - restart) - $0 stop - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/percona-server/mysqld-post b/community/percona-server/mysqld-post deleted file mode 100644 index 8c404f4c4..000000000 --- a/community/percona-server/mysqld-post +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -while true; do - response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break - echo "$response" | grep -q "mysqld is alive" && break - sleep 1 -done diff --git a/community/percona-server/tmpfiles.conf b/community/percona-server/tmpfiles.conf deleted file mode 100644 index d621cd9df..000000000 --- a/community/percona-server/tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/mysqld 0755 mysql mysql -
\ No newline at end of file diff --git a/community/performous/boost-filesystem-v3.patch b/community/performous/boost-filesystem-v3.patch deleted file mode 100644 index 22dd07213..000000000 --- a/community/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/performous/ffmpeg-0.11.patch b/community/performous/ffmpeg-0.11.patch deleted file mode 100644 index 2962123ed..000000000 --- a/community/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/performous/fix-boost-1.50-xtime.patch b/community/performous/fix-boost-1.50-xtime.patch deleted file mode 100644 index d13b18c26..000000000 --- a/community/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/performous/png15.patch b/community/performous/png15.patch deleted file mode 100644 index b6fb8fb14..000000000 --- a/community/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/pidgin-lwqq/0.1a_fix.patch b/community/pidgin-lwqq/0.1a_fix.patch deleted file mode 100644 index 63f2adfd0..000000000 --- a/community/pidgin-lwqq/0.1a_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/liblwqq/http.c -+++ b/src/liblwqq/http.c -@@ -515,7 +515,9 @@ static int multi_timer_cb(CURLM *multi, long timeout_ms, void *userp) - } - if(g->still_running){ - lwqq_log(LOG_NOTICE,"still running:%d,timeout:%ld\n",g->still_running,timeout_ms); -+ #if USE_DEBUG - if(g->still_running>1)lwqq_gdb_whats_running(); -+ #endif - } - //close time clock - //this should always return 0 this is curl!! diff --git a/community/pidgin-musictracker/PKGBUILD b/community/pidgin-musictracker/PKGBUILD deleted file mode 100644 index 5194f814b..000000000 --- a/community/pidgin-musictracker/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# $Id: PKGBUILD 64347 2012-02-11 23:23:00Z allan $ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Angel Velasquez <angvp@archlinux.org> -# Contributor: Ionut Biru <ionut@archlinux.ro> -# Contributor: Andrea Scarpino <andrea@archlinux.org> - -pkgname=pidgin-musictracker -pkgver=0.4.22 -pkgrel=3 -pkgdesc="A plugin for Pidgin which displays the music track currently playing." -url='http://code.google.com/p/pidgin-musictracker' -license=('GPL2') -depends=('pidgin' 'gtk2' 'dbus-glib') -makedepends=('xmms2') -arch=('i686' 'x86_64' 'mips64el') -source=("http://pidgin-musictracker.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2") -options=('!libtool') -md5sums=('8d7225c705484db86b864cab5a536423') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/pion-net/PKGBUILD b/community/pion-net/PKGBUILD deleted file mode 100644 index c34b2b733..000000000 --- a/community/pion-net/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 80245 2012-11-18 10:31:18Z andrea $ -# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> -# Contributor: David Watzke <david@watzke.cz> -pkgname=pion-net -pkgver=4.0.12 -pkgrel=4 -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/pion-net/boost_1.50_support.diff b/community/pion-net/boost_1.50_support.diff deleted file mode 100644 index 7b82f34b9..000000000 --- a/community/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/pion-net/gcc_4.7_fix.diff b/community/pion-net/gcc_4.7_fix.diff deleted file mode 100644 index 5c2ed3cfe..000000000 --- a/community/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/pkgfile/0001-update-fix-use-after-free.patch b/community/pkgfile/0001-update-fix-use-after-free.patch deleted file mode 100644 index 4494224c5..000000000 --- a/community/pkgfile/0001-update-fix-use-after-free.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 60559a15e170ad49b388ee442eb2ccbe483bc9aa Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Mon, 19 Nov 2012 19:50:47 -0500 -Subject: [PATCH] update: fix use after free - -mark the address space as unread so that we don't attempt a double free -on a repo download failure during the final cleanup. ---- - src/update.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/update.c b/src/update.c -index c2e76e5..0b4fb8a 100644 ---- a/src/update.c -+++ b/src/update.c -@@ -552,7 +552,7 @@ static int add_repo_download(CURLM *multi, struct repo_t *repo) - } else { - curl_multi_remove_handle(multi, repo->curl); - FREE(repo->url); -- free(repo->data); -+ FREE(repo->data); - repo->buflen = 0; - repo->server_idx++; - } --- -1.8.0 - diff --git a/community/pkgfile/PKGBUILD b/community/pkgfile/PKGBUILD deleted file mode 100644 index 73be9ebf8..000000000 --- a/community/pkgfile/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 80498 2012-11-23 00:24:41Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgname=pkgfile -pkgver=7 -pkgrel=2 -pkgdesc="a pacman .files metadata explorer" -arch=('i686' 'x86_64' 'mips64el') -url="http://github.com/falconindy/pkgfile" -license=('MIT') -depends=('libarchive' 'curl' 'pcre' 'pacman') -conflicts=('pkgtools<24-2') -makedepends=('perl') -source=("https://github.com/downloads/falconindy/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig} - '0001-update-fix-use-after-free.patch') -install=pkgfile.install -md5sums=('f1dc0052b1c21597ea2fa0f0ce05608c' - '28599a9b6e56860a9cba1c95ec797551' - 'a4f505d080795fd0c10fd1d93b4520f6') - -build() { - cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir/0001-update-fix-use-after-free.patch" - - ./configure - make - - # generate a license file - sed '/\*\//q' src/pkgfile.c >LICENSE -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim: ft=sh syn=sh diff --git a/community/pkgfile/pkgfile.install b/community/pkgfile/pkgfile.install deleted file mode 100644 index 5545a3d39..000000000 --- a/community/pkgfile/pkgfile.install +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -post_install() { - printf "==> Run 'pkgfile --update' to initialize the database\n" -} - -post_remove() { - # the cache dir might not be removed, notify the user - if [ -d var/cache/pkgfile ]; then - printf "==> /var/cache/pkgfile has not been removed\n" - fi -} - -post_upgrade() { - if [ "$(vercmp 5 "$2")" -eq 1 ]; then - printf "==> DB format has changed. Please run pkgfile -uu\n" - fi -} diff --git a/community/pkgtools/PKGBUILD b/community/pkgtools/PKGBUILD deleted file mode 100644 index 483c97d51..000000000 --- a/community/pkgtools/PKGBUILD +++ /dev/null @@ -1,33 +0,0 @@ -# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com> -# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com> -pkgname=pkgtools -pkgver=24 -pkgrel=1 -pkgdesc="A collection of scripts for Arch Linux packages" -arch=('i686' 'x86_64' 'mips64el') -url="http://bbs.archlinux.org/viewtopic.php?pid=384196" -license=('GPL') -source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver) -backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf') -install=pkgtools.install -provides=(newpkg pkgfile) -depends=('bash>=4' 'pcre' 'libarchive' 'python') -optdepends=('cron: For pkgfile --update entry' - 'abs: Provides proto packaging files for newpkg' - 'python-yaml: for gem2arch' - 'python2: for pkgconflict') -md5sums=('f139c3940e1038cac4e29e985089e8a8') - -build() { - cd "$srcdir/Daenyth-$pkgname"-* - - make -} - -package() { - cd "$srcdir/Daenyth-$pkgname"-* - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/pkgtools/pkgtools.install b/community/pkgtools/pkgtools.install deleted file mode 100644 index bcbf2f85c..000000000 --- a/community/pkgtools/pkgtools.install +++ /dev/null @@ -1,66 +0,0 @@ -_MSG_UPDATE=" - Make sure to run pkgfile --update before use" -_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update - If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf" -_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash. - This will automatically run pkgfile whenever you run - a command which the shell cannot find. If you want - this functionality, set CMD_SEARCH_ENABLED to 1 in - /etc/pkgtools/pkgfile.conf (or per-user by copying - that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then - in your current shell run: - source /etc/profile" - -is_update_from() { - res="`vercmp $1 $2`" - case $res in - '-1'|'0') return 0;; - '1') return 1;; - esac -} - -## arg 1: the new package version -post_install() { - echo "$_MSG_UPDATE" - echo "$_MSG_HOOK" - echo "$_MSG_CRON" -} - -## arg 1: the new package version -## arg 2: the old package version -post_upgrade() { - if is_update_from $2 11-1; then - echo " - All bugs related to pkgfile -b should be fixed in this update." - fi - if is_update_from $2 12-1; then - echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed." - echo " Please remove any old symlinks relating to it." - echo "$_MSG_HOOK" - fi - if is_update_from $2 15-1; then - echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration." - echo " run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»" - fi - if is_update_from $2 18-1; then - echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197" - fi - if is_update_from $2 19-1; then - echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to" - echo " regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0" - echo " in /etc/pkgtools/pkgfile.conf" - echo " - This version of pkgtools contains a new tool called 'maintpkg'" - echo " It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors" - fi - if is_update_from $2 22-1; then - echo " - This is the largest release in a long time. This updates all python scripts to py3k." - echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging" - fi -} - -## arg 1: the old package version -post_remove() { - cat << _EOM - - You may want to clean /var/cache/pkgtools/lists -_EOM -} - -# vim:set ts=2 sw=2 et filetype=sh: diff --git a/community/polipo/polipo.cron b/community/polipo/polipo.cron deleted file mode 100644 index 8270d0a05..000000000 --- a/community/polipo/polipo.cron +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -/etc/rc.d/polipo purge >/dev/null 2>&1 diff --git a/community/povray/LICENSE b/community/povray/LICENSE deleted file mode 100644 index 8a22b9e7e..000000000 --- a/community/povray/LICENSE +++ /dev/null @@ -1,237 +0,0 @@ - POV-Ray Licence Agreement - GENERAL LICENSE AGREEMENT - FOR PERSONAL USE - Persistence of Vision Ray Tracer (POV-Ray) - Version 3.6 License and Terms & Conditions of Use - version of 1 February 2005 - (also known as POVLEGAL.DOC) - -Please read through the terms and conditions of this license carefully. This -license is a binding legal agreement between you, the 'User' (an individual -or single entity) and Persistence of Vision Raytracer Pty. Ltd. ACN 105 891 -870 (herein also referred to as the "Company"), a company incorporated in the -state of Victoria, Australia, for the product known as the "Persistence of -Vision Ray Tracer", also referred to herein as 'POV-Ray'. - -YOUR ATTENTION IS PARTICULARLY DRAWN TO THE DISCLAIMER OF WARRANTY AND NO -LIABILITY AND INDEMNITY PROVISIONS. TO USE THE PERSISTENCE OF VISION RAY -TRACER ("POV-RAY") YOU MUST AGREE TO BE BOUND BY THE TERMS AND CONDITIONS SET -OUT IN THIS DOCUMENT. IF YOU DO NOT AGREE TO ALL THE TERMS AND CONDITIONS OF -USE OF POV-RAY SET OUT IN THIS LICENSE AGREEMENT, OR IF SUCH TERMS AND -CONDITIONS ARE NOT BINDING ON YOU IN YOUR JURISDICTION, THEN YOU MAY NOT USE -POV-RAY IN ANY MANNER. THIS GENERAL LICENSE AGREEMENT MUST ACCOMPANY ALL -POV-RAY FILES WHETHER IN THEIR OFFICIAL OR CUSTOM VERSION FORM. IT MAY NOT BE -REMOVED OR MODIFIED. THIS GENERAL LICENSE AGREEMENT GOVERNS THE USE OF -POV-RAY WORLDWIDE. THIS DOCUMENT SUPERSEDES AND REPLACES ALL PREVIOUS GENERAL -LICENSES. - -INTRODUCTION - -This document pertains to the use of the Persistence of Vision Ray Tracer -(also known as POV-Ray). It applies to all POV-Ray program source files, -executable (binary) files, scene files, documentation files, help files, -bitmaps and other POV-Ray files contained in official Company archives, -whether in full or any part thereof, and are herein referred to as the -"Software". The Company reserves the right to revise these rules in future -versions and to make additional rules to address new circumstances at any -time. Such rules, when made, will be posted in a revised license file, the -latest version of which is available from the Company website at -http://www.povray.org/povlegal.html. - -USAGE PROVISIONS - -Subject to the terms and conditions of this agreement, permission is granted -to the User to use the Software and its associated files to create and render -images. The creator of a scene file retains all rights to any scene files -they create, and any images generated by the Software from them. Subject to -the other terms of this license, the User is permitted to use the Software in -a profit-making enterprise, provided such profit arises primarily from use of -the Software and not from distribution of the Software or a work including -the Software in whole or part. - -Please refer to http://www.povray.org/povlegal.html for licenses covering -distribution of the Software and works including the Software. - -The User is also granted the right to use the scene files, fonts, bitmaps, -and include files distributed in the INCLUDE and SCENES\INCDEMO sub- -directories of the Software in their own scenes. Such permission does not -extend to any other files in the SCENES directory or its sub-directories. The -SCENES files are for the User's enjoyment and education but may not be the -basis of any derivative works unless the file in question explicitly grants -permission to do such. - -This licence does not grant any right of re-distribution or use in any manner -other than the above. The Company has separate license documents that apply -to other uses (such as re-distribution via the internet or on CD) ; please -visit http://www.povray.org/povlegal.html for links to these. In particular -you are advised that the sale, lease, or rental of the Software in any form -without written authority from the Company is explicitly prohibited. - -Notwithstanding anything in the the balance of this licence agreement, -nothing in this licence agreement permits the installation or use of the -Software in conjunction with any product (including software) produced -or distributed by any party who is, or has been, in violation of this -licence agreement or of the distribution licence - (http://www.povray.org/distribution-license.html) -(or any earlier or later versions of those documents) unless: - - a. the Company has explicitly released that party in writing from the - consequences of their non compliance; or - b. both of the following are true: - i. the installation or use of the Software is without the User - being aware of the abovementioned violation; and - ii. the installation or use of the Software is not a result (whether - direct or indirect) of any request or action of the abovementioned - party (or any of its products), any agent of that party (or any of - their products), or any person(s) involved in supplying any such - product to the User. - -COPYRIGHT - -Copyright 1991-2003, Persistence of Vision Team. -Copyright 2003-2004, Persistence of Vision Raytracer Pty. Ltd. -Windows version Copyright 1996-2003, Christopher Cason. - -Copyright subsists in this Software which is protected by Australian and -international copyright laws. The Software is NOT PUBLIC DOMAIN. - -Nothing in this agreement shall give you any rights in respect of the -intellectual property of the Company and you acknowledge that you do not -acquire any rights in respect of such intellectual property rights. You -acknowledge that the Software is the valuable intellectual property of the -Company and that if you use, modify or distribute the Software for -unauthorized purposes or in an unauthorized manner (or cause or allow the -forgoing to occur), you will be liable to the Company for any damages it may -suffer (and which you acknowledge it may suffer) as well as statutory damages -to the maximum extent permitted by law and also that you may be liable to -criminal prosecution. You indemnify the Company and the authors of the -Software for every single consequence flowing from the aforementioned events. - -DISCLAIMER OF WARRANTY - -This Software is provided on an "AS IS" basis, without warranty of any kind, -express or implied, including without limitation, any implied warranties of -merchantability, fitness for a particular purpose and non-infringement of -intellectual property of any third party. This Software has inherent -limitations including design faults and programming bugs. The entire risk as -to the quality and performance of the Software is borne by you, and it is -your responsibility to ensure that it does what you require it to do prior to -using it for any purpose (other than testing it), and prior to distributing -it in any fashion. Should the Software prove defective, you agree that you -alone assume the entire cost resulting in any way from such defect. - -This disclaimer of warranty constitutes an essential and material term of -this agreement. If you do not or cannot accept this, or if it is -unenforceable in your jurisdiction, then you may not use the Software in any -manner. - -NO LIABILITY - -When you use the Software you acknowledge and accept that you do so at your -sole risk. You agree that under no circumstances shall you have any claim -against the Company or anyone associated directly or indirectly with the -Company whether as employee, subcontractor, agent, representative, -consultant, licensee or otherwise ("Company Associates") for any loss, -damages, harm, injury, expense, work stoppage, loss of business information, -business interruption, computer failure or malfunction which may be suffered -by you or by any third party from any cause whatsoever, howsoever arising, in -connection with your use or distribution of the Software even where the -Company were aware, or ought to have been aware, of the potential of such -loss. Damages referred to above shall include direct, indirect, general, -special, incidental, punitive and/or consequential. - -This disclaimer of liability constitutes an essential and material term of -this agreement. If you do not or cannot accept this, or if it is -unenforceable in your jurisdiction, then you may not use the Software. - -INDEMNITY - -You indemnify the Company and Company Associates and hold them harmless -against any claims which may arise from any loss, damages, harm, injury, -expense, work stoppage, loss of business information, business interruption, -computer failure or malfunction, which may be suffered by you or any other -party whatsoever as a consequence of any act or omission of the Company -and/or Company Associates, whether negligent or not, arising out of your use -and/or distribution of the Software, or from any other cause whatsoever, -howsoever arising, in connection with the Software. These provisions are -binding on your estate, heirs, executors, legal successors, administrators, -parents and/or guardians. - -This indemnification constitutes an essential and material term of this -agreement. If you do not or cannot accept this, or if it is unenforceable in -your jurisdiction, then you may not use the Software. - -HIGH RISK ACTIVITIES - -This Software and the output produced by this Software is not fault-tolerant -and is not designed, manufactured or intended for use as on-line control -equipment in hazardous environments requiring fail-safe performance, in which -the failure of the Software could lead or directly or indirectly to death, -personal injury, or severe physical or environmental damage ("High Risk -Activities"). The Company specifically disclaims any express or implied -warranty of fitness for High Risk Activities and explicitly prohibits the use -of the Software for such purposes. - -CRYPTOGRAPHIC SIGNING OF DOCUMENTS - -Changes to this Agreement and documents issued under its authority may be -cryptographically signed by the POV-Ray Team Co-ordinator's private PGP key. -In the absence of evidence to the contrary, such documents shall be considered, -under the terms of this Agreement, to be authentic provided the signature is -valid. The master copy of this Agreement at http://www.povray.org/povlegal.html -will also be signed by the current version of the team-coordinator's key. - -The public key for the POV-Ray Team-coordinator can be retrieved from the -location https://secure.povray.org/keys/. The current fingerprint for it is -B4DD 932A C080 C3A3 6EA2 9952 DB04 4A74 9901 4518. - -MISCELLANEOUS - -This Agreement constitutes the complete agreement concerning this license. -Any changes to this agreement must be in writing and may take the form of -notifications by the Company to you, or through posting notifications on the -Company website. THE USE OF THIS SOFTWARE BY ANY PERSON OR ENTITY IS -EXPRESSLY MADE CONDITIONAL ON THEIR ACCEPTANCE OF THE TERMS SET FORTH HEREIN. - -Except where explicitly stated otherwise herein, if any provision of this -Agreement is found to be invalid or unenforceable, the invalidity or -unenforceability of such provision shall not affect the other provisions of -this agreement, and all provisions not affected by such invalidity or -unenforceability shall remain in full force and effect. In such cases you -agree to attempt to substitute for each invalid or unenforceable provision a -valid or enforceable provision which achieves to the greatest extent -possible, the objectives and intention of the invalid or unenforceable -provision. The validity and interpretation of this agreement will be governed -by the laws of Australia in the state of Victoria (except for conflict of law -provisions). - -CONTACT INFORMATION - -License inquiries can be made via email; please use the following address -(but see below prior to emailing) : - - team-coord-[three-letter month]-[four-digit year]@povray.org - -for example, team-coord-jun-2004@povray.org should be used if at the time you -send the email it is the month of June 2004. The changing email addresses are -necessary to combat spam and email viruses. Old email addresses may be deleted -at our discretion. - -Note that the above address may change for reasons other than that given above; -please check the version of this document at http://www.povray.org/povlegal.html -for the current address. Note that your inability or failure to contact us -for any reason is not an excuse for violating this licence. - -Do NOT send any attachments of any sort other than by prior arrangement. -EMAIL MESSAGES INCLUDING ATTACHMENTS WILL BE DELETED UNREAD. - -The following postal address is only for official license business. Please -note that it is preferred that initial queries about licensing be made via -email ; postal mail should only be used when email is not possible, or when -written documents are being exchanged by prior arrangement. - - Persistence of Vision Raytracer Pty. Ltd. - PO Box 407 - Williamstown, - Victoria 3016 - Australia diff --git a/community/povray/PKGBUILD b/community/povray/PKGBUILD deleted file mode 100644 index 34f7a22cb..000000000 --- a/community/povray/PKGBUILD +++ /dev/null @@ -1,66 +0,0 @@ -# $Id: PKGBUILD 74007 2012-07-18 01:08:29Z ibiru $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> -# Contributor: tobias <tobias@archlinux.org> -# Contributor: red_over_blue -# Contributor: neri - -pkgname=povray -pkgver=3.7.0.RC6 -pkgrel=4 -pkgdesc="Script based raytracer for creating 3D graphics" -arch=('x86_64' 'i686') -license=('custom') -url="http://povray.org/" -depends=('libtiff' 'libpng' 'boost-libs') -makedepends=('boost') -backup=("etc/povray/${pkgver%.*.*}/povray.conf" - "etc/povray/${pkgver%.*.*}/povray.ini") -source=("http://www.povray.org/redirect/www.povray.org/beta/source/$pkgname-$pkgver.tar.gz" - 'povray3.7.0_rc3-user-conf.patch' - 'distribution-license.txt' - 'LICENSE' - 'source-license.txt') -sha256sums=('374957bdb90fb7be5f36f839b3f04ab0a4340f6e8cf369f658d6592a342803e3' - '95b04ec4973e6e8a80fc83df2e3caff0b4d6699c4154144f3017d42cab7236e0' - 'bcf6893c741568bbff6839bb7310b0c43af8cb54bae792da21123e1026f91ae9' - '9162060797de4f7f91ccf5e1fac5ec3378a0b0fed382393797ba3f4f27896402' - '7d80992314f7947f5f672a4ad8b1d072a6179f01fb0228a88e4224a8bd45de96') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - sed -i 's:=no:=yes:' unix/config/ax_boost_thread.m4 - sed -i 's:AC_MSG_FAILURE(\[c:AC_MSG_RESULT(\[:' configure.ac - sed -i 's:TIME_UTC:TIME_UTC_:' \ - source/backend/scene/view.cpp \ - vfe/vfepovms.cpp \ - vfe/vfesession.cpp - ./bootstrap - patch -p1 < ../povray3.7.0_rc3-user-conf.patch - COMPILED_BY="Arch Linux" ./configure --prefix=/usr --sysconfdir=/etc - # --disable-optimiz #--with-boost-thread=boost_thread-gcc-mt - make CXXFLAGS+="-lboost_system" - gzip povray.1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - mkdir -p "$pkgdir/usr/share/$pkgname-3.7" - cp -r icons include ini scenes scripts "$pkgdir/usr/share/$pkgname-3.7" - mkdir -p "$pkgdir/usr/share/doc/$pkgname-3.7" - cp -r doc "$pkgdir/usr/share/doc/$pkgname-3.7" - install -Dm755 unix/povray "$pkgdir/usr/bin/povray" - install -Dm644 povray.conf "$pkgdir/etc/povray/3.7/povray.conf" - install -Dm644 povray.ini "$pkgdir/etc/povray/3.7/povray.ini" - install -Dm644 povray.1.gz "$pkgdir/usr/share/man/man1/povray.1.gz" - install -Dm644 ../LICENSE \ - "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - install -Dm644 ../distribution-license.txt \ - "$pkgdir/usr/share/licenses/$pkgname/distribution-license.txt" - install -Dm644 ../source-license.txt \ - "$pkgdir/usr/share/licenses/$pkgname/source-license.txt" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/povray/distribution-license.txt b/community/povray/distribution-license.txt deleted file mode 100644 index 16615f148..000000000 --- a/community/povray/distribution-license.txt +++ /dev/null @@ -1,532 +0,0 @@ - POV-Ray License Agreement - DISTRIBUTOR'S LICENCE AGREEMENT - Persistence of Vision Raytracer(tm) (POV-Ray(tm)) - 13 August 2004 - -Licensed Versions: Versions 3.5 and 3.6 - -Please read through the terms and conditions of this license carefully. - -This is a binding legal agreement between you, the "Distributor" and -Persistence of Vision Raytracer Pty. Ltd. ACN 105 891 870 ("POV"), a -company incorporated in the state of Victoria, Australia, for the -product known as the "Persistence of Vision Raytracer(tm)", also -referred to herein as "POV-Ray(tm)". - -The terms of this agreement are set out at http://www.povray.org/distribution-license.html -("Official Terms"). The Official Terms take precedence over this document to the extent -of any inconsistency. - -1. INTRODUCTION - -1.1. In this agreement, except to the extent the context requires - otherwise, the following capitalised terms have the following - meanings: - - (a) Distribution means: - - (i) a single item of a distribution medium, including a CD Rom or - DVD Rom, containing software programs and/or data; - - (ii) a set of such items; - - (iii) a data file in a generally accepted data format from which - such an item can be created using generally available standard - tools; - - (iv) a number of such data files from which a set of such items can - be created; or - - (v) a data file in a generally accepted data storage format which is - an archive of software programs and/or data; - - (b) Derived Code means all software which is derived from or is an - adaptation of any part of the Software other than a scene file; - - (c) Intellectual Rights means: - - (i) all copyright, patent, trade mark, trade secret, design, and - circuit layout rights; - - (ii) all rights to the registration of such rights; and - - (iii) all rights of a similar nature - - which exist anywhere in the world; - - (d) Licensed Version means the version set out at the top of this - agreement against the heading "Licensed Version" and all minor - releases of this version (ie releases of the form x.y.z); - - (e) POV Associate means any person associated directly or indirectly - with POV whether as a director, officer, employee, subcontractor, - agent, representative, consultant, licensee or otherwise; - - (f) Modification Terms means the most recent version from time to time - of the document of that name made available from the Site - - (g) Revocation List means the list of that name linked to from the - Official Terms; - - (h) Site means www.povray.org; - - (i) Software means the Licensed Version of the Persistence of Vision - Raytracer(tm) (also known as POV-Ray(tm)) (including all POV-Ray - program source files, executable (binary) files, scene files, - documentation files, help files, bitmaps and other POV-Ray files - associated with the Licensed Version) in a form made available by - POV on the Site; - - (j) User Licence means the most recent version from time to time of - the document of that name made available from the Site. - -2. OPEN SOURCE DISTRIBUTIONS - -2.1. In return for the Distributor agreeing to be bound by the terms of - this agreement, POV grants the Distributor permission to make a - copy of the Software by including the Software in a generally - recognised Distribution of a recognised operating system where the - kernel of that operating system is made available under licensing - terms: - - (a) which are approved by the Open Source Initiative - (www.opensource.org) as complying with the "Open Source - Definition" put forward by the Open Source Initiative; or - - (b) which comply with the "free software definition" of the Free - Software Foundation (www.fsf.org). - -2.2. As at June 2004, and without limiting the generality of the term, - each of the following is a "generally recognised Distribution" for - the purposes of clause 2.1: Debian, Red Hat (Enterprise and - Fedora), SuSE, Mandrake, Xandros, Gentoo and Knoppix Linux - distributions, and officially authorized distributions of the - FreeBSD, OpenBSD, and NetBSD projects. - -2.3. Clause 2.1 also applies to the Software being included in the above - distributions 'package' and 'ports' systems, where such exist; - -2.4. Where the Distributor reproduces the Software in accordance with - clause 2.1: - - (a) the Distributor may rename, reorganise or repackage (without - omission) the files comprising the Software where such - renaming, reorganisation or repackaging is necessary to - conform to the naming or organisation scheme of the target - operating environment of the Distribution or of an established - package management system of the target operating environment - of the Distribution; and - - (b) the Distributor must not otherwise rename, reorganise or - repackage the Software. - -3. DISTRIBUTION LICENCE - -3.1. Subject to the terms and conditions of this agreement, and in - return for Distributor agreeing to be bound by the terms of this - agreement, POV grants the Distributor permission to make a copy of - the Software in any of the following circumstances: - - (a) in the course of providing a mirror of the POV-Ray Site (or - part of it), which is made available generally over the - internet to each person without requiring that person to - identify themselves and without any other restriction other - than restrictions designed to manage traffic flows; - - (b) by placing it on a local area network accessible only by - persons authorized by the Distributor whilst on the - Distributor's premises; - - (c) where that copy is provided to a staff member or student - enrolled at a recognised educational institution; - - (d) by including the Software as part of a Distribution where: - - (i) neither the primary nor a substantial purpose of the - distribution of the Distribution is the distribution of - the Software. That is, the distribution of the Software - is merely incidental to the distribution of the - Distribution; and - - (ii) if the Software was not included in the Distribution, - the remaining software and data included within the - Distribution would continue to function effectively and - according to its advertised or intended purpose; - - (e) by including the Software as part of a Distribution where: - - (i) there is no data, program or other files apart from the - Software on the Distribution; - - (ii) the Distribution is distributed by a person to another - person known to that person; or - - (iii) the Distributor has obtained explicit written - authority from POV to perform the distribution, citing - this clause number, prior to the reproduction being - made. - -3.2. In each case where the Distributor makes a copy of the Software in - accordance with clause 3.1, the Distributor must, unless no payment - or other consideration of any type is received by Distributor in - relation to the Distribution: - - (a) ensure that each person who receives a copy of the Software - from the Distributor is aware prior to acquiring that copy: - - (i) of the full name and contact details of the Distributor, - including the Distributor's web site, street address, mail - address, and working email address; - - (ii) that the Software is available without charge from the - Site; - - (iii) that no charge is being made for the granting of a - licence over the Software. - - (b) include a copy of the User Licence and this Distribution - License with the copy of the Software. These licences must be - stored in the same subdirectory on the distribution medium as - the Software and named in such a way as to prominently - identify their purpose; - -3.3. The Distributor must not rename, reorganise or repackage any of the - files comprising the Software without the prior written authority - of POV. - -3.4. Except as explicitly set out in this agreement, nothing in this - agreement permits Distributor to make any modification to any part - of the Software. - -4. RESTRICTIONS ON DISTRIBUTION - -4.1. Nothing in this agreement gives the Distributor: - - (a) any ability to grant any licence in respect of the use of the - Software or any part of it to any person; - - (b) any rights or permissions in respect of, including rights or - permissions to distribute or permit the use of, any Derived - Code; - - (c) any right to bundle a copy of the Software (or part thereof), - whether or not as part of a Distribution, with any other - items, including books and magazines. POV may, in response to - a request, by notice in writing and in its absolute - discretion, permit such bundling on a case by case basis. - This clause 4.1(c) does not apply to Distributions permitted - under clause 2; - - (d) any right, permission or authorisation to infringe any - Intellectual Right held by any third party. - -4.2. Distributor may charge a fee for the making or the provision of a - copy of the Software. - -4.3. Where the making, or the provision, of a copy of the Software is - authorised under the terms of clause 3 but not under those of - clause 2 of this agreement, the total of all fees charged in - relation to such making or provision and including all fees - (including shipping and handling fees) which are charged in respect - of any software, hardware or other material provided in conjunction - with or in any manner which is reasonably connected with the - making, or the provision, of a copy of the Software must not exceed - the reasonable costs incurred by the Distributor in making the - reproduction, or in the provision, of that copy for which the fee - is charged. - -4.4. Notwithstanding anything else in this agreement, nothing in this - agreement permits the reproduction of any part of the Software by, - or on behalf of: - - (a) Any person currently listed on the Revocation List from time - to time; - - (b) Any related body corporate (as that term is defined in section - 50 of the Corporations Law 2001 (Cth)) of any person referred - to in clause 4.4(a); - - (c) Any person in the course of preparing any publication in any - format (including books, magazines, CD Roms or on the - internet) for any of the persons identified in paragraph (a); - - (d) Any person who is, or has been, in breach of this Agreement - and that breach has not been waived in writing signed by POV; - or - - (e) Any person to whom POV has sent a notice in writing or by - email stating that that person may not distribute the - Software. - -4.5. From the day two years after a version of the Software more recent - than the Licensed Version is made available by POV on the Site - clause 3 only permits reproduction of the Software where the - Distributor ensures that each recipient of such a reproduction is - aware, prior to obtaining that reproduction, that that reproduction - of the Software is an old version of the Software and that a more - recent version of the Software is available from the Site. - -5. COPYRIGHT AND NO LITIGATION - -5.1. Copyright subsists in the Software and is protected by Australian - and international copyright laws. - -5.2. Nothing in this agreement gives Distributor any rights in respect - of any Intellectual Rights in respect of the Software or which are - held by or on behalf of POV. Distributor acknowledges that it does - not acquire any rights in respect of such Intellectual Rights. - -5.3. Distributor acknowledges that if it performs out any act in respect - of the Software without the permission of POV it will be liable to - POV for all damages POV may suffer (and which Distributor - acknowledges it may suffer) as well as statutory damages to the - maximum extent permitted by law and that it may also be liable to - criminal prosecution. - -5.4. Distributor must not commence any action against any person alleging - that the Software or the use or distribution of the Software infringes - any rights, including Intellectual Rights of the Distributor or of any - other person. If Distributor provides one or more copies of the - Software to any other person in accordance with the agreement, - Distributor waives all rights it has, or may have in the future, to - bring any action, directly or indirectly, against any person to the - extent that such an action relates to an infringement of any rights, - including Intellectual Rights of any person in any way arising from, or - in relation to, the use, or distribution, (including through the - authorisation of such use or distribution) of: - (a) the Software; - (b) any earlier or later version of the Software; or - (c) any other software to the extent it incorporates elements of the - software referred to in paragraphs (a) or (b) of this clause - 5.4. - -6. DISCLAIMER OF WARRANTY - -6.1. To the extent permitted by law, all implied terms and conditions - are excluded from this agreement. Where a term or condition is - implied into this agreement and that term cannot be legally - excluded, that term has effect as a term or condition of this - agreement. However, to the extent permitted by law, the liability - of POV for a breach of such an implied term or condition is limited - to the fullest extent permitted by law. - -6.2. To the extent permitted by law, this Software is provided on an "AS - IS" basis, without warranty of any kind, express or implied, - including without limitation, any implied warranties of - merchantability, fitness for a particular purpose and - non-infringement of intellectual property of any third party. The - Software has inherent limitations including design faults and - programming bugs. - -6.3. The entire risk as to the quality and performance of the Software - is borne by Distributor, and it is Distributor's responsibility to - ensure that the Software fulfils Distributor's requirements prior - to using it in any manner (other than testing it for the purposes - of this paragraph in a non-critical and non-production - environment), and prior to distributing it in any fashion. - -6.4. This clause 6 is an essential and material term of, and cannot be - severed from, this agreement. If Distributor does not or cannot - agree to be bound by this clause, or if it is unenforceable, then - Distributor must not, at any time, make any reproductions of the - Software under this agreement and this agreement gives the - Distributor no rights to make any reproductions of any part of the - Software. - -7. NO LIABILITY - -7.1. When you distribute or use the Software you acknowledge and accept - that you do so at your sole risk. Distributor agrees that under no - circumstances will it have any claim against POV or any POV - Associate for any loss, damages, harm, injury, expense, work - stoppage, loss of business information, business interruption, - computer failure or malfunction which may be suffered by you or by - any third party from any cause whatsoever, howsoever arising, in - connection with your use or distribution of the Software even where - POV was aware, or ought to have been aware, of the potential of - such loss. - -7.2. Neither POV nor any POV Associate has any liability to Distributor - for any indirect, general, special, incidental, punitive and/or - consequential damages arising as a result of a breach of this - agreement by POV or which arises in any way related to the Software - or the exercise of a licence granted to Distributor under this - agreement. - -7.3. POV's total aggregate liability to the Distributor for all loss or - damage arising in any way related to this agreement is limited to - the lesser of: (a) AU$100, and (b) the amount received by POV from - Distributor as payment for the grant of a licence under this - agreement. - -7.4. Distributor must bring any action against POV in any way related to - this agreement or the Software within 3 months of the cause of - action first arising. Distributor waives any right it has to bring - any action against POV and releases POV from all liability in - respect of a cause of action if initiating process in relation to - that action is not served on POV within 3 months of the cause of - action arising. Where a particular set of facts give rise to more - than one cause of action this clause 7.4 applies as if all such - causes of action arise at the time the first such cause of action - arises. - -7.5. This clause 7 is an essential and material term of, and cannot be - severed from, this agreement. If Distributor does not or cannot - agree to be bound by this clause, or if it is unenforceable, then - Distributor must not, at any time, make any reproductions of the - Software under this agreement and this agreement gives the - Distributor no rights to make any reproductions of any part of the - Software. - -8. INDEMNITY - -8.1. Distributor indemnifies POV and each POV Associate and holds each - of them harmless against all claims which arise from any loss, - damages, harm, injury, expense, work stoppage, loss of business - information, business interruption, computer failure or - malfunction, which may be suffered by Distributor or any other - party whatsoever as a consequence of: - - (a) any act or omission of POV and/or any POV Associate, whether - negligent or not; - - (b) Distributor's use and/or distribution of the Software; or - - (c) any other cause whatsoever, howsoever arising, in connection - with the Software. - - This clause 8 is binding on Distributor's estate, heirs, executors, - legal successors, administrators, parents and/or guardians. - -8.2. Distributor indemnifies POV, each POV Associate and each of the - authors of any part of the Software against all loss and damage and - for every other consequence flowing from any breach by Distributor - of any Intellectual Right held by POV. - -8.3. This clause 8 constitutes an essential and material term of, and - cannot be severed from, this agreement. If Distributor does not or - cannot agree to be bound by this clause, or if it is unenforceable, - then Distributor must not, at any time, make any reproductions of - the Software under this agreement and this agreement gives the - Distributor no rights to make any reproductions of any part of the - Software. - -9. HIGH RISK ACTIVITIES - -9.1. This Software and the output produced by this Software is not - fault-tolerant and is not designed, manufactured or intended for - use as on-line control equipment in hazardous environments - requiring fail-safe performance, in which the failure of the - Software could lead or directly or indirectly to death, personal - injury, or severe physical or environmental damage ("High Risk - Activities"). POV specifically disclaims all express or implied - warranty of fitness for High Risk Activities and, notwithstanding - any other term of this agreement, explicitly prohibits the use or - distribution of the Software for such purposes. - -10. ENDORSEMENT PROHIBITION - -10.1. Distributor must not, without explicit written permission from - POV, claim or imply in any way that: - - (a) POV or any POV Associate officially endorses or supports the - Distributor or any product (such as CD, book, or magazine) - associated with the Distributor or any reproduction of the - Software made in accordance with this agreement; or - - (b) POV derives any benefit from any reproduction made in - accordance with this agreement. - -11. TRADEMARKS - -11.1. "POV-Ray(tm)", "Persistence of Vision Raytracer(tm)" and - "POV-Team(tm)" are trademarks of Persistence of Vision Raytracer - Pty. Ltd. Any other trademarks referred to in this agreement are - the property of their respective holders. Distributor must not - use, apply for, or register anywhere in the world, any word, name - (including domain names), trade mark or device which is - substantially identical or deceptively or confusingly similar to - any of Persistence of Vision Raytracer Pty. Ltd's trade marks. - -12. MISCELLANEOUS - -12.1. The Official Terms, including those documents incorporated by - reference into the Official Terms, and the Modification Terms - constitute the entire agreement between the parties relating to - the distribution of the Software and, except where stated to the - contrary in writing signed by POV, supersedes all previous - negotiations and correspondence in relation to it. - -12.2. POV may modify this agreement at any time by making a revised - licence available from the Site at http://www.povray.org/distribution-license.html. - This agreement is modified by replacing the terms in this - agreement with those of the revised licence from the time that the - revised licence is so made available. It is your responsibility to - ensure that you have read and agreed to the current version of - this agreement prior to distributing the Software. - -12.3. Except where explicitly stated otherwise herein, if any provision - of this Agreement is found to be invalid or unenforceable, the - invalidity or unenforceability of such provision shall not affect - the other provisions of this agreement, and all provisions not - affected by such invalidity or unenforceability shall remain in - full force and effect. In such cases Distributor agrees to - attempt to substitute for each invalid or unenforceable provision - a valid or enforceable provision which achieves to the greatest - extent possible, the objectives and intention of the invalid or - unenforceable provision. - -12.4. A waiver of a right under this agreement is not effective unless - given in writing signed by the party granting that waiver. Unless - otherwise stipulated in the waiver, a waiver is only effective in - respect of the circumstances in which it is given and is not a - waiver in respect of any other rights or a waiver in respect of - future rights or actions. - -12.5. The validity and interpretation of this agreement is governed by - the laws in force in the State of Victoria, Australia. - Distributor submits to the exclusive jurisdiction of the courts of - that State and courts located within that State exercising federal - jurisdiction. - -12.6. References in this agreement to "written" and "writing" mean on - paper or by fax and expressly exclude email and other forms of - electronic communication. - -13. CONTACT INFORMATION - -13.1. This clause 13 does not form part of the agreement. License - inquiries can be made via email; please use the following address - (but see 13.2 below prior to emailing) : - - team-coord-[three-letter month]-[four-digit year]@povray org. - - for example, team-coord-jun-2004@povray.org should be used if at - the time you send the email it is the month of June 2004. The - changing email addresses are necessary to combat spam. Old email - addresses may be deleted at POV's discretion. - -13.2. Note that the address referred to in 13.1 may change for reasons - other than those referred to in that clause; please check the - current version of this document at http://www.povray.org/distribution-license.html. - for the current address. Your inability or failure to contact us - is no excuse for violating the licence. - -13.3. Do NOT send any email attachments of any sort other than by prior - arrangement. Do not send email in HTML format. EMAIL MESSAGES - INCLUDING ATTACHMENTS WILL BE DELETED UNREAD. - -13.4. The following postal address is only for official license - business. Please note that it is preferred that initial queries - about licensing be made via email; postal mail should only be used - when email is not possible, or when written documents are being - exchanged by prior arrangement. While it is unlikely this address - will change in the short term it would be advisable to check - http://www.povray.org/distribution-license.html for the current - one prior to sending postal mail. - - Persistence of Vision Raytracer Pty. Ltd. - PO Box 407 - Williamstown, - Victoria 3016 - Australia diff --git a/community/povray/povray3.7.0_rc3-user-conf.patch b/community/povray/povray3.7.0_rc3-user-conf.patch deleted file mode 100644 index f20d9b506..000000000 --- a/community/povray/povray3.7.0_rc3-user-conf.patch +++ /dev/null @@ -1,27 +0,0 @@ - Makefile.am | 13 ------------- - 1 files changed, 0 insertions(+), 13 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 76b394c..9822c52 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -107,19 +107,6 @@ install-data-local: - for f in $$filelist ; do \ - $(INSTALL_DATA) $(top_srcdir)/doc/$$f $(DESTDIR)$(povdocdir)/$$f && echo "$(DESTDIR)$(povdocdir)/$$f" >> $(povinstall); \ - done -- @echo "Creating user directories..."; \ -- for p in $(povuser) $(povconfuser) ; do \ -- $(mkdir_p) $$p && chown $(povowner) $$p && chgrp $(povgroup) $$p && printf "%s\n" "$$p" "`cat $(povinstall)`" > $(povinstall); \ -- done -- @echo "Copying user configuration and INI files..."; \ -- for f in povray.conf povray.ini ; do \ -- if test -f $(povconfuser)/$$f; then \ -- echo "Creating backup of $(povconfuser)/$$f"; \ -- mv -f $(povconfuser)/$$f $(povconfuser)/$$f.bak; \ -- fi; \ -- done; \ -- $(INSTALL_DATA) $(top_srcdir)/povray.conf $(povconfuser)/povray.conf && chown $(povowner) $(povconfuser)/povray.conf && chgrp $(povgroup) $(povconfuser)/povray.conf && echo "$(povconfuser)/povray.conf" >> $(povinstall); \ -- $(INSTALL_DATA) $(top_builddir)/povray.ini $(povconfuser)/povray.ini && chown $(povowner) $(povconfuser)/povray.ini && chgrp $(povgroup) $(povconfuser)/povray.ini && echo "$(povconfuser)/povray.ini" >> $(povinstall) - - # Remove data, config, and empty folders for 'make uninstall'. - # Use 'hook' instead of 'local' so as to properly remove *empty* folders (e.g. scripts). diff --git a/community/povray/source-license.txt b/community/povray/source-license.txt deleted file mode 100644 index aaf3dbaa1..000000000 --- a/community/povray/source-license.txt +++ /dev/null @@ -1,360 +0,0 @@ - POV-Ray Licence Agreement - MODIFICATION TERMS - Persistence of Vision Raytracer(tm) (POV-Ray(tm)) - 5 July 2004 - -Licensed Version: Version 3.6 - -Please read through the terms and conditions of this agreement carefully. - -This is a binding legal agreement between you and Persistence of Vision -Raytracer Pty. Ltd. ACN 105 891 870 ("POV"), a company incorporated in the -state of Victoria, Australia, for the product known as the "Persistence of -Vision Raytracer(tm)", also referred to herein as "POV-Ray(tm)". In these -terms "Licensed Version" means the version of POV-Ray identified at the start -of these terms and all minor releases (ie releases of the form x.y.z) of that -version. - -The terms of this agreement are set out at: - http://www.povray.org/source-license.html -("Official Terms"). The Official Terms take precedence over this document to -the extent of any inconsistency. Except where POV has agreed with you in -writing to the contrary, the Official Terms are a complete statement of your -ability to modify the source code of the Licensed Version, to use any -modifications of the Licensed Version, and to distribute any modifications of -the Licensed Version. You may accept these terms by making any modification -to the Licensed Version, or by distributing any modification to the Licensed -Version. If you do not agree to be bound by these terms you must not make any -modifications to the source code of the Licensed Version and must not -distribute any modifications of the Licensed Version. - - 1. PERMITTED MODIFICATION AND USE - - 1.1. The source code of POV-Ray is provided to: promote the porting of - POV-Ray to hardware and operating systems which POV does not support; - promote experimentation and development of new features to the core - code which might eventually be incorporated into the official version; - and provide insight into the inner workings of the program for - educational purposes. - - 1.2. Except as expressly set out in this agreement, or permitted by another - agreement between you and POV, any use or modification of any POV-Ray - source code is expressly prohibited. - - 1.3. Subject to this clause 1.3 and the balance of this clause 1, you are - granted the privilege to modify and compile the source code of the - Licensed Version for your own personal use if such modification - fulfils one or more purposes set out in clause 1.1. Each output of - such a modification or compilation is called a "Modified Version" in - these terms and conditions. Nothing in these terms and conditions - gives you any rights or permissions to use, reproduce or modify any - part of the source code for any version of POV-Ray other than in a - modified version of POV-Ray. In particular, no portion of the source - code for the Licensed Version may, under any circumstances, be - incorporated into any other program (or separated out to form an - independent program) and all Modified Versions that you create must, - in substance, be modifications of the Licensed Version. - - 1.4. You may use any Modified Version that you alone have created only under - the conditions granted in the standard POV end-user license for the - Licensed Version from which the Modified Version was created. As at - July 2004, this licence may be found at: - http://www.povray.org/povlegal.doc. - Nothing in these terms permits any other person to use any Modified Version. - - 1.5. Neither the Licensed Version nor any Modified Version may be linked - into any other software package either at compile-time using (for - example) an object code linker nor at run-time as (for example) a DLL, - ActiveX control, OLE server, COM/DCOM server, or other remoting system - including, without limitation, any linkage that could blur the - end-user's perception of which program provides which functions. - - 1.6. To allow POV-Ray to communicate with outside programs, the official - versions of POV-Ray may include internal communication "hooks", often - called an Application Programming Interface, or API. Modification to - these APIs or other officially supported communication mechanisms (or - the addition of any new code or feature) for the purpose of avoidance - (or to assist others to avoid) the intent of this or any other POV - license is expressly prohibited. - - 2. CUSTOM VERSIONS - - 2.1. Strict conditions and restrictions are imposed if you wish to - distribute a modified version of POV-Ray, its documentation or other - parts of the package, including any translation of the documentation - into other languages or file formats. - - 2.2. For the purposes of these terms and conditions, a "Custom Version" - means a Modified Version which has all of the following characteristics: - - (a). it must have all of the functions of the Licensed Version with all - existing features, copyright notices, author attributions, all - Licence Agreements, etc., intact; - - (b). any reference to the software being an "Official Version" in any - files included in the Modified Version must be altered to clearly - state that it is not an official but an unofficial version; - - (c). when used by a user it must be clear to that user: - - (i). that the Modified Version is a version of POV-Ray that has - been modified, and does not appear to be another program - that happens to have POV-Ray or POV-Ray functionality - built-in; - - (ii). that the Modified Version is an unofficial version of - POV-Ray; - - (iii). who is the creator of the Modified Version; - - (d). the Modified Version must include accurate information in the - DISTRIBUTION_MESSAGE macros in the source file OPTOUT.H and must - prominently display this information. This information must at - least correctly identify who made the custom version. - - (e). It must display each copyright notice and credit screen which is - displayed by the Licensed Version and do so in a similar manner to - that of the Licensed Version. When each such notice or screen is - displayed, the Modified Version must indicate that the version is - a modified and unofficial version. In particular, if it is a - version of POV-Ray that contains splash screens or about boxes - (e.g. Windows, Macintosh) each splash screen and about box in the - Licensed Version must be present in the Modified Version and must - be rendered and presented in a similar manner; - - (f). if the Modified Version contains any feature that would cause a - POV-Ray scene source file that works on the Modified Version to - fail or otherwise work incorrectly on either the current official - version of POV-Ray, or on the Licensed Version, then the Modified - Version must check that the scene source file has a #version - directive that includes the 'unofficial' token, and must only - activate any variations from the Licensed Version (including, but - not limited to, new keywords) if that #version directive is - present. If that directive is not present, the Modified Version - must work in the same way as the Licensed Version. An example of a - correct 'unofficial' #version declaration is '#version unofficial - megapov 0.7 ;'. - - 2.3. It is the intent of POV to permit modifications to the Licensed Version - which are Custom Versions within the meaning of clause 2.2 and which - incorporate a means of being controlled by other software where that - other software has as its express primary purpose the ability to - control or co-ordinate POV-Ray (or other programs in general) remotely - for parallel or network rendering purposes. - - 3. CONDITIONS FOR DISTRIBUTION OF CUSTOM VERSIONS - - 3.1. You must not distribute any Modified Version to any person if that - Modified Version is not a Custom Version as defined by section 2.2. - - 3.2. You may distribute a Custom Version on the terms of the Distributor's - Licence Agreement for the Licensed Version as modified by this clause 3 - and with: - - (a). references to the Licensed Version read as references to the - Custom Version; and - - (b). references to the Software read as references to the Custom - Version; - - 3.3. The distribution licence is available from: - http://www.povray.org/. - As at July 2004, this licence is available at: - http://www.povray.org/distribution-license.html. - - 3.4. You must ensure that each user of the Custom Version is aware that it - is an unofficial build of POV-Ray which is not supported by POV and - that the POV-Ray developers are not in any way responsible for it; - - 3.5. You must either: - - (a). accompany each object code version of the Custom Version which is - distributed with the full source code for that Custom Version and - full documentation describing all modifications that you have made - to the Licensed Version; or - - (b). for a period of at least 3 years following the first distribution - of an object code version of the Custom Version make available for - download over the internet to each person who receives an object - code version of the Custom Version the full source code for the - Custom Version and full documentation describing all modifications - that you have made to the Licensed Version and you must make each - person who receives an object code version of the Custom Version - aware that the source code and documentation is available for - download, and the location from which it can be downloaded; - - and, in either case, - - (c). that source code must be licensed to each person who receives it - under the same terms as these Modification Terms. - - 3.6. You may, at your option: - - (a). waive clause 4.5 of the standard distribution licence with respect - to distribution of the Custom Version; and - - (b). include as additional clauses, and without affecting any of the - existing provisions of the licence, limitation of liability - provisions in favour of yourself in the same terms as clauses 6 - and 7 of the standard distribution licence. - - 3.7. Where a Custom Version is distributed in accordance with the terms of - this agreement: - - (a). You must license each recipient of that Custom Version to use - those portions of the Custom Version in respect of which you hold - copyright on the terms of the standard POV end-user license for - the Licensed Version from which the Modified Version was created; - - (b). POV agrees to licence each recipient of that Custom Version to use - those portions of the Custom Version in respect of which POV holds - copyright on the terms of the standard POV end-user license for - the Licensed Version from which the Modified Version was created. - - 4. CONTRIBUTING BUG FIXES AND ENHANCEMENTS - - 4.1. POV is not obliged to accept enhancements and bug fixes that you submit - to it. However, if it does so, it does so in accordance with the then - current Contribution Terms. POV may require you to complete and send - documentation to POV prior to accepting a bug fix and, in particular, - will require a copyright assignment of each contribution. - - 5. COPYRIGHT AND INTELLECTUAL PROPERTY - - 5.1. Copyright subsists in the Licensed Version and it is protected by - Australian and international copyright laws. - - 5.2. Nothing in this agreement gives you any rights in respect of any - Intellectual Rights in respect of the Licensed Version or which are - held by or on behalf of POV. You acknowledge that you do not acquire - any rights in respect of such Intellectual Rights. - - 5.3. You acknowledge that if you perform any act in respect of the Software - without the permission of POV you will be liable to POV for all damages - POV may suffer (and which you acknowledge POV may suffer) as well as - statutory damages to the maximum extent permitted by law and that you - may also be liable to criminal prosecution. - - 5.4. For the purposes of this clause 5 Intellectual Rights means: - - (a). all copyright, patent, trade mark, trade secret, design, and - circuit layout rights; - - (b). all rights to the registration of such rights; and - - (c). all rights of a similar nature - - which exist anywhere in the world; - - 6. DISCLAIMER OF WARRANTY - - 6.1. To the extent permitted by law, all implied terms and conditions are - excluded from this agreement. Where a term or condition is implied into - this agreement and that term cannot be legally excluded, that term has - effect as a term or condition of this agreement. However, to the extent - permitted by law, the liability of POV for a breach of such an implied - term or condition is limited to the fullest extent permitted by law. - - 6.2. To the extent permitted by law, the Licensed Version is provided on an - "AS IS" basis, without warranty of any kind, express or implied, - including without limitation, any implied warranties of merchantability, - fitness for a particular purpose and non-infringement of intellectual - property of any third party. The Licensed Program has inherent - limitations including design faults and programming bugs. - - 6.3. The entire risk as to the quality and performance of the Licensed - Software, and of any Custom Version is borne by you, and it is your - responsibility to ensure that it fulfils your requirements prior to - using it in any manner. - - 6.4. This clause 6 is an essential and material term of, and cannot be - severed from, this agreement. If you do not or cannot agree to be - bound by this clause, or if it is unenforceable, then you must not, at - any time, make any use or reproductions of the Licensed Version under - this agreement and this agreement gives you no rights to deal in any - way with any part of the Licensed Version. - - 7. NO LIABILITY - - 7.1. When you use or modify the Licensed Version you acknowledge and accept - that you do so at your sole risk. You agree that under no circumstances - will you have any claim against POV or any POV Associate for any loss, - damages, harm, injury, expense, work stoppage, loss of business - information, business interruption, computer failure or malfunction - which may be suffered by you or by any third party from any cause what- - soever, howsoever arising, in connection with your use, modification or - distribution of the Software even where POV was aware, or ought to have - been aware, of the potential of such loss. - - 7.2. Neither POV nor any POV Associate has any liability to you for any - indirect, general, special, incidental, punitive and/or consequential - damages arising as a result of a breach of this agreement by POV or - which arises in any way related to the Licensed Version or the exercise - of a licence granted to you under this agreement. - - 7.3. POV's total aggregate liability to you for all loss or damage arising - in any way related to this agreement is limited to the lesser of: (a) - AU$100, and (b) the amount received by POV from you as payment for the - grant of a licence under this agreement. - - 7.4. You must bring any action against POV in any way related to this - agreement or the Licensed Version within 3 months of the cause of - action first arising. You waive any right you have to bring any action - against POV and release POV from all liability in respect of a cause - of action if initiating process in relation to that action is not - served on POV within 3 months of the cause of action arising. Where a - particular set of facts give rise to more than one cause of action this - clause 7.4 applies as if all such causes of action arise at the time - the first such cause of action arises. - - 7.5. This clause 7 is an essential and material term of, and cannot be - severed from, this agreement. If you does not or cannot agree to be - bound by this clause, or if it is unenforceable, then you must not, at - any time, make any use or reproductions of the Licensed Version under - this agreement and this agreement gives you no rights to deal in any - way with any part of the Licensed Version. - - 8. MISCELLANEOUS - - 8.1. POV may modify this agreement at any time by making a revised licence - available from: - http://www.povray.org/source-license.html. - This agreement is modified by replacing the terms in this agreement - with those of the revised licence from the time that the revised - licence is so made available. It is your responsibility to ensure that - you have read and agreed to the current version of this agreement prior - to making any modification to the Licensed Version. - - 8.2. Except where explicitly stated otherwise herein, if any provision of - this agreement is found to be invalid or unenforceable, the invalidity - or unenforceability of such provision shall not affect the other - provisions of this agreement, and all provisions not affected by such - invalidity or unenforceability shall remain in full force and effect. - In such cases you agree to attempt to substitute for each invalid or - unenforceable provision a valid or enforceable provision which achieves - to the greatest extent possible, the objectives and intention of the - invalid or unenforceable provision. - - 8.3. A waiver of a right under this agreement is not effective unless given - in writing signed by the party granting that waiver. Unless otherwise - stipulated in the waiver, a waiver is only effective in respect of the - circumstances in which it is given and is not a waiver in respect of - any other rights or a waiver in respect of future rights or actions. - - 8.4. The validity and interpretation of this agreement is governed by the - laws in force in the State of Victoria, Australia. You submit to the - exclusive jurisdiction of the courts of that State and courts located - within that State exercising federal jurisdiction. - - 8.5. References in this agreement to "written" and "writing" mean on paper - or by fax and expressly exclude email and other forms of electronic - communication. - - 8.6. "POV Associate" means any person associated directly or indirectly with - POV whether as a director, officer, employee, subcontractor, agent, - representative, consultant, licensee or otherwise. - - 8.7. "Distributor's Licence Agreement" in respect of a Licensed Version, - means the agreement of that name for that Licensed Version made - available from: - http://www.povray.org/. diff --git a/community/preload/rc.preload b/community/preload/rc.preload deleted file mode 100644 index a3cb01ba0..000000000 --- a/community/preload/rc.preload +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash -# -# /etc/rc.d/init.d/preload -# -# Starts the preload daemon -# -# Heavily modified for Arch Linux by Leslie P. Polzer <polzer@gnu.org>. - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/preload` - -if [ -f /etc/conf.d/preload ]; then - . /etc/conf.d/preload -fi - -MIN_MEMORY=${MIN_MEMORY:-256} -# Check for > MIN_MEMORY MB -free -m | awk '/Mem:/ {exit ($2 >= ('"$MIN_MEMORY"'))?0:1}' || exit 0 - -RETVAL=0 - -# -# See how we were called. -# - -start() { - if [ -z "$PID" ]; then - stat_busy "Starting preload daemon: " - /usr/sbin/preload $PRELOAD_OPTS - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - if [ -n $IONICE_OPTS ]; then - /usr/bin/ionice $IONICE_OPTS -p "`pidof -o %PPID /usr/sbin/preload`" - fi - add_daemon preload - stat_done - else - stat_fail - fi - fi - return $RETVAL -} - -stop() { - stat_busy "Stopping preload daemon: " - kill $PID &>/dev/null - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - rm_daemon preload - stat_done - PID="" - else - stat_fail - fi - return $RETVAL -} - - -restart() { - $0 stop - sleep 1 - $0 start -} - -reload() { - trap "" SIGHUP - kill -HUP $PID -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - reload) - reload - ;; - restart) - restart - ;; - condrestart) - if [ ! -z $PID ]; then - restart - else - stat_fail - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|reload}" - exit 1 -esac - -exit $RETVAL diff --git a/community/print-manager/PKGBUILD b/community/print-manager/PKGBUILD deleted file mode 100644 index bbce85f35..000000000 --- a/community/print-manager/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: vicky91 <vickypaiers@gmail.com> - -pkgname=print-manager -pkgver=0.2.0 -pkgrel=1 -pkgdesc="A KDE tool for managing print jobs and printers" -arch=('i686' 'x86_64' 'mips64el') -url="https://projects.kde.org/projects/playground/base/print-manager" -license=('GPL') -depends=('kdebase-workspace' 'libcups') -makedepends=('cmake' 'automoc4') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('183c22e91021b0357c2a27146c931de0') - -build() { - mkdir build - cd build - cmake ../${pkgname}-${pkgver} \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCUPS_1_6=ON - make -} - -package() { - cd build - make DESTDIR="${pkgdir}" install -} diff --git a/community/projectm/libprojectM-2.0.1-fix-linking.patch b/community/projectm/libprojectM-2.0.1-fix-linking.patch deleted file mode 100644 index 23d8a7b9a..000000000 --- a/community/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/projectm/libprojectM-2.0.1-pkg-config.patch b/community/projectm/libprojectM-2.0.1-pkg-config.patch deleted file mode 100644 index b5e38205a..000000000 --- a/community/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/psqlodbc/fix-function-declarations.patch b/community/psqlodbc/fix-function-declarations.patch deleted file mode 100644 index 4504661b0..000000000 --- a/community/psqlodbc/fix-function-declarations.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -upr psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c ---- psqlodbc-08.04.0100.orig/odbcapi30.c 2008-10-07 00:46:09.000000000 +0300 -+++ psqlodbc-08.04.0100/odbcapi30.c 2009-09-19 20:13:57.000000000 +0300 -@@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle - SQLPOINTER CharacterAttribute, - SQLSMALLINT BufferLength, - SQLSMALLINT *StringLength, --#if defined(_WIN64) - SQLLEN *NumericAttribute --#elif defined(WITH_UNIXODBC) || defined(WIN32) -- SQLPOINTER NumericAttribute --#else -- SQLLEN *NumericAttribute --#endif - ) - { - CSTR func = "SQLColAttribute"; -diff -upr psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c ---- psqlodbc-08.04.0100.orig/odbcapi30w.c 2009-03-22 16:17:10.000000000 +0200 -+++ psqlodbc-08.04.0100/odbcapi30w.c 2009-09-19 20:22:17.000000000 +0300 -@@ -262,11 +262,7 @@ SQLRETURN SQL_API SQLColAttributeW( - SQLPOINTER pCharAttr, - SQLSMALLINT cbCharAttrMax, - SQLSMALLINT *pcbCharAttr, --#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64)) -- SQLPOINTER pNumAttr --#else - SQLLEN *pNumAttr --#endif - ) - { - CSTR func = "SQLColAttributeW"; -diff -upr psqlodbc-08.04.0100.orig/odbcapi.c psqlodbc-08.04.0100/odbcapi.c ---- psqlodbc-08.04.0100.orig/odbcapi.c 2008-11-23 03:00:53.000000000 +0200 -+++ psqlodbc-08.04.0100/odbcapi.c 2009-09-19 20:13:56.000000000 +0300 -@@ -1111,11 +1111,7 @@ SQLExtendedFetch( - HSTMT hstmt, - SQLUSMALLINT fFetchType, - SQLLEN irow, --#ifdef WITH_UNIXODBC -- SQLROWSETSIZE *pcrow, --#else - SQLULEN *pcrow, --#endif /* WITH_UNIXODBC */ - SQLUSMALLINT *rgfRowStatus) - { - RETCODE ret; diff --git a/community/puzzles/puzzles-lm.diff b/community/puzzles/puzzles-lm.diff deleted file mode 100644 index 06493cc0d..000000000 --- a/community/puzzles/puzzles-lm.diff +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/mkfiles.pl b/mkfiles.pl -index 5bb0d39..cdd8260 100755 ---- a/mkfiles.pl -+++ b/mkfiles.pl -@@ -1118,8 +1118,8 @@ if (defined $makefiles{'gtk'}) { - &splitline("CFLAGS := -O2 -Wall -Werror -ansi -pedantic -g " . - (join " ", map {"-I$dirpfx$_"} @srcdirs) . - " `\$(GTK_CONFIG) --cflags` \$(CFLAGS)")."\n". -- "XLIBS = `\$(GTK_CONFIG) --libs`\n". -- "ULIBS =#\n". -+ "XLIBS = `\$(GTK_CONFIG) --libs` -lm\n". -+ "ULIBS = -lm#\n". - "INSTALL=install\n", - "INSTALL_PROGRAM=\$(INSTALL)\n", - "INSTALL_DATA=\$(INSTALL)\n", diff --git a/community/pypy/LICENSE b/community/pypy/LICENSE deleted file mode 100644 index 7fc6952b0..000000000 --- a/community/pypy/LICENSE +++ /dev/null @@ -1,154 +0,0 @@ -License for files in the pypy/ directory -================================================== - -Except when otherwise stated (look for LICENSE files in directories or -information at the beginning of each file) all software and -documentation in the 'pypy' directories is licensed as follows: - - The MIT License - - 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. - - -PyPy Copyright holders 2003-2010 ------------------------------------ - -Except when otherwise stated (look for LICENSE files or information at -the beginning of each file) the files in the 'pypy' directory are each -copyrighted by one or more of the following people and organizations: - - Armin Rigo - Maciej Fijalkowski - Carl Friedrich Bolz - Samuele Pedroni - Antonio Cuni - Michael Hudson - Christian Tismer - Holger Krekel - Eric van Riet Paap - Richard Emslie - Anders Chrigstrom - Amaury Forgeot d Arc - Aurelien Campeas - Anders Lehmann - Niklaus Haldimann - Seo Sanghyeon - Leonardo Santagada - Lawrence Oluyede - Jakub Gustak - Guido Wesdorp - Benjamin Peterson - Alexander Schremmer - Niko Matsakis - Ludovic Aubry - Alex Martelli - Toon Verwaest - Stephan Diehl - Adrien Di Mascio - Stefan Schwarzer - Tomek Meka - Patrick Maupin - Jacob Hallen - Laura Creighton - Bob Ippolito - Camillo Bruni - Simon Burton - Bruno Gola - Alexandre Fayolle - Marius Gedminas - Guido van Rossum - Valentino Volonghi - Adrian Kuhn - Paul deGrandis - Gerald Klix - Wanja Saatkamp - Anders Hammarquist - Oscar Nierstrasz - Eugene Oden - Lukas Renggli - Guenter Jantzen - Dinu Gherman - Bartosz Skowron - Georg Brandl - Ben Young - Jean-Paul Calderone - Nicolas Chauvat - Rocco Moretti - Michael Twomey - boria - Jared Grubb - Olivier Dormond - Stuart Williams - Jens-Uwe Mager - Justas Sadzevicius - Mikael Schönenberg - Brian Dorsey - Jonathan David Riehl - Beatrice During - Elmo Mäntynen - Andreas Friedge - Alex Gaynor - Anders Qvist - Alan McIntyre - Bert Freudenberg - - Heinrich-Heine University, Germany - Open End AB (formerly AB Strakt), Sweden - merlinux GmbH, Germany - tismerysoft GmbH, Germany - Logilab Paris, France - DFKI GmbH, Germany - Impara, Germany - Change Maker, Sweden - - -License for 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' -============================================================== - -Except when otherwise stated (look for LICENSE files or -copyright/license information at the beginning of each file) the files -in the 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' directories -are all copyrighted by the Python Software Foundation and licensed under -the Python Software License of which you can find a copy here: -http://www.python.org/doc/Copyright.html - -License for 'pypy/translator/jvm/src/jna.jar' -============================================= - -The file 'pypy/translator/jvm/src/jna.jar' is licensed under the GNU -Lesser General Public License of which you can find a copy here: -http://www.gnu.org/licenses/lgpl.html - -License for 'pypy/translator/jvm/src/jasmin.jar' -================================================ - -The file 'pypy/translator/jvm/src/jasmin.jar' is copyright (c) 1996-2004 Jon Meyer -and distributed with permission. The use of Jasmin by PyPy does not imply -that PyPy is endorsed by Jon Meyer nor any of Jasmin's contributors. Furthermore, -the following disclaimer applies to Jasmin: - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR -TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/community/pypy/PKGBUILD b/community/pypy/PKGBUILD deleted file mode 100644 index 63663c276..000000000 --- a/community/pypy/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# $Id: PKGBUILD 80543 2012-11-24 13:43:13Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> - -pkgname=pypy -pkgver=2.0beta1 -pkgrel=1 -pkgdesc="A Python implementation written in Python, JIT enabled" -url="http://codespeak.net/pypy/" -arch=('i686' 'x86_64') -depends=('libffi') -provides=('python2') -makedepends=('python2') -optdepends=('openssl: openssl module' - 'expat: pyexpat module' - 'ncurses: ncurses module' - 'zlib: zlib module' - 'bzip2: bz2 module') -license=('custom:MIT') -source=(https://bitbucket.org/pypy/pypy/get/release-2.0-beta1.tar.bz2) -md5sums=('a7e3e15c51e8f42af9f0c168b6c2750e') - -build() { - cd ${srcdir}/pypy-pypy-*/pypy/translator/goal - - python2 translate.py -Ojit -} - -package() { - cd ${srcdir}/pypy-pypy-*/pypy/translator/goal - - install -Dm755 pypy-c ${pkgdir}/opt/pypy/pypy-c - mkdir -p ${pkgdir}/opt/pypy/{lib-python,pypy} - - cd ${srcdir}/pypy-pypy-* - cp -r lib-python/2.7 ${pkgdir}/opt/pypy/lib-python/ - cp -r lib_pypy ${pkgdir}/opt/pypy/ - cp -r include ${pkgdir}/opt/pypy/ - - mkdir -p ${pkgdir}/usr/bin - ln -s /opt/pypy/pypy-c ${pkgdir}/usr/bin/pypy - - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/pypy/LICENSE -} -# vim: ts=2 sw=2 et: diff --git a/community/python-matplotlib/setup.cfg b/community/python-matplotlib/setup.cfg deleted file mode 100644 index bed844776..000000000 --- a/community/python-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 = False -gtkagg = False -tkagg = False -wxagg = False -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/python-pyro/ChangeLog b/community/python-pyro/ChangeLog deleted file mode 100644 index aa691dd88..000000000 --- a/community/python-pyro/ChangeLog +++ /dev/null @@ -1,21 +0,0 @@ -2011-10-07 Angel Velasquez <angvp@archlinux.org> - * updated to 4.9 - * Adding support for python 3 - * Splitted PKGBUILD - -2010-01-12 Andrea Scarpino <andrea@archlinux.org> - - * update package: 3.10 - -2009-08-24 Biru Ionut <ionut@archlinux.ro> - - * update package: 3.9.1 - -2008-12-14 Douglas Soares de Andrade <douglas@archlinux.org> - - * Updated for i686: 3.8.1 - -2008-06-03 Douglas Soares de Andrade <dsa@aur.archlinux.org> - - * Updated and added to community - 3.8beta - diff --git a/community/python-pyro/PKGBUILD b/community/python-pyro/PKGBUILD deleted file mode 100755 index 72d738f24..000000000 --- a/community/python-pyro/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $ -# Maintainer: Angel Velasquez <angvp@archlinux.org> -# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.br> -pkgbase=python-pyro -pkgname=('python-pyro' 'python2-pyro') -pkgver=4.9 -pkgrel=1 -pkgdesc="Python Remote Objects" -url="http://irmen.home.xs4all.nl/pyro/" -arch=('i686' 'x86_64' 'mips64el') -license=('MIT') -depends=('python' 'python2') -source=(http://pypi.python.org/packages/source/P/Pyro4/Pyro4-${pkgver}.tar.gz) -md5sums=('00bf604303898ee920975a8ddd76bae1') - -package_python-pyro() { - depends=('python') - cd $srcdir/Pyro4-${pkgver} - python setup.py install --root=$pkgdir - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} - -package_python2-pyro() { - depends=('python2') - cd $srcdir/Pyro4-${pkgver} - python2 setup.py install --root=$pkgdir - install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/python-pyxmpp/PKGBUILD b/community/python-pyxmpp/PKGBUILD deleted file mode 100644 index d8e1d6018..000000000 --- a/community/python-pyxmpp/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -# $Id: PKGBUILD 72079 2012-06-08 09:35:38Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: William Rea <sillywilly@gmail.com> - -pkgname=python-pyxmpp -pkgver=1.1.2 -pkgrel=2 -pkgdesc="A Python XMPP and Jabber implementation based on libxml2" -arch=('i686' 'x86_64' 'mips64el') -url="http://pyxmpp.jajcus.net/" -license=('LGPL') -depends=('python2-dnspython' 'libxml2' 'python-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/python2-pycuda/PKGBUILD b/community/python2-pycuda/PKGBUILD deleted file mode 100644 index 37049dea1..000000000 --- a/community/python2-pycuda/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 62828 2012-01-27 14:09:50Z stephane $ -# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> -pkgname=python2-pycuda -pkgver=2011.2.2 -pkgrel=1 -pkgdesc="Python wrapper for Nvidia CUDA" -arch=('i686' 'x86_64') -url="http://mathema.tician.de/software/pycuda" -license=('MIT/X Consortium') -source=(http://pypi.python.org/packages/source/p/pycuda/pycuda-${pkgver}.tar.gz) -depends=('cuda-toolkit' 'python2-numpy' 'python2-pytools' 'python2') -optdepends=('python2-pytest') -makedepends=('ctags' 'python2-distribute' 'mesa') -provides=('pycuda') -replaces=('pycuda') -conflicts=('pycuda') -sha1sums=('026ca33f66d35c82a087a5ef3f8e0f213575059b') - -build() { - cd "${srcdir}/pycuda-${pkgver}" - python2 ./configure.py \ - --cuda-root=/opt/cuda-toolkit \ - --boost-compiler=gcc \ - --cuda-enable-gl \ - --cuda-inc-dir=/opt/cuda-toolkit/include \ - --cudadrv-lib-dir=/opt/cuda-toolkit/lib \ - --cudart-lib-dir=/opt/cuda-toolkit/lib - - make -} - -package() { - cd "${srcdir}/pycuda-${pkgver}" - python2 setup.py install --prefix=/usr --root="${pkgdir}" --skip-build --optimize=1 -} diff --git a/community/python2-simplejson/PKGBUILD b/community/python2-simplejson/PKGBUILD deleted file mode 100644 index 8908b6b9d..000000000 --- a/community/python2-simplejson/PKGBUILD +++ /dev/null @@ -1,33 +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.2 -pkgrel=1 -pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python" -license=('MIT') -arch=('i686' 'x86_64' 'mips64el') -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') -sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5') -sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5') -sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5') - -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/python2-simplejson/python2-simplejson.changelog b/community/python2-simplejson/python2-simplejson.changelog deleted file mode 100644 index c1e227d24..000000000 --- a/community/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/qtcurve-gtk2/cairo_flush_fix.patch b/community/qtcurve-gtk2/cairo_flush_fix.patch deleted file mode 100644 index 12ed2d291..000000000 --- a/community/qtcurve-gtk2/cairo_flush_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urB QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c QtCurve-Gtk2-1.8.15/style/shadowhelper.c ---- QtCurve-Gtk2-1.8.15.orig/style/shadowhelper.c 2012-04-24 17:19:54.000000000 -0400 -+++ QtCurve-Gtk2-1.8.15/style/shadowhelper.c 2012-09-14 08:29:55.828897057 -0400 -@@ -58,6 +58,7 @@ - cairo_rectangle(cr, 0, 0, shadowSize, shadowSize); - cairo_fill(cr); - cairo_destroy(cr); -+ cairo_surface_destroy(dest); - g_object_unref(pixbuf); - return pixmap; - } diff --git a/community/quagga/quagga.conf b/community/quagga/quagga.conf deleted file mode 100644 index 26f24daa8..000000000 --- a/community/quagga/quagga.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -DAEMON_OPTS="-d -u quagga -g quagga -A 127.0.0.1" diff --git a/community/quagga/quagga.rc b/community/quagga/quagga.rc deleted file mode 100644 index ad6614b14..000000000 --- a/community/quagga/quagga.rc +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/sbin/${0##*/} -PID=$(pidof -o %PPID $DAEMON) - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && 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 noet: diff --git a/community/r8168/PKGBUILD b/community/r8168/PKGBUILD deleted file mode 100644 index b583690e0..000000000 --- a/community/r8168/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 80376 2012-11-21 09:11:48Z mtorromeo $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Contributor: Bob Fanger < bfanger(at)gmail > -# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail > - -pkgname=r8168 -pkgver=8.034.00 -pkgrel=1 -pkgdesc="A kernel module for Realtek 8168 network cards" -url="http://www.realtek.com.tw" -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' 'linux') -makedepends=('linux-headers') -source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2) -install=$pkgname.install - -build() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - - cd "$pkgname-$pkgver" - - # avoid using the Makefile directly -- it doesn't understand - # any kernel but the current. - make -C /usr/lib/modules/$KERNEL_RELEASE/build \ - SUBDIRS="$srcdir/$pkgname-$pkgver/src" \ - EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \ - modules -} - -package() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") - KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - msg "Kernel = $KERNEL_VERSION" - - cd "$pkgname-$pkgver" - install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" - find "$pkgdir" -name '*.ko' -exec gzip -9 {} + - - sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" -} - -sha256sums=('97f3f342f9f24a3c3346641babde82f52f87b6ef5976c8f4481515f247116206') diff --git a/community/r8168/r8168.install b/community/r8168/r8168.install deleted file mode 100644 index ab5f9f5c8..000000000 --- a/community/r8168/r8168.install +++ /dev/null @@ -1,17 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/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/radvd/radvd.conf b/community/radvd/radvd.conf deleted file mode 100644 index 47811d6cc..000000000 --- a/community/radvd/radvd.conf +++ /dev/null @@ -1,7 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -# daemon pid file -#PIDFILE='/run/radvd.pid' - -# daemon options. treated as an array. -DAEMON_OPTS=('--logmethod=syslog') diff --git a/community/radvd/radvd.rc b/community/radvd/radvd.rc deleted file mode 100644 index 3cac104e7..000000000 --- a/community/radvd/radvd.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/sbin/radvd -PIDFILE=${PIDFILE:-/run/${0##*/}.pid} -DAEMON_OPTS+=("--pidfile=$PIDFILE") - -# check pid file -[[ -r "$PIDFILE" ]] && - read PID < "$PIDFILE" && [[ -n $PID ]] && kill -0 $PID || unset PID - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON "${DAEMON_OPTS[@]}" && - 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/rekonq/fix-google-sync.patch b/community/rekonq/fix-google-sync.patch deleted file mode 100644 index aa2aecc13..000000000 --- a/community/rekonq/fix-google-sync.patch +++ /dev/null @@ -1,155 +0,0 @@ -From: Andrea Diamantini <adjam7@gmail.com> -Date: Tue, 08 Jan 2013 16:09:03 +0000 -Subject: Workaround to fix Google Bookmarks sync + minor speed improvement -X-Git-Url: http://quickgit.kde.org/?p=rekonq.git&a=commitdiff&h=58bd0c195b60c3cf597a8d9296e5725dc4be7c9b ---- -Workaround to fix Google Bookmarks sync + minor speed improvement - -Courtesy patch by "Francesco". Thanks :) - -BUG: 312824 ---- - - ---- a/src/sync/googlesynchandler.cpp -+++ b/src/sync/googlesynchandler.cpp -@@ -3,7 +3,7 @@ - * This file is a part of the rekonq project - * - * Copyright (C) 2012 by Siteshwar Vashisht <siteshwar at gmail dot com> --* Copyright (C) 2011 by Andrea Diamantini <adjam7 at gmail dot com> -+* Copyright (C) 2011-2013 by Andrea Diamantini <adjam7 at gmail dot com> - * - * - * This program is free software; you can redistribute it and/or -@@ -172,24 +172,24 @@ - - QString path = _webPage.mainFrame()->url().path(); - -- if (path == "/ServiceLogin" && _doLogin == true) -+ if ( (path == QL1S("/ServiceLogin") || path == QL1S("/Login")) && _doLogin == true) - { - // Let's login to our Google account - QWebFrame *frame = _webPage.mainFrame(); - -- QWebElement email = frame->findFirstElement("#Email"); -- QWebElement passwd = frame->findFirstElement("#Passwd"); -- QWebElement form = frame->findFirstElement("#gaia_loginform"); -- -- email.setAttribute("value", ReKonfig::syncUser()); -- passwd.setAttribute("value", ReKonfig::syncPass()); -- form.evaluateJavaScript("this.submit();"); -+ QWebElement email = frame->findFirstElement( QL1S("#Email") ); -+ QWebElement passwd = frame->findFirstElement( QL1S("#Passwd") ); -+ QWebElement form = frame->findFirstElement( QL1S("#gaia_loginform") ); -+ -+ email.setAttribute( QL1S("value"), ReKonfig::syncUser()); -+ passwd.setAttribute( QL1S("value"), ReKonfig::syncPass()); -+ form.evaluateJavaScript( QL1S("this.submit();") ); - emit syncStatus(Rekonq::Bookmarks, true, i18n("Signing in...")); - - // Login only once - _doLogin = false; - } -- else if (path == "/bookmarks/") -+ else if (path == QL1S("/bookmarks/") ) - { - // We get to this page after successful login, let's fetch the bookmark list in Xml format. - QNetworkAccessManager *qnam = _webPage.networkAccessManager(); -@@ -199,16 +199,16 @@ - emit syncStatus(Rekonq::Bookmarks, true, i18n("Fetching bookmarks from server...")); - connect(_reply, SIGNAL(finished()), this, SLOT(fetchingBookmarksFinished())); - } -- else if (path == "/ServiceLoginAuth") -+ else if (path == QL1S("/ServiceLoginAuth") ) - { - emit syncStatus(Rekonq::Bookmarks, false, i18n("Login failed!")); - _isSyncing = false; - } -- else if (path == "/bookmarks/mark") -+ else if (path == QL1S("/bookmarks/mark") ) - { - QWebFrame *frame = _webPage.mainFrame(); - -- QString sigKey = frame->findFirstElement("input[name=sig]").attribute("value"); -+ QString sigKey = frame->findFirstElement( QL1S("input[name=sig]") ).attribute( QL1S("value") ); - kDebug() << "Signature Key is : " << sigKey; - - QNetworkAccessManager *qnam = _webPage.networkAccessManager(); -@@ -219,7 +219,7 @@ - for (QSet<QString>::const_iterator iter = _bookmarksToDelete.constBegin(); iter != _bookmarksToDelete.end(); ++iter) - { - QNetworkRequest request; -- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?dlq=" + *iter + "&sig=" + sigKey)); -+ request.setUrl(QUrl( QL1S("https://www.google.com/bookmarks/mark?dlq=") + *iter + QL1S("&sig=") + sigKey)); - - kDebug() << "Delete url is : " << request.url(); - QNetworkReply *r = qnam->get(request); -@@ -243,7 +243,7 @@ - postData.append("&sig=" + sigKey.toUtf8()); - - QNetworkRequest request; -- request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + "&btnA")); -+ request.setUrl(QUrl("https://www.google.com/bookmarks/mark?sig=" + sigKey + QL1S("&btnA") )); - request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded"); - kDebug() << "Url: " << request.url(); - kDebug() << "Post data is :" << postData; -@@ -257,7 +257,7 @@ - _bookmarksToAdd.clear(); - - } -- else if (path == "/Logout") -+ else if (path == QL1S("/Logout") ) - { - //Session finished - emit syncStatus(Rekonq::Bookmarks, true, i18n("Done!")); -@@ -277,10 +277,10 @@ - { - QString data = _reply->readAll(); - -- QDomDocument doc("bookmarks"); -+ QDomDocument doc( QL1S("bookmarks") ); - doc.setContent(data); - -- QDomNodeList bookmarksOnServer = doc.elementsByTagName("bookmark"); -+ QDomNodeList bookmarksOnServer = doc.elementsByTagName( QL1S("bookmark") ); - emit syncStatus(Rekonq::Bookmarks, true, i18n("Reading bookmarks...")); - - BookmarkManager *manager = BookmarkManager::self(); -@@ -291,8 +291,8 @@ - - for (int i = 0; i < bookmarksOnServer.size(); ++i) - { -- QString title = getChildElement(bookmarksOnServer.at(i), "title"); -- QString url = getChildElement(bookmarksOnServer.at(i), "url"); -+ QString title = getChildElement(bookmarksOnServer.at(i), QL1S("title") ); -+ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") ); - - KBookmark bookmark = manager->bookmarkForUrl(KUrl(url)); - if (bookmark.isNull()) -@@ -377,7 +377,7 @@ - found = true; - break; - } -- else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), "url")) -+ else if (current.url().url() == getChildElement(bookmarksOnServer.at(i), QL1S("url")) ) - { - found = true; - } -@@ -398,13 +398,13 @@ - - for (int i = 0; i < bookmarksOnServer.count(); ++i) - { -- QString url = getChildElement(bookmarksOnServer.at(i), "url"); -+ QString url = getChildElement(bookmarksOnServer.at(i), QL1S("url") ); - - KBookmark result = manager->bookmarkForUrl(KUrl(url)); - if (result.isNull()) - { - kDebug() << "Deleting from Google Bookmarks: " << url; -- _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), "id")); -+ _bookmarksToDelete.insert(getChildElement(bookmarksOnServer.at(i), QL1S("id") )); - } - } - - diff --git a/community/rsnapshot/PKGBUILD b/community/rsnapshot/PKGBUILD deleted file mode 100644 index 428c44b09..000000000 --- a/community/rsnapshot/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 58364 2011-11-12 11:47:00Z andrea $ -# Maintainer: -# Contributor: Geoffroy Carrier <geoffroy@archlinux.org> -# Contributor: Thorsten Tasch <tht@thorstentasch.de> -# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=rsnapshot -pkgver=1.3.1 -pkgrel=3 -pkgdesc="A remote filesystem snapshot utility" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.rsnapshot.org" -license=('GPL') -depends=('perl' 'rsync' 'openssh') -backup=('etc/rsnapshot.conf') -source=("http://www.rsnapshot.org/downloads/${pkgname}-${pkgver}.tar.gz" - 'rsnapshot') -md5sums=('588f92995dcf60a6ea6df8d94a017e7e' - '4cd16eaa51d58a652cffde945985e91c') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man - sed -i 's:/usr/bin/pod2man:/usr/bin/core_perl/pod2man:' Makefile - make -} - -package() { - cd ${srcdir}/${pkgname}-${pkgver} - - make DESTDIR=${pkgdir} install - mv ${pkgdir}/etc/rsnapshot.conf.default ${pkgdir}/etc/rsnapshot.conf - install -Dm644 ${srcdir}/rsnapshot ${pkgdir}/etc/logrotate.d/rsnapshot -} diff --git a/community/rsnapshot/rsnapshot b/community/rsnapshot/rsnapshot deleted file mode 100644 index 190b1f512..000000000 --- a/community/rsnapshot/rsnapshot +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/rsnapshot { - copytruncate - missingok -} diff --git a/community/rt3562sta/PKGBUILD b/community/rt3562sta/PKGBUILD deleted file mode 100644 index 7ef335c9e..000000000 --- a/community/rt3562sta/PKGBUILD +++ /dev/null @@ -1,85 +0,0 @@ -# $Id: PKGBUILD 79180 2012-10-31 07:25:39Z tpowa $ -# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -# Based on SUSE spec https://build.opensuse.org/package/files?package=rt3562sta&project=driver%3Awireless - -pkgname=rt3562sta -pkgver=2.4.1.1 -pkgrel=20 -pkgdesc="Ralink RT3562 PCI WLAN adaptors kernel module" -arch=(i686 x86_64) -url="http://www.mediatek.com/en/Products/support.php?sn=501" -license=('GPL') -depends=('linux') -makedepends=('linux-headers') -install=$pkgname.install -source=( - http://dl.dropbox.com/u/362439/DPO_RT3562_3592_3062_LinuxSTA_V${pkgver}_20101217.tgz - $pkgname-$pkgver-config.patch - $pkgname-$pkgver-gcc-warnings-x86_64.patch - $pkgname-$pkgver-WPA-mixed.patch - $pkgname-$pkgver-convert-devicename-to-wlanX.patch - $pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch - $pkgname-$pkgver-return_nonvoid.patch - $pkgname-$pkgver-reduce_debug_output.patch - $pkgname-$pkgver-remove_date_time.patch -) - -build() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - - cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" - patch -p0 -i "$srcdir/$pkgname-$pkgver-config.patch" - [ "$CARCH" == "x86_64" ] && patch -p0 -i "$srcdir/$pkgname-$pkgver-gcc-warnings-x86_64.patch" - patch -p0 -i "$srcdir/$pkgname-$pkgver-WPA-mixed.patch" - patch -p0 -i "$srcdir/$pkgname-$pkgver-convert-devicename-to-wlanX.patch" - patch -p0 -i "$srcdir/$pkgname-$pkgver-remove-potential-conflicts-with-rt2860sta.patch" - patch -p0 -i "$srcdir/$pkgname-$pkgver-return_nonvoid.patch" - patch -p0 -i "$srcdir/$pkgname-$pkgver-reduce_debug_output.patch" - patch -p0 -i "$srcdir/$pkgname-$pkgver-remove_date_time.patch" - - # clean up this mess of mixing RT2860STA with RT3562STA - # in documentation files - mv RT2860STA.dat RT3562STA.dat - mv RT2860STACard.dat RT3562STACard.dat - sed -i 's/2860/3562/g' *STA* iwpriv_usage.txt - - # as we change the default name of the interface from raX to wlanX, change respective references in documentation, too - sed -i 's|ra0|wlan0|g' *.txt README* *.dat - sed -i 's|ra1|wlan1|g' *.txt README* *.dat - sed -i 's|ra2|wlan2|g' *.txt README* *.dat - - export EXTRA_CFLAGS="-DVERSION=$pkgver" - - # this Makefile is far too strict... - echo "LINUX_SRC = /usr/lib/modules/$KERNEL_RELEASE/build" >> Makefile - - make -} - -package() { - _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -) - depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)") - KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version) - msg "Kernel = $KERNEL_VERSION" - - cd "$srcdir/DPO_RT3562_3592_3062_LinuxSTA_V2.4.1.1_20101217" - - install -Dm 0640 RT3562STA.dat "$pkgdir/etc/Wireless/RT3562STA/RT3562STA.dat" - install -Dm 0644 os/linux/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko" - install -dm 0755 "$pkgdir/usr/share/doc/$pkgname" - install -m 0644 iwpriv_usage.txt README* RT3562STA* sta_ate_iwpriv_usage.txt "$pkgdir/usr/share/doc/$pkgname" - - find "$pkgdir" -name '*.ko' -exec gzip -9 {} \; - sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install" -} - -sha256sums=('71cd27784009894198f03470ec88e77f2cd176bf5f8d93b4dd984d3a3e543d5a' - 'b1465fceaac99f26cc0e7db0562d2bf103b57656f0b7b57e404f59efb3373b27' - 'd013ed5981a02be27b4aaf1e03670d68dbb16f40d9eb84930e58a96fc38ef947' - 'c962d014ea6e84a8c3398ff13e4709cc309c29134cac0b5c702eab1026799887' - 'e966d96026baee0447d6ad26742bcc40baa3f94530573d58f4eca842e107f809' - '7d2a83edfe6664a8e923dcda636c871220efc7ff4a82ab76a62fc97a11f2fcaa' - 'd672b58cdb278e3ecaeb46f3e5e477e1da7d2fd5dbf896521a4d0993743b9ab9' - '4d1d5eb5c22d356af62f4f55d12b04eb8a557ea9c664edfbc79c9e0454ccca4e' - 'a888d045b142127070c2c23ed1a84306d5202896265c828cf7e125ec2dd52389') diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch b/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch deleted file mode 100644 index caf2b1c6a..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-WPA-mixed.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- common/cmm_wpa.c.orig 2010-11-26 04:18:41.000000000 +0100 -+++ common/cmm_wpa.c 2010-12-01 15:09:22.000000000 +0100 -@@ -2410,7 +2410,7 @@ - UCHAR PrimaryRsnie; - BOOLEAN bMixCipher = FALSE; // indicate the pairwise and group cipher are different - UCHAR p_offset; -- WPA_MIX_PAIR_CIPHER FlexibleCipher = MIX_CIPHER_NOTUSE; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode -+ WPA_MIX_PAIR_CIPHER FlexibleCipher = WPA_TKIPAES_WPA2_TKIPAES; // it provide the more flexible cipher combination in WPA-WPA2 and TKIPAES mode - - rsnielen_cur_p = NULL; - rsnielen_ex_cur_p = NULL; diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch b/community/rt3562sta/rt3562sta-2.4.1.1-config.patch deleted file mode 100644 index dc245e38e..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-config.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- os/linux/config.mk.orig 2010-12-17 12:44:47.000000000 +0100 -+++ os/linux/config.mk 2010-12-17 19:53:36.000000000 +0100 -@@ -9,10 +9,10 @@ - - - # Support Wpa_Supplicant --HAS_WPA_SUPPLICANT=n -+HAS_WPA_SUPPLICANT=y - - # Support Native WpaSupplicant for Network Maganger --HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=n -+HAS_NATIVE_WPA_SUPPLICANT_SUPPORT=y - - #Support Net interface block while Tx-Sw queue full - HAS_BLOCK_NET_IF=n -@@ -283,7 +283,7 @@ - endif - - ifeq ($(CHIPSET),3562) --WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -+WFLAGS +=-DRTMP_MAC_PCI -DRT2860 -DRT28xx -DRT30xx -DRT35xx -DRTMP_PCI_SUPPORT -DRTMP_RF_RW_SUPPORT -DRTMP_EFUSE_SUPPORT -DA_BAND_SUPPORT -DDOT11N_SS3_SUPPORT -DNEW_RATE_ADAPT_SUPPORT -DRT3593 - ifeq ($(HAS_DFS_SUPPORT),y) - WFLAGS += -DDFS_HARDWARE_SUPPORT -DDFS_DEBUG - endif ---- Makefile.orig 2010-12-17 12:44:47.000000000 +0100 -+++ Makefile 2010-12-17 19:51:39.000000000 +0100 -@@ -284,26 +284,26 @@ - endif - - ifeq ($(RT28xx_MODE),AP) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.o /tftpboot - ifeq ($(OSABL),YES) -- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot -- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.o /tftpboot - endif - ifeq ($(PLATFORM),INF_AMAZON_SE) -- cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net -+# cp -f /tftpboot/rt2870ap.o /backup/ifx/build/root_filesystem/lib/modules/2.4.31-Amazon_SE-3.6.2.2-R0416_Ralink/kernel/drivers/net - endif - else - ifeq ($(RT28xx_MODE),APSTA) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.o /tftpboot - ifeq ($(OSABL),YES) -- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot -- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.o /tftpboot - endif - else -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.o /tftpboot - ifeq ($(OSABL),YES) -- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot -- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.o /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.o /tftpboot - endif - endif - endif -@@ -331,25 +331,25 @@ - endif - - ifeq ($(RT28xx_MODE),AP) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)ap.ko /tftpboot - ifeq ($(OSABL),YES) -- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot -- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)ap.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)ap.ko /tftpboot - endif - rm -f os/linux/rt$(CHIPSET)ap.ko.lzma - /root/bin/lzma e os/linux/rt$(CHIPSET)ap.ko os/linux/rt$(CHIPSET)ap.ko.lzma - else - ifeq ($(RT28xx_MODE),APSTA) -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)apsta.ko /tftpboot - ifeq ($(OSABL),YES) -- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot -- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)apsta.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)apsta.ko /tftpboot - endif - else -- cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rt$(CHIPSET)sta.ko /tftpboot - ifeq ($(OSABL),YES) -- cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot -- cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtutil$(CHIPSET)sta.ko /tftpboot -+# cp -f $(RT28xx_DIR)/os/linux/rtnet$(CHIPSET)sta.ko /tftpboot - endif - endif - endif diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch b/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch deleted file mode 100644 index 5ec4d5028..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-convert-devicename-to-wlanX.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- include/rtmp_def.h.orig 2010-11-26 04:18:41.000000000 +0100 -+++ include/rtmp_def.h 2010-12-01 14:57:05.000000000 +0100 -@@ -1451,8 +1451,8 @@ - #define SET_ENTRY_CLIWDS(_x) CLIENT_STATUS_SET_FLAG((_x), fCLIENT_STATUS_CLI_WDS) - #endif // CLIENT_WDS // - --#define INF_MAIN_DEV_NAME "ra" --#define INF_MBSSID_DEV_NAME "ra" -+#define INF_MAIN_DEV_NAME "wlan" -+#define INF_MBSSID_DEV_NAME "wlan" - #define INF_WDS_DEV_NAME "wds" - #define INF_APCLI_DEV_NAME "apcli" - #define INF_MESH_DEV_NAME "mesh" diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch b/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch deleted file mode 100644 index a53dbde86..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-gcc-warnings-x86_64.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- os/linux/rt_linux.c.orig 2010-11-26 04:18:41.000000000 +0100 -+++ os/linux/rt_linux.c 2010-12-01 14:57:53.000000000 +0100 -@@ -479,9 +479,9 @@ - MEM_DBG_PKT_ALLOC_INC(pAd); - - skb_reserve(skb, 2); -- NdisMoveMemory(skb->tail, pHeader802_3, HdrLen); -+ NdisMoveMemory(skb_tail_pointer(skb), pHeader802_3, HdrLen); // - skb_put(skb, HdrLen); -- NdisMoveMemory(skb->tail, pData, DataSize); -+ NdisMoveMemory(skb_tail_pointer(skb), pData, DataSize); // - skb_put(skb, DataSize); - skb->dev = get_netdev_from_bssid(pAd, FromWhichBSSID); - pPacket = OSPKT_TO_RTPKT(skb); diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch b/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch deleted file mode 100644 index 6754f214d..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-reduce_debug_output.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- include/os/rt_linux.h.orig 2011-01-07 11:20:02.000000000 +0100 -+++ include/os/rt_linux.h 2011-01-07 11:21:30.000000000 +0100 -@@ -611,10 +611,10 @@ - - #define DBGPRINT_RAW(Level, Fmt) \ - do{ \ -- if (Level <= RTDebugLevel) \ -+/* if (Level <= RTDebugLevel) \ - { \ - printk Fmt; \ -- } \ -+ }*/ \ - }while(0) - - #define DBGPRINT(Level, Fmt) DBGPRINT_RAW(Level, Fmt) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch deleted file mode 100644 index a0d00d6e3..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-remove-potential-conflicts-with-rt2860sta.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- include/os/rt_linux.h.orig 2010-11-26 04:18:41.000000000 +0100 -+++ include/os/rt_linux.h 2010-12-01 14:58:46.000000000 +0100 -@@ -111,10 +111,10 @@ - - #ifdef CONFIG_STA_SUPPORT - #ifdef RTMP_MAC_PCI --#define STA_PROFILE_PATH "/etc/Wireless/RT2860STA/RT2860STA.dat" -+#define STA_PROFILE_PATH "/etc/Wireless/RT3562STA/RT3562STA.dat" - #define STA_DRIVER_VERSION "2.4.1.1" - #ifdef MULTIPLE_CARD_SUPPORT --#define CARD_INFO_PATH "/etc/Wireless/RT2860STA/RT2860STACard.dat" -+#define CARD_INFO_PATH "/etc/Wireless/RT3562STA/RT3562STACard.dat" - #endif // MULTIPLE_CARD_SUPPORT // - #endif // RTMP_MAC_PCI // - ---- os/linux/pci_main_dev.c.orig 2010-12-17 19:59:25.000000000 +0100 -+++ os/linux/pci_main_dev.c 2010-12-17 20:00:12.000000000 +0100 -@@ -90,14 +90,15 @@ - MODULE_VERSION(STA_DRIVER_VERSION); - #endif - #endif // CONFIG_STA_SUPPORT // -- -+MODULE_DESCRIPTION("RT3562 Wireless Lan Linux Driver"); -+MODULE_LICENSE("GPL"); - - // - // Our PCI driver structure - // - static struct pci_driver rt2860_driver = - { -- name: "rt2860", -+ name: "rt3562", - id_table: rt2860_pci_tbl, - probe: rt2860_probe, - #if LINUX_VERSION_CODE >= 0x20412 -@@ -317,9 +318,9 @@ - } - - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) -- print_name = pci_dev ? pci_name(pci_dev) : "rt2860"; -+ print_name = pci_dev ? pci_name(pci_dev) : "rt3562"; - #else -- print_name = pci_dev ? pci_dev->slot_name : "rt2860"; -+ print_name = pci_dev ? pci_dev->slot_name : "rt3562"; - #endif // LINUX_VERSION_CODE // - - if ((rv = pci_request_regions(pci_dev, print_name)) != 0) diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch b/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch deleted file mode 100644 index b17ba5a12..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-remove_date_time.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- os/linux/sta_ioctl.c.orig 2010-12-17 12:44:47.000000000 +0100 -+++ os/linux/sta_ioctl.c 2011-08-02 14:52:37.000000000 +0200 -@@ -1812,7 +1812,7 @@ - wrq->length = strlen(extra) + 1; // 1: size of '\0' - break; - case SHOW_DRVIER_VERION: -- sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, __DATE__, __TIME__ ); -+ sprintf(extra, "Driver version-%s, %s %s\n", STA_DRIVER_VERSION, NULL, NULL ); - wrq->length = strlen(extra) + 1; // 1: size of '\0' - break; - #ifdef DOT11_N_SUPPORT diff --git a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch b/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch deleted file mode 100644 index 7416a31f9..000000000 --- a/community/rt3562sta/rt3562sta-2.4.1.1-return_nonvoid.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- os/linux/rt_main_dev.c.orig 2010-12-17 12:44:47.000000000 +0100 -+++ os/linux/rt_main_dev.c 2010-12-17 19:42:23.000000000 +0100 -@@ -1247,7 +1247,7 @@ - RTMP_OS_TASK *pTask; - - if (pAd->bWriteDat == FALSE) -- return; -+ return 0; - - DBGPRINT(RT_DEBUG_TRACE, ("-->WriteDatThreadInit()\n")); - diff --git a/community/rt3562sta/rt3562sta.install b/community/rt3562sta/rt3562sta.install deleted file mode 100644 index c3b988aa6..000000000 --- a/community/rt3562sta/rt3562sta.install +++ /dev/null @@ -1,16 +0,0 @@ -rebuild_module_dependencies() { - EXTRAMODULES='extramodules-3.6-ARCH' - depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) -} - -post_install() { - rebuild_module_dependencies -} - -post_upgrade() { - rebuild_module_dependencies -} - -post_remove() { - rebuild_module_dependencies -} diff --git a/community/sauerbraten/PKGBUILD b/community/sauerbraten/PKGBUILD deleted file mode 100644 index ed3520ba6..000000000 --- a/community/sauerbraten/PKGBUILD +++ /dev/null @@ -1,73 +0,0 @@ -# $Id: PKGBUILD 75284 2012-08-17 21:27:10Z lcarlier $ -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org> -# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> -# Contributor: Christoph Siegenthaler <csi@gmx.ch> -# Contributor: Jesse Young <jesse@eon.jlyo.org> - -pkgname=sauerbraten -pkgver=2010_07_28_justice_edition -pkgrel=5 -pkgdesc="FPS that uses an improved version of the Cube engine" -arch=('i686' 'x86_64') -url="http://www.sauerbraten.org/" -license=('ZLIB') -makedepends=('sdl_mixer' 'sdl_image' 'libgl' 'mesa' 'gendesk') -install=sauerbraten.install -backup=('etc/conf.d/sauerbraten') -source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2 - sauerbraten-client - sauerbraten-server - sauerbraten.confd - sauerbraten.rcd - sauerbraten.png - sauerbraten.install - sauerbraten.service - license.txt - fix-indirect-linking.diff) -md5sums=('0947cb37b628873063270be1fcce27f6' - 'ac66ef9e80d6fc1b4b047df1c36c07c0' - '4a42c314d01ccdc4c76fad38d18c7434' - '8e26aeba1ef178c24e22723d3c48d7e1' - 'e0a2e0679c34b39623964ee68e6fae1e' - '3e602f421f7342cf8c3ed16314523d6f' - '2f7b423f49491359ff776a91414db4d8' - '3c964cdd0906461c0404641b1eb52d96' - 'cf46cd0148f03b7477f7c54aec865abe' - 'a9a9b658affd933ad354be45da998354') -_exec=('sauerbraten-client %u') - -build() { - cd "$srcdir" - gendesk - - cd "$pkgname/src" - - patch -Np1 -i ../../fix-indirect-linking.diff - - make - - # remove cvs directories - find ${srcdir}/$pkgname -type d -name CVS -exec rm -rf '{}' \; 2> /dev/null -} - -package() { - depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data') - - cd ${srcdir}/$pkgname/src - - make DESTDIR="${pkgdir}" install - - cd .. - install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client - install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server - - install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client - install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/sbin/sauerbraten-server - install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten - install -Dm755 ${srcdir}/sauerbraten.rcd ${pkgdir}/etc/rc.d/sauerbraten - install -Dm644 ${srcdir}/sauerbraten.service ${pkgdir}/usr/lib/systemd/system/sauerbraten.service - install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop - install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png - install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt -} diff --git a/community/sauerbraten/fix-indirect-linking.diff b/community/sauerbraten/fix-indirect-linking.diff deleted file mode 100644 index 56ed8825b..000000000 --- a/community/sauerbraten/fix-indirect-linking.diff +++ /dev/null @@ -1,20 +0,0 @@ -Index: sauerbraten/Makefile -=================================================================== ---- sauerbraten.orig/Makefile 2010-07-29 21:24:21.000000000 -0400 -+++ sauerbraten/Makefile 2010-07-29 21:26:15.717746486 -0400 -@@ -21,11 +21,14 @@ - CLIENT_LIBS= -mwindows -Llib -lSDL -lSDL_image -lSDL_mixer -lzdll -lopengl32 -lenet -lws2_32 -lwinmm - else - CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` --CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -+CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -lX11 - endif - ifeq ($(PLATFORM),Linux) - CLIENT_LIBS+= -lrt - endif -+ifeq ($(PLATFORM),GNU/kFreeBSD) -+CLIENT_LIBS+= -lrt -+endif - CLIENT_OBJS= \ - shared/crypto.o \ - shared/geom.o \ diff --git a/community/sauerbraten/license.txt b/community/sauerbraten/license.txt deleted file mode 100644 index f38792c76..000000000 --- a/community/sauerbraten/license.txt +++ /dev/null @@ -1,34 +0,0 @@ -LICENSE -======= - -Sauerbraten game engine source code, any release. - -Copyright (C) 2001-2006 Wouter van Oortmerssen. - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - - -LICENSE NOTES -============= -The license covers the source code found in the "src" directory of this -archive, the included enet network library which sauerbraten uses is covered by -an MIT-style license, which is however compatible with the above license for all -practical purposes. - -Game media included in the game (maps, textures, sounds, models etc.) -are NOT covered by this license, and may have individual copyrights and -distribution restrictions (see individual readmes). diff --git a/community/sauerbraten/sauerbraten-client b/community/sauerbraten/sauerbraten-client deleted file mode 100755 index 8a9b354f3..000000000 --- a/community/sauerbraten/sauerbraten-client +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -WIDTH=1024 -HEIGHT=768 -[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten - -cd /opt/sauerbraten -if [ -f /usr/bin/aoss ]; then - aoss bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r -else - bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r -fi - - diff --git a/community/sauerbraten/sauerbraten-server b/community/sauerbraten/sauerbraten-server deleted file mode 100755 index b4c79cb7f..000000000 --- a/community/sauerbraten/sauerbraten-server +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -SAUER_USER=nobody -LOGDIR=/var/log/sauerbraten -[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten - -cd /opt/sauerbraten - -if [ "$(id -u)" == "0" ]; then - if [ ! -d "$LOGDIR" ]; then - mkdir -p "$LOGDIR" - chown "$SAUER_USER:log" "$LOGDIR" - fi - - sudo -Hu "$SAUER_USER" \ - nohup /opt/sauerbraten/bin/linux_server \ - >> "$LOGDIR/main.log" \ - 2>> "$LOGDIR/error.log" \ - < /dev/null & -else - bin/linux_server -fi diff --git a/community/sauerbraten/sauerbraten.confd b/community/sauerbraten/sauerbraten.confd deleted file mode 100644 index 93cd32de7..000000000 --- a/community/sauerbraten/sauerbraten.confd +++ /dev/null @@ -1,7 +0,0 @@ -# Client options -WIDTH=1024 -HEIGHT=768 - -# Server options -SAUER_USER=sauerbraten -LOGDIR=/var/log/sauerbraten diff --git a/community/sauerbraten/sauerbraten.install b/community/sauerbraten/sauerbraten.install deleted file mode 100644 index 2ee7689ab..000000000 --- a/community/sauerbraten/sauerbraten.install +++ /dev/null @@ -1,22 +0,0 @@ -# arg 1: the new package version -post_install() { - getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten - if getent passwd sauerbraten > /dev/null 2>&1; then - usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1 - else - usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten - fi - passwd -l sauerbraten > /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() { - getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten -} - diff --git a/community/sauerbraten/sauerbraten.png b/community/sauerbraten/sauerbraten.png Binary files differdeleted file mode 100644 index 5ec7606bc..000000000 --- a/community/sauerbraten/sauerbraten.png +++ /dev/null diff --git a/community/sauerbraten/sauerbraten.rcd b/community/sauerbraten/sauerbraten.rcd deleted file mode 100644 index fb95aae16..000000000 --- a/community/sauerbraten/sauerbraten.rcd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting sauerbraten-server" - [ ! -f /var/run/daemons/sauerbraten ] && /usr/sbin/sauerbraten-server - if [ $? -gt 0 ]; then - stat_fail - else - pgrep -of "/opt/sauerbraten/bin/linux_server" > /var/run/sauerbraten.pid - add_daemon sauerbraten - stat_done - fi - ;; - - stop) - stat_busy "Stopping sauerbraten-server" - [ -f /var/run/sauerbraten.pid ] && kill `cat /var/run/sauerbraten.pid` - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon sauerbraten - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/sauerbraten/sauerbraten.service b/community/sauerbraten/sauerbraten.service deleted file mode 100644 index a3982a50c..000000000 --- a/community/sauerbraten/sauerbraten.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=Sauerbraten dedicated server -After=network.target - -[Service] -User=nobody -ExecStart=/opt/sauerbraten/bin/linux_server -Restart=on-abort -StandardOutput=syslog - -[Install] -WantedBy=multi-user.target - diff --git a/community/scorched3d/scorched3d.desktop b/community/scorched3d/scorched3d.desktop deleted file mode 100644 index b18d86581..000000000 --- a/community/scorched3d/scorched3d.desktop +++ /dev/null @@ -1,17 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Version=1.0 -Type=Application -Exec=/usr/bin/scorched3d -Icon=scorched3d.png -Terminal=false -Name=Scorched 3D -Name[lt_LT]=Scorched 3D -Comment=3D artillery game similar to Scorched Earth -Comment[de_DE]=3D Reimplementation des Klassikers Scorched Earth -Comment[fr_FR]=un jeu d'artillerie en 3 proche de Scorched Earth -Comment[lt_LT]=Nuotaikingas 3D taktinis-artilerinis žaidimas, panaÅ¡us į Scorched Earth -Comment[pl_PL]=Artyleryjska gra 3D podobna do Scorched Earth -Comment[ro_RO]=Un joc 3D cu artilerie similar cu Scorched Earth -Categories=Game;ArcadeGame; -StartupNotify=true diff --git a/community/scorched3d/scorched3d.png.uu b/community/scorched3d/scorched3d.png.uu deleted file mode 100644 index 4fb7e50db..000000000 --- a/community/scorched3d/scorched3d.png.uu +++ /dev/null @@ -1,105 +0,0 @@ -begin 600 scorched3d.png -MB5!.1PT*&@H````-24A$4@```#`````P"`8```!7`OF'````!F)+1T0`_P#_ -M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'TP@#%`([XJF@ -M!```$5Q)1$%4>-IEFNER9$>.I3_`W>\2$0PFF5*VI.HJ]58]2\\\W#S/O,*\ -M35LO9FU5U:62E,H4DUM$W+B+.S`__`:3.4.S(!D+G0XX<`"<X_)__O?_<EQ0 -M4R0(D@1M%$3`'35##,1!J:^[.#D;RY)9<@9`4*(H3=.0VH;4)&+3(!IPE-F4 -M;)E<9G(I+'EAR3.S%<P<UO4C2D!0P''<"U@!G\$S:@"*J**J1$0``:T_G/H0 -M'-:W$%Z^1`1$J#\$%<'7CSK@[OBZ(=SK<]8W5U/QZA"0S\NO[SOU\[;^_OE+ -M$;3N;=T#"!%M>%E1``7#7O:LNKY\>5L4$46BH0[!A&(%6RVW[)A:?6`0%2YK -M7'SLCI9"S`JF%#.*.RZ0<<H7&[_\922@J`*BB`10):I62U0_>]P13.J.RNI> -M\6JT**@(JG7!((&\+"S%,*_^*Z6P+`N(5+\%K2'AH":H"V%UD;O@)K@[1C7" -M^"(H$`25@$A`D.K`]1'U$D$JH`(")EJ/4JH7Q1T10500$8(J(20\@,7"HHHL -MF:64NA$WBF6D*$D4UNW6DW2T1@2H4$Q1##=>@L;7]X-`6/TOJA#J&<H:4((0 -M]8L8D^IAA>*">3U[4\>I[H\2""$14T,0Q=V)*:'SC,PSMAHAHC6DS!&QEVA0 -M<50+N.%:(PRM)VSV*G"L[D/EQ=;Z_!*/4LV-U>2:C+IZ^7)\944<=P=WS)6" -MDET)*(1(%%!=CQ1A67)%%2`$)28(T590DW630K:P[BJO8`"F@E\,74,UB"`H -M&@4)6G,7J>'FA8A51`EK=M>-U.R-"*;4V#;'33&4[$*T&L<2`DD5<4$<8A!L -M=65J'8V@T8G!<0/+PE*$>0DLLR+FB!;4'!.P=3,:(8BNP5?#0M?C,*=^\T*\ -MQ!0&8H*8HC'4.%^-<;P:DF6%6'U!'05B4+2)A`@Q&*(9C87-KE`,<E'ZKCK< -M#4S@>!2>'H7C(>$.^`(X&@5-]0A4:CU`P"ZG9]6A9H8!<<V=NHB!NN!>$R2( -M$+7B+\Z*$(*+$E5I4Z!-2A.@:2$V`0V1)<.\*,L26):`E8CDZD$-H(W2=L[U -MC='VQN%9.1TCF*&QADN%O!6:J;7,N(3R)=F%6%[5*<$1JT>-"BI*#"M<ND(` -MUYK,0964E*81^@9V^T*W=7*.'`=E6HSC,^1%P0(3B@9!D]/T@=@4NDVFVP%) -M*2HL4\5J"6L=7C=?S"E2/7XICK:&5OPB]0U$5YA#<6+%6JEP^)(CHDB,A*BT -MC;#?9YJM8QIX>@Z<#LXX&%(*458(6=N0;$X^*8R*)*7=&+M]H=_!XWU@FI1< -M!#"L&%B%<A-J&*.X644Z@YA\K7JE(H6JD41H@M)$I0G5@(H4*PY+P`BDY/1] -M(23C/,!Q"`P'9YX-*]587YL"P0`A6,5`%\6+D*>.%`N;WI$;Y7A23L,*!%JP -M4M"2U[XH5_A]`14G-E*K8#$C3\Z2'9%(U(@$1UP@:(6PM38Z%5YC*K3=0B[. -MTX/R\""8%\!>"IJ9X6XKEE=@4%5<:IW)4T..1I.<JRO#$9:L+%EP@Z!>6P>L -MPO":!W5]B*W68C2;\O[^Q"]/$[NK*Z[W6V[V6][>7K'?);8Q$3#<*RHU<:9I -M,N[&W9UP.!CC7"MP[2"]'OUZW*I"4"&J$&)$".`!`XX'9YJ,K]_---%IDF(% -MT$+0@FFI38)'4'`K&`7#B#5?!(F1?=<P+@:>F8:!3WGA<!I(*9%BI$F!)B7Z -M+G)S#;$7/"GG'%B\QJE?DLXR!J@&0)A+1LQ0@5`J]H-2J+`8)J-I9V)RND8H -MDZ(.B&.J2-0:B*:89\K:[;XT<R$J7]\HNVW+,&:F;$QYXNE\9ER,;$+3-/1] -MS_6^PV/"FT@S1QX&R/.E1=;:2VE$-!";%@V1:3Q32J:8,2\%]Z6BC%2T"=$( -MSX7]WNA:F#0B5F<)%<5"((IBQ2C4&B%`),::H!K8]BU7JB_]M@.+%<[CPG#. -M#%-A*E#*PFB9/[V?>7A<.#XE^G[+?K^A2Y&NV=!WB7[;TVXVI)0HR\PTCIR' -M,X?G`]-T)N<9UT((D%R8BX,**0EHPB0"L9Z`2VWL&JM-GH!BQ*YI$8$8(Q)J -M@K$F]6*&B-'UB7Z[XYONBBRU"]W?9H[#3&H6NL98EL+3X<Q_?+RCY$R*@=W5 -MCNUN0]]W-*&V&FZ.F3-.QFD8&<Y';FYZWGV]HW@M5AZ@2*`00`*N^C*;!(6H -MBJMB"'';M?4$0FVNBCMYSLQ+8<R9C-%N-ER]N>7FJ^\(38L$H]^>&2?C]@8> -M[T=^?O\K?_CC#_SSO_X'#P_/F#G]IF.WW;#;;=AO.KJVI>LZ=KLM<\X<CD?N -M/]WS=_(5[][=@$1$"Q(<-.$2L,M4L#:A(=0V0Z2B86S;ME8_58IY+1X8(DK3 -M=%R_N66SOZ'=7)$-IF%"-=,T`^)*TH:^ZYCGS*]W#WRZ>^+A\8EY69B73(R) -MON^XOM[1Q$@,@;9-A)1`A.D\<7.S9YH:;F[?L-TY_::PW22PPCS/Y)()XH10 -M>R\3(XH3)!!I4^TWO-8#1`A-H&EZ9@+/H_/+TZ^<AI\XG4=4A>TF\NUWT'4= -ML"7/&VZNKOAOO_];MEW'X],3A].)^\<#3\\GSN/,D@OC.%.6"K.I;>C[CDW7 -M`PFC(<:.%`,BA7DVAK,Q34Z,@IHCJ>9+$"?%.IM$"^O@D2&;D;,S%6?RP'') -M_/CA$S_]_)$/'SYQGB:ZKN7F9LOW'UO>OMVQV>[QY0U-ZOB;WW[';[[]FF$< -M:W@\///^PR<^WCTPG$>.AX'#X<0PG"C+@K>)_7[+]9LW['8W;+:WI#;@S#P? -M'_CT,#%/$U>;!%V=RV-R0@()0A`EEIPKG!D,T\3=_9%_^_,=[^^>^7C_Q(>/ -M=QP.)Y:<Z=J6INOH?TG\_![>WD:VFX['QQU]=\6;-UNNMCW;7<]NN^'W?_<[ -M_LO??\^2"Z?AS/W]$[]^NN?CW0/G822&P&^__VO^Z;__(__T/_XGUV^_I6V= -MP^%7'I_>\_[GCYS/`U]]=<N;ZXZ=)'I;$#=B,E0A+N?I90X=AH%?'Q[Y]S_^ -MP(>[9TZG,\=A8)XSYHZ&B$\S9H5E<8H)U_LSQ^/`I\<G?OJEI>NJ4=MMSWZW -MH>M:FB;1Q$A*@6_^ZBN^_NH6`5*,7%WMN;W>$.5$TA^Y^S#PGW_ZP,/])Z9I -M).?,\^&XSI4]NNG0:&A9R,M$'`]CG2_%.9T&'IX.O/]PQ]/S@`!=DP@Q4@Q" -M#&BHY78<A6%PNKX0NY'#_<C#IPJ#(0@I**E)M&W#MN^X?;/G]LV>FYL]-]=7 -M;'<;NK:MU;:<.#[_F9AF_O*G1_[M7QXX'L]`(47E/$W(40DA$%,/ZDQS85YF -MXO/3<VU&W7@^C8SGJ<96C!6V5`GF9*O]#-0FS0W&T3B=X/9MY&H'TRB<S[(2 -M4,*2"Z6,G,\3]T\'XH^_$&.@:Q)-T]+W+5^_W?&/_[#'PXY?'S?<?RJH))QQ -MG4F$B)*7S.%P1*/R^&3,XYEE?B(^'0XU!XHQC#-YFHCJJ$#.1EXR2UF+&J_H -M%73-'2%%IVV$OWJG/#XIX]E9%BB7YFBE$30(JL()Z+K`DB,I/?*'/[=\^-0Q -MCALVW1NNMGMN;ZY9ELPT+XQSQLV9Y\S=W0,/#\\<#@?>W2;BTVFH\V1VQCE# -MSEQU$2N%\Y0Y#3/C-'.><QWY@A""$C0PC<HX"%C@W3ME?ZVXURE[,*&XKD8( -M(01"K".EN-$T1MLNY#+PPX_.\03G4\/O_OHW_/[O$^_>WM!WPC@OR'DB+POS -M-//IXSU_^<M[#H<#5]TWQ-D,'$JNA.*V;_FOO_V*XL8P+?SQIWO^\Y<'GHY# -M'3M+S2>7.GHJPFF(W#TH^^O`M]\$=E>![29@IDRSDK.2&EM[+MANG1AK-1U' -MY7!0#@<P,W[X\0/'X\`_?/\=W__N.[YY=TLV>'X^\O/[C_ST\Z_<W3\B7LCC -M3-1X804*%".XT,?*S*4F\NU7UPQSYCQGAO-<*_7:WQM0W+$Y,Q?A/"TL<Z!K -M`TU2N@YP!8^D%'$32A&F43@599Z$G(5I$J:YLGXY9^9YP;)QGA:^GQ?^]F]^ -MP]PFBM7^:9XS;81ESL38=+4"ATQ>,B67VG"Y(P%NWNSX=BG,Q;B[/S%-"VY. -M4&$Q8RX%S"C%&$[.<#2:F.EZX?K:2#'4ZJJ)4I1Y%MR5\ZA,XTJ=K+FANB;_ -MLO##./-\''@^#ESO-PSCS-/SB6G)B$`*0LZ%V&S:RJ0MB@D4@&R44LA6F>#; -MZRTI!6ZN=QQ/(^-8Q\AA'!G.4^5ZO!+!>5DP<X;!&0;08*@:*C/%:F*+*#$$ -M8HBDF.C:1*.ALH%4DM<\\_C\Q/D/`Z?SB7DN/#T-Y#FSZ1*[7A"\AI!8_:/@ -MCKD`I?:`7CG*E!+;+4A0=IN6>2[D8LS+PC3/S'.IW>N<.9U&2JD$^9*-I13* -M4GOXRE`Z3J$$)ZLQ+IEIF9F;R*9OB1>F3VMOEJ>9GW[^6!$Q&UT3V/21W2Y" -M$*(2,'5$`R$X'E^Q7^Z4XH@Z(00V?4O7-!1SW&SUE#&."^<Q<SK//+>)G(UB -MQI07AO/,.&52N-#ISIP+[E8I^>Q,,TQS1,3INY96$U$J+6_NG,\CI3@A*&VC -M;#?*9I-`A;B"T$42X44L62EWC8JZ(U[YF(Q3IUTJ>Q8"_2[0]<Y^W_'UVQTY -M&U/.#,/$\7CF-,RX5*1;E@SC1"DK*@4A%Z<8/)TFIL78M(5MW]$VL0HL"DF$ -MO@F\O>G8;!*ZTMIQ\4J'9RN4]6%8A<D+'Q650*!(C>E@QDH\X.*KW%1;B)`@ -MF1-SI$V13=^PS+ERI-E8EH5AG%B6\D*YG*?,>39$E9@:NKYCLVE0$8H9082^ -MB[RYZMCU+3&N6AU2#<"=[%:%":P.VJN'-2A10%01C^B*.!5\:JBLN@SF==!& -MI`I^*;+9M)7/S%"*D4MF7!:6N9"7VL^<QIEA*D!DN^VXWK7LNE!/<BJH*M=7 -M#;?7'6U*5.G!7Y&[%_5!0A4X*E6-F%<!8I6!"I=-&-E6AMB,[%`L5RIEG7O= -M#,OE)1Z5VL-'E&Z3UC7!<F$I1BZ5J&I2H&N4)@AF3C80=YHHI*B5`O)5Z`-B -M2DT=XD4H6A!3I!AJ!<>1U0!<JEY0?%W8<;>7WW.)%,_5J%)'TZPU67&'^#F_ -M*O$LE6>W"X-WD5J=L(9E")!6-2JL%&NEBFJ3!T+LNPYW(^=:&'(NF&3<9>7; -M/U/OH+A66348+SQE-J.40+:`6<:+48JS6*@<Y\J_OBQS>;*"1JC'ACI5HBJE -MDF(X0==18'T`*R>T)O%^+633HLS+PJ(+12^48)W4[.6?VPM-:PJR2DEZT6*+ -M5_980(*!*69RV?]GA*L#R.?7W/%2_^>*"%32I"JD]H5:#*]-BGV;,#/$"V(% -M<2&[D!%RJ8N;5;$NNU&\4H>.UUCTSYLP').:U'43CE"5%7^M=2,O^@54`UT" -ME`H"KK7*5CG%7B1L6?6!U^Z(30R8"::*ARH!N=22CJ_)N,;Y;)EL3G%J;%?M -MLDY5Z^+FSJNMO4C5_D74^"L1>\6/VK54[<'7JP9NM2NX2/W.NL%7!JRD5Q7C -MRN<XN\1/A<I"MK*BSF>-BE>W%'3UV/^SM?__KL(7*2#82W)X#9MU"E,#\:I\ -M:CW;SU</UIQQA^A>U@0J-6FH@&$B>!!LI?N*5W2HWO*UT-466%]YV\)%<UL_ -MJZOZN?96_OI.A=L7]R1>3E16+<U7]5JK(7[)!G<PIY@3W3)NAE@AK)ML%`C5 -M=J$FEB`448HXQ5=5'WFY3E"/=I6"ULVY7&*\>KIVK:MH9Q7WY8M(NNC5*P^Z -M$KK$]?4+CEDMNFI&).=U54/<JI>3U.9.A$:5%)0EE/4^Q.OCKWY7>Y7,:^R: -MKW<GW&N..36??*TCE_!YC3#VZCZ&U@L*0:HX&%;9%;<J<'AM>?XO+.\[U&WH -.P#``````245.1*Y"8((` -` -end diff --git a/community/sdlmame/PKGBUILD b/community/sdlmame/PKGBUILD deleted file mode 100644 index 33fcdb0f3..000000000 --- a/community/sdlmame/PKGBUILD +++ /dev/null @@ -1,96 +0,0 @@ -# $Id: PKGBUILD 81410 2012-12-20 12:14:49Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: robb_force <robb_force@holybuffalo.net> -# Maintainer: JJDaNiMoTh <jjdanimoth@gmail.com> - -_patchlevel=4 -_basever=0.147 - -pkgname=sdlmame -if [ ${_patchlevel} -ne 0 ]; then - pkgver=${_basever}.u${_patchlevel} -else - pkgver=${_basever} -fi -pkgrel=1 -pkgdesc="A port of the popular Multiple Arcade Machine Emulator using SDL with OpenGL support." -url="http://mamedev.org/" -license=('custom:MAME License') -arch=('i686' 'x86_64') -depends=('sdl>=1.2.11' 'libxinerama' 'gconf' 'sdl_ttf' 'gtk2') -makedepends=('unzip' 'nasm' 'mesa' 'glu' 'wget' 'python2') -DLAGENTS=('http::/usr/bin/wget -U "Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.2) Gecko/20090804 Shiretoko/3.5.2" -c -t 3 --waitretry=3 -O %o %u') -install=sdlmame.install - -for i in `seq 1 ${_patchlevel}`; do - _patches="${_patches} sdlmame-${_basever/./}u${i}_diff.zip::http://mamedev.org/updates/${_basever/./}u${i}_diff.zip" -done - -source=("mame${_basever/./}s.zip::http://mamedev.org/downloader.php?file=releases/mame${_basever/./}s.zip" - "sdlmame.sh" - "extras.tar.gz" - ${_patches}) -md5sums=('b5fc953ee0351f5145b9d704603f2ee3' - 'e11a7d26704a9e2cff223b9b867d6a05' - '420b61240bf5ae11615ba7c6100ee00d' - '7f2dbea383138a6ae2bbaac3b32376d6' - 'c0306cbf583309d23549529f441e97f2' - '8851533ae3f692e436bc399b773c4fcb' - '3d5fc211f98454f857e58f9100d09e19') - -build() { - cd $srcdir/ - if [ $NOEXTRACT -eq 0 ]; then - unzip mame.zip - find . -type f -not -name \*.png | xargs perl -pi -e 's/\r\n?/\n/g' - for i in `seq 1 ${_patchlevel}`; do - msg "Patch#$i" - patch -p0 -E <${_basever/./}u$i.diff || true # FIXME: - done - fi - make NOWERROR=1 OPTIMIZE=2 PYTHON=python2 - make tools NOWERROR=1 OPTIMIZE=2 PYTHON=python2 -} - -package() { - cd $srcdir/ - # Install the sdlmame script - install -Dm755 $srcdir/${pkgname}.sh $pkgdir/usr/bin/${pkgname} - - # Install the applications and the UI font in /usr/share - install -Dm755 mame $pkgdir/usr/share/${pkgname}/${pkgname} || \ - install -Dm755 mame64 $pkgdir/usr/share/${pkgname}/${pkgname} - - install -m755 chdman $pkgdir/usr/share/${pkgname}/chdman - install -m755 jedutil $pkgdir/usr/share/${pkgname}/jedutil - install -m755 regrep $pkgdir/usr/share/${pkgname}/regrep - install -m755 romcmp $pkgdir/usr/share/${pkgname}/romcmp - install -m755 testkeys $pkgdir/usr/share/${pkgname}/testkeys - install -m755 src2html $pkgdir/usr/share/${pkgname}/src2html - install -m755 srcclean $pkgdir/usr/share/${pkgname}/srcclean - install -m755 ldverify $pkgdir/usr/share/${pkgname}/ldverify - install -m755 ldresample $pkgdir/usr/share/${pkgname}/ldresample - - # Install the extra bits - install -d $pkgdir/usr/share/${pkgname}/{artwork,ctrlr,keymaps,shader} - install -d $pkgdir/usr/share/man/man1 - install -d $pkgdir/usr/share/man/man6 - install -m644 src/osd/sdl/shader/glsl*.*h $pkgdir/usr/share/${pkgname}/shader/ - install -m644 src/osd/sdl/man/*.1* $pkgdir/usr/share/man/man1/ - install -m644 src/osd/sdl/man/*.6* $pkgdir/usr/share/man/man6/ - - install -m644 $srcdir/artwork/* $pkgdir/usr/share/${pkgname}/artwork/ - install -m644 $srcdir/ctrlr/* $pkgdir/usr/share/${pkgname}/ctrlr/ - install -m644 src/osd/sdl/keymaps/* $pkgdir/usr/share/${pkgname}/keymaps/ - - # Include the license - install -Dm644 docs/license.txt $pkgdir/usr/share/licenses/${pkgname}/license.txt - - # FS#28203 - sed -i 's|KEYCODE_2_PAD|KEYCODE_2PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg - sed -i 's|KEYCODE_4_PAD|KEYCODE_4PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg - sed -i 's|KEYCODE_6_PAD|KEYCODE_6PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg - sed -i 's|KEYCODE_8_PAD|KEYCODE_8PAD|' $pkgdir/usr/share/sdlmame/ctrlr/*.cfg - - find $pkgdir -type f -exec strip {} \; -} diff --git a/community/sdlmame/extras.tar.gz b/community/sdlmame/extras.tar.gz Binary files differdeleted file mode 100644 index ae0bc2a39..000000000 --- a/community/sdlmame/extras.tar.gz +++ /dev/null diff --git a/community/sdlmame/sdlmame.install b/community/sdlmame/sdlmame.install deleted file mode 100644 index 0d3fab800..000000000 --- a/community/sdlmame/sdlmame.install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() -{ - echo " SDLMAME and the additional MAME utilities have been installed" - echo " in /usr/share/sdlmame However, SDLMAME can be run by" - echo " typing sdlmame and it's options. Try running SDLMAME with" - echo " these options:" - echo " sdlmame <rom> -nowindow -noswitchres" -} diff --git a/community/sdlmame/sdlmame.sh b/community/sdlmame/sdlmame.sh deleted file mode 100644 index 336f71690..000000000 --- a/community/sdlmame/sdlmame.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh - -# Create a variable equal to $HOME that will be used later in the ini creation -home=('$HOME') - -if [ "$1" != "" ] && [ "$1" = "--newini" ]; then - echo "Rebuilding the ini file at $HOME/.mame/mame.ini" - echo "Modify this file for permanent changes to your SDLMAME" - echo "options and paths before running SDLMAME again." - cd $HOME/.mame - if [ -e mame.ini ]; then - echo "Your old ini file has been renamed to mameini.bak" - mv mame.ini mameini.bak - fi - /usr/share/sdlmame/sdlmame \ - -artpath "$home/.mame/artwork;artwork" \ - -ctrlrpath "$home/.mame/ctrlr;ctrlr" \ - -inipath $home/.mame/ini \ - -rompath $home/.mame/roms \ - -samplepath $home/.mame/samples \ - -cfg_directory $home/.mame/cfg \ - -comment_directory $home/.mame/comments \ - -diff_directory $home/.mame/diff \ - -input_directory $home/.mame/inp \ - -memcard_directory $home/.mame/memcard \ - -nvram_directory $home/.mame/nvram \ - -snapshot_directory $home/.mame/snap \ - -state_directory $home/.mame/sta \ - -video opengl \ - -createconfig -elif [ ! -e $HOME/.mame ]; then - echo "Running SDLMAME for the first time..." - echo "Creating an ini file for SDLMAME at $HOME/.mame/mame.ini" - echo "Modify this file for permanent changes to your SDLMAME" - echo "options and paths before running SDLMAME again." - mkdir $HOME/.mame - mkdir $HOME/.mame/{artwork,cfg,comments,ctrlr,diff,ini,inp,memcard,nvram,samples,snap,sta} - cd $HOME/.mame - /usr/share/sdlmame/sdlmame \ - -artpath "$home/.mame/artwork;artwork" \ - -ctrlrpath "$home/.mame/ctrlr;ctrlr" \ - -inipath $home/.mame/ini \ - -rompath $home/.mame/roms \ - -samplepath $home/.mame/samples \ - -cfg_directory $home/.mame/cfg \ - -comment_directory $home/.mame/comments \ - -diff_directory $home/.mame/diff \ - -input_directory $home/.mame/inp \ - -memcard_directory $home/.mame/memcard \ - -nvram_directory $home/.mame/nvram \ - -snapshot_directory $home/.mame/snap \ - -state_directory $home/.mame/sta \ - -video opengl \ - -createconfig -else - cd /usr/share/sdlmame - ./sdlmame "$@" -fi diff --git a/community/seahorse-nautilus/fix-schema.patch b/community/seahorse-nautilus/fix-schema.patch deleted file mode 100644 index cd68e7a7f..000000000 --- a/community/seahorse-nautilus/fix-schema.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 8f48809c0fb6633bb45eac2144c1125f79933053 Mon Sep 17 00:00:00 2001 -From: Stef Walter <stefw@gnome.org> -Date: Mon, 01 Oct 2012 08:15:13 +0000 -Subject: Fix the schema identifier for GSettings window settings - -https://bugzilla.gnome.org/show_bug.cgi?id=685124 ---- -diff --git a/data/org.gnome.seahorse.nautilus.window.gschema.xml b/data/org.gnome.seahorse.nautilus.window.gschema.xml -index 9263a25..89f49f1 100644 ---- a/data/org.gnome.seahorse.nautilus.window.gschema.xml -+++ b/data/org.gnome.seahorse.nautilus.window.gschema.xml -@@ -1,5 +1,5 @@ - <schemalist> -- <schema id="org.gnome.seahorse.window"> -+ <schema id="org.gnome.seahorse.nautilus.window"> - <key name="width" type="i"> - <default>-1</default> - <summary>Width of the window</summary> --- -cgit v0.9.0.2 diff --git a/community/seamonkey/PKGBUILD b/community/seamonkey/PKGBUILD deleted file mode 100644 index 2fbb4de62..000000000 --- a/community/seamonkey/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 80730 2012-12-01 17:20:47Z kkeen $ -# Maintainer: Kyle Keen <keenerd@gmail.com> -pkgname=seamonkey -pkgver=2.14.1 -pkgrel=1 -pkgdesc="SeaMonkey internet suite" -arch=('i686' 'x86_64') -license=('MPL') -depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite' 'startup-notification') -makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13' 'imake') -install=$pkgname.install -url="http://www.seamonkey-project.org/" -source=(ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2 - mozconfig - seamonkey.desktop - seamonkey-2.0-lang.patch) -md5sums=('19463b718446552d04130d01d25d7330' - 'dabc8f517fbff67b8599064bedd32606' - '6119a2254716752c9d08e366f8d4c048' - '25b6fe16ac24cd5c852213e5c1adb272') - -build() { - cd comm-release - cp ../mozconfig .mozconfig - patch -Np1 -i ../seamonkey-2.0-lang.patch - - export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver" - export MOZ_MAKE_FLAGS="$MAKEFLAGS" - unset MAKEFLAGS - - # Don't exit with error when some libs are missing which we have in - # system. - sed '/^MOZ_PKG_FATAL_WARNINGS/s@= 1@= 0@' \ - -i suite/installer/Makefile.in - - make -j1 -f client.mk build -} - -package() { - cd comm-release - - make -j1 -f client.mk DESTDIR="$pkgdir" install - - rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation} - ln -s /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries" - ln -s /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation" - - install -m755 -d "$pkgdir/usr/share/applications" - install -m755 -d "$pkgdir/usr/share/pixmaps" - install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \ - "$pkgdir/usr/share/pixmaps/" - install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/" - - rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc - rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl} -} diff --git a/community/seamonkey/mozconfig b/community/seamonkey/mozconfig deleted file mode 100644 index 2131e894f..000000000 --- a/community/seamonkey/mozconfig +++ /dev/null @@ -1,31 +0,0 @@ -ac_add_options --enable-application=suite - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -#ac_add_options --enable-system-cairo -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-startup-notification -ac_add_options --enable-safe-browsing -ac_add_options --enable-gio - -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-installer - -export MOZILLA_OFFICIAL=1 diff --git a/community/seamonkey/seamonkey-2.0-lang.patch b/community/seamonkey/seamonkey-2.0-lang.patch deleted file mode 100644 index b9f4a5cde..000000000 --- a/community/seamonkey/seamonkey-2.0-lang.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200 -+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200 -@@ -890,7 +890,7 @@ - pref("intl.charset.detector", "chrome://global/locale/intl.properties"); - pref("intl.charset.default", "chrome://global-platform/locale/intl.properties"); - pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties"); --pref("intl.locale.matchOS", false); -+pref("intl.locale.matchOS", true); - // fallback charset list for Unicode conversion (converting from Unicode) - // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes) - // for ISO-8859-1 diff --git a/community/seamonkey/seamonkey.desktop b/community/seamonkey/seamonkey.desktop deleted file mode 100644 index dd92a2432..000000000 --- a/community/seamonkey/seamonkey.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Exec=seamonkey %u -Icon=seamonkey -Type=Application -Terminal=false -MultipleArgs=false -Name=SeaMonkey internet suite -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto; -StartupNotify=false -Categories=Application;Network; diff --git a/community/seamonkey/seamonkey.install b/community/seamonkey/seamonkey.install deleted file mode 100644 index 709ad81f2..000000000 --- a/community/seamonkey/seamonkey.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 $1 -} - -post_remove() { - post_install $1 -} diff --git a/community/setconf/PKGBUILD b/community/setconf/PKGBUILD deleted file mode 100644 index ea12e6cd3..000000000 --- a/community/setconf/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 68685 2012-03-31 16:54:07Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> - -pkgname=setconf -pkgver=0.4 -pkgrel=1 -pkgdesc="Utility to easily change settings in Makefiles and configuration files" -arch=('x86_64' 'i686' 'mips64el') -url="http://setconf.roboticoverlords.org/" -license=('GPL') -depends=('pcre' 'gc') -makedepends=('shedskin') -source=("http://setconf.roboticoverlords.org/$pkgname-$pkgver.tbz2") -sha256sums=('dca9d6e829f3247da8cb78434dd18d96f3439fc83a32626ff83d4a5c16099d31') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - shedskin "$pkgname.py" - make CPPFLAGS="$CFLAGS" -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm644 "$pkgname.1.gz" "$pkgdir/usr/share/man/man1/$pkgname.1.gz" - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} - -# vim:set ts=2 sw=2 et: diff --git a/community/sigil/sigil.desktop b/community/sigil/sigil.desktop deleted file mode 100755 index 4f3a14d20..000000000 --- a/community/sigil/sigil.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Sigil -Comment=E-book reader and WYSIWYG editor -TryExec=sigil -Exec=sigil -Icon=sigil -Categories=Office; -Terminal=false -StartupNotify=false diff --git a/community/skype-call-recorder/PKGBUILD b/community/skype-call-recorder/PKGBUILD deleted file mode 100644 index 8dcbcb072..000000000 --- a/community/skype-call-recorder/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 55494 2011-09-13 05:27:31Z foutrelis $ -# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> -# Contributor: Tarinaky <tarinaky@hunity.co.uk> - -pkgname=skype-call-recorder -pkgver=0.8 -pkgrel=2 -pkgdesc="Open source tool that allows you to record your Skype calls on Linux" -arch=('i686' 'x86_64') -url="http://atdot.ch/scr/" -license=('GPL') -depends=('qt' 'libvorbis' 'lame' 'id3lib' 'hicolor-icon-theme') -makedepends=('cmake') -install=skype-call-recorder.install -source=(http://atdot.ch/scr/files/$pkgver/$pkgname-$pkgver.tar.gz) -sha1sums=('b8faade2d893628fd7a5deac5056d6dfaf7082c4') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - cmake -DCMAKE_INSTALL_PREFIX=/usr . -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/skype-call-recorder/skype-call-recorder.install b/community/skype-call-recorder/skype-call-recorder.install deleted file mode 100644 index e4f8fd06c..000000000 --- a/community/skype-call-recorder/skype-call-recorder.install +++ /dev/null @@ -1,13 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/snes9x/PKGBUILD b/community/snes9x/PKGBUILD deleted file mode 100644 index d7d424871..000000000 --- a/community/snes9x/PKGBUILD +++ /dev/null @@ -1,56 +0,0 @@ -# $Id: PKGBUILD 78959 2012-10-28 04:11:03Z ebelanger $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgbase=snes9x -pkgname=('snes9x' 'snes9x-gtk') -pkgver=1.53 -pkgrel=5 -arch=('i686' 'x86_64') -url="https://code.google.com/p/snes9x-gtk/" -license=('custom') -makedepends=('intltool' 'nasm' 'mesa' 'libpulse' 'libpng' 'sdl' 'gtk2' 'libxv' \ - 'desktop-file-utils' 'gnome-icon-theme') -source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2 - snes9x-gtk2.24.diff.gz) -sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2' - '680dbe0a70f1821bc7931539e72f5a1a95e3938c') - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}-src" - patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff" - cd unix - ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay - make - - cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk" - ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl - make -} - -package_snes9x() { - pkgdesc="A portable Emulator for the Super Nintendo Entertainment System" - depends=('gcc-libs' 'libpng' 'libxext' 'libsm') - - cd "${srcdir}/${pkgbase}-${pkgver}-src/unix" - install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x" - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ - "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_snes9x-gtk() { - pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version" - license=('custom' 'LGPL') - depends=('sdl' 'libgl' 'libpulse' 'gtk2' 'libxv' 'desktop-file-utils' 'gnome-icon-theme') - install=snes9x-gtk.install - - cd "${srcdir}/${pkgbase}-${pkgver}-src/gtk" - make DESTDIR="${pkgdir}" install - install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \ - "${pkgdir}/usr/share/doc/${pkgname}/" - install -D -m644 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} diff --git a/community/snes9x/snes9x-gtk.install b/community/snes9x/snes9x-gtk.install deleted file mode 100644 index 2c88492dd..000000000 --- a/community/snes9x/snes9x-gtk.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 $1 -} - -post_remove () { - post_install $1 -} diff --git a/community/snes9x/snes9x-gtk2.24.diff.gz b/community/snes9x/snes9x-gtk2.24.diff.gz Binary files differdeleted file mode 100644 index f8e86d7f2..000000000 --- a/community/snes9x/snes9x-gtk2.24.diff.gz +++ /dev/null diff --git a/community/sslh/sslh.conf b/community/sslh/sslh.conf deleted file mode 100644 index d3a46d053..000000000 --- a/community/sslh/sslh.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -DAEMON_OPTS='-F /etc/sslh.conf' diff --git a/community/sslh/sslh.rc b/community/sslh/sslh.rc deleted file mode 100644 index 456e122f4..000000000 --- a/community/sslh/sslh.rc +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -DAEMON=/usr/bin/sslh -PID=$(pidof -o %PPID $DAEMON) -DAEMON_OPTS="--background $DAEMON_OPTS" - -case "$1" in - start) - stat_busy "Starting ${0##*/} daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && 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/stk/cxxflags.patch b/community/stk/cxxflags.patch deleted file mode 100644 index bb86e929a..000000000 --- a/community/stk/cxxflags.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- stk-4.4.2/configure.ac 2010-02-04 15:52:39.000000000 -0500 -+++ configure.ac 2010-03-11 23:55:44.000000000 -0500 -@@ -51,7 +51,7 @@ - AC_ARG_ENABLE(debug, - [ --enable-debug = enable various debug output], - [AC_SUBST( cppflag, ["-D_STK_DEBUG_ -D__RTAUDIO_DEBUG__ -D__RTMIDI_DEBUG__"] ) AC_SUBST( cxxflag, ["-g"] ) AC_SUBST( object_path, [Debug] ) AC_MSG_RESULT(yes)], -- [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [-O3] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)]) -+ [AC_SUBST( cppflag, [] ) AC_SUBST( cxxflag, [] ) AC_SUBST( object_path, [Release] ) AC_MSG_RESULT(no)]) - - # Checks for functions - if test $realtime = yes; then -@@ -63,12 +63,7 @@ - CPPFLAGS="$CPPFLAGS $cppflag" - - # For debugging and optimization ... overwrite default because it has both -g and -O2 --CXXFLAGS="$cxxflag" -- --# Check compiler and use -Wall if gnu. --if [test $GXX = "yes" ;] then -- AC_SUBST( cxxflag, [-Wall] ) --fi -+CXXFLAGS="$cxxflag $CXXFLAGS" - - CXXFLAGS="$CXXFLAGS $cxxflag" - diff --git a/community/supertux/compile.patch b/community/supertux/compile.patch deleted file mode 100644 index 05376fe91..000000000 --- a/community/supertux/compile.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp ---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 21:59:27.000000000 +0100 -+++ supertux-0.3.1/src/console.hpp 2008-08-23 11:57:47.000000000 +0200 -@@ -27,6 +27,8 @@ - #include <sstream> - #include <iostream> - #include <squirrel.h> -+#include <memory> -+#include <cstdlib> - - class Console; - class ConsoleStreamBuffer; -diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 21:59:26.000000000 +0100 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2008-08-23 13:45:58.000000000 +0200 -@@ -21,6 +21,7 @@ - #include <sstream> - #include <stdexcept> - #include <iostream> -+#include <cstring> - - #include "lexer.hpp" - -diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 21:59:26.000000000 +0100 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2008-08-23 13:29:34.000000000 +0200 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include <map> -+#include <string> - - class SpriteData; - class Sprite; -diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 21:59:27.000000000 +0100 -+++ supertux-0.3.1/src/textscroller.hpp 2008-08-23 13:34:35.000000000 +0200 -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <map> -+#include <memory> - - #include "screen.hpp" - #include "math/vector.hpp" -diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp ---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 21:59:28.000000000 +0100 -+++ supertux-0.3.1/src/title.cpp 2008-08-23 12:05:19.000000000 +0200 -@@ -32,6 +32,7 @@ - #include <SDL.h> - #include <SDL_image.h> - #include <physfs.h> -+#include <algorithm> - - #include "title.hpp" - #include "mainloop.hpp" -diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 21:59:22.000000000 +0100 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2008-08-23 13:37:14.000000000 +0200 -@@ -23,6 +23,7 @@ - #include <config.h> - - #include <SDL.h> -+#include <algorithm> - - #include "texture.hpp" - #include "color.hpp" diff --git a/community/supertux/gcc44.patch b/community/supertux/gcc44.patch deleted file mode 100644 index b58d9c29d..000000000 --- a/community/supertux/gcc44.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff -ruN supertux-0.3.1.orig/src/console.hpp supertux-0.3.1/src/console.hpp ---- supertux-0.3.1.orig/src/console.hpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/console.hpp 2009-05-17 19:43:26.914307646 +0000 -@@ -27,6 +27,8 @@ - #include <sstream> - #include <iostream> - #include <squirrel.h> -+#include <memory> -+#include <cstdlib> - - class Console; - class ConsoleStreamBuffer; -diff -ruN supertux-0.3.1.orig/src/lisp/lexer.cpp supertux-0.3.1/src/lisp/lexer.cpp ---- supertux-0.3.1.orig/src/lisp/lexer.cpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/lisp/lexer.cpp 2009-05-17 19:43:27.037705317 +0000 -@@ -21,6 +21,7 @@ - #include <sstream> - #include <stdexcept> - #include <iostream> -+#include <cstring> - - #include "lexer.hpp" - -diff -ruN supertux-0.3.1.orig/src/lisp/lisp.cpp supertux-0.3.1/src/lisp/lisp.cpp ---- supertux-0.3.1.orig/src/lisp/lisp.cpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/lisp/lisp.cpp 2009-05-17 19:44:29.305165638 +0000 -@@ -18,7 +18,7 @@ - // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - #include <config.h> -- -+#include <cstdio> - #include "lisp.hpp" - - namespace lisp -diff -ruN supertux-0.3.1.orig/src/random_generator.cpp supertux-0.3.1/src/random_generator.cpp ---- supertux-0.3.1.orig/src/random_generator.cpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/random_generator.cpp 2009-05-17 19:44:05.851002254 +0000 -@@ -39,6 +39,7 @@ - #include <stdexcept> - #include <time.h> - #include <cassert> -+#include <cstdio> - #include "random_generator.hpp" - - RandomGenerator systemRandom; // global random number generator -diff -ruN supertux-0.3.1.orig/src/sprite/sprite_manager.hpp supertux-0.3.1/src/sprite/sprite_manager.hpp ---- supertux-0.3.1.orig/src/sprite/sprite_manager.hpp 2008-01-03 20:59:26.000000000 +0000 -+++ supertux-0.3.1/src/sprite/sprite_manager.hpp 2009-05-17 19:43:27.037705317 +0000 -@@ -21,6 +21,7 @@ - #define SUPERTUX_SPRITE_MANAGER_H - - #include <map> -+#include <string> - - class SpriteData; - class Sprite; -diff -ruN supertux-0.3.1.orig/src/textscroller.hpp supertux-0.3.1/src/textscroller.hpp ---- supertux-0.3.1.orig/src/textscroller.hpp 2008-01-03 20:59:27.000000000 +0000 -+++ supertux-0.3.1/src/textscroller.hpp 2009-05-17 19:43:27.037705317 +0000 -@@ -24,6 +24,7 @@ - #include <vector> - #include <string> - #include <map> -+#include <memory> - - #include "screen.hpp" - #include "math/vector.hpp" -diff -ruN supertux-0.3.1.orig/src/title.cpp supertux-0.3.1/src/title.cpp ---- supertux-0.3.1.orig/src/title.cpp 2008-01-03 20:59:28.000000000 +0000 -+++ supertux-0.3.1/src/title.cpp 2009-05-17 19:43:27.041000359 +0000 -@@ -32,6 +32,7 @@ - #include <SDL.h> - #include <SDL_image.h> - #include <physfs.h> -+#include <algorithm> - - #include "title.hpp" - #include "mainloop.hpp" -diff -ruN supertux-0.3.1.orig/src/video/sdl_texture.hpp supertux-0.3.1/src/video/sdl_texture.hpp ---- supertux-0.3.1.orig/src/video/sdl_texture.hpp 2008-01-03 20:59:22.000000000 +0000 -+++ supertux-0.3.1/src/video/sdl_texture.hpp 2009-05-17 19:43:27.041000359 +0000 -@@ -23,6 +23,7 @@ - #include <config.h> - - #include <SDL.h> -+#include <algorithm> - - #include "texture.hpp" - #include "color.hpp" diff --git a/community/surf/surf-0.4.1-link-xlib.patch b/community/surf/surf-0.4.1-link-xlib.patch deleted file mode 100644 index 25949d744..000000000 --- a/community/surf/surf-0.4.1-link-xlib.patch +++ /dev/null @@ -1,28 +0,0 @@ - -diff -r 71388899ac09 -r 2ea243e2ca82 config.mk ---- a/config.mk Tue Jun 08 09:06:10 2010 +0200 -+++ b/config.mk Sun Nov 20 16:06:38 2011 +0100 -@@ -7,13 +7,15 @@ - PREFIX = /usr/local - MANPREFIX = ${PREFIX}/share/man - --GTKINC=$(shell pkg-config --cflags gtk+-2.0 webkit-1.0) --GTKLIB=$(shell pkg-config --libs gtk+-2.0 webkit-1.0) -+X11INC = /usr/X11R6/include -+X11LIB = /usr/X11R6/lib - -+GTKINC = `pkg-config --cflags gtk+-2.0 webkit-1.0` -+GTKLIB = `pkg-config --libs gtk+-2.0 webkit-1.0` - - # includes and libs --INCS = -I. -I/usr/include ${GTKINC} --LIBS = -L/usr/lib -lc ${GTKLIB} -lgthread-2.0 -+INCS = -I. -I/usr/include -I${X11INC} ${GTKINC} -+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${GTKLIB} -lgthread-2.0 - - # flags - CPPFLAGS = -DVERSION=\"${VERSION}\" - - - - diff --git a/community/tagpy/PKGBUILD b/community/tagpy/PKGBUILD deleted file mode 100644 index 1aa4990ef..000000000 --- a/community/tagpy/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 74013 2012-07-18 01:09:17Z ibiru $ -# Maintainer: Andrea Scarpino <andrea@archlinux.org> -# Contributor: Callan Barrett <wizzomafizzo@gmail.com> -# Contributor: Scott Horowitz <stonecrest@gmail.com> - -pkgname=tagpy -pkgver=0.94.8 -pkgrel=8 -pkgdesc="Python bindings for TagLib" -arch=('i686' 'x86_64' 'mips64el') -url="http://pypi.python.org/pypi/tagpy" -license=('MIT') -depends=('python2' 'taglib' 'boost-libs') -makedepends=('python2-distribute' 'boost') -source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('6baff63318cf90b9bc5a2497a0597802') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ - $(find . -name '*.py') - - ./configure.py --taglib-lib-dir=/usr/lib/ \ - --taglib-inc-dir=/usr/include/taglib/ \ - --boost-inc-dir=/usr/include/boost/ \ - --boost-lib-dir=/usr/lib/ \ - --boost-python-libname=boost_python - python2 setup.py build -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - python2 setup.py install --root="${pkgdir}" --optimize=1 - install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/tarsnap/PKGBUILD b/community/tarsnap/PKGBUILD deleted file mode 100644 index a5186baa7..000000000 --- a/community/tarsnap/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 75035 2012-08-12 08:25:53Z jelle $ -# Maintainer: Jelle van der Waa <jelle@vdwaa.nl> - -pkgname=tarsnap -pkgver=1.0.33 -pkgrel=1 -pkgdesc='An online encrypted snapshotted backup service' -arch=('i686' 'x86_64') -url='http://www.tarsnap.com/' -license=('custom') -depends=('bzip2' 'openssl' 'xz>=5.0.0') -makedepends=('e2fsprogs') -source=("https://www.tarsnap.com/download/$pkgname-autoconf-$pkgver.tgz") -md5sums=('a6267972d834198716b9fe09680e47e2') -sha256sums=('0c0d825a8c9695fc8d44c5d8c3cd17299c248377c9c7b91fdb49d73e54ae0b7d') - -build() { - cd "$srcdir/$pkgname-autoconf-$pkgver" - - ./configure --prefix=/usr --sysconfdir="/etc/$pkgname" - make -} - -package() { - cd "$srcdir/$pkgname-autoconf-$pkgver" - - make DESTDIR="$pkgdir" install - install -D -m644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" -} diff --git a/community/terminator/PKGBUILD b/community/terminator/PKGBUILD deleted file mode 100644 index 817bf2368..000000000 --- a/community/terminator/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 55930 2011-09-25 18:21:36Z guillaume $ -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: fancris3 <fancris3 at gmail.com> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=terminator -pkgver=0.96 -pkgrel=1 -pkgdesc='an application that provides lots of terminals in a single window' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.tenshu.net/terminator/' -license=('GPL2') -depends=('vte' 'pygtk' 'xdg-utils') -makedepends=('desktop-file-utils' 'gettext' 'intltool') -install=terminator.install -source=("https://launchpad.net/terminator/trunk/${pkgver}/+download/${pkgname}_${pkgver}.tar.gz") -md5sums=('070e3878336b341c9e18339d89ba64fe') - -build() { - cd ${pkgname}-${pkgver} - - # python2 fix - for file in terminatorlib/{,plugins/}*.py; 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 build -} - -package() { - cd ${pkgname}-${pkgver} - - python2 setup.py install --skip-build --root=${pkgdir} - - rm -f ${pkgdir}/usr/share/applications/${pkgname}.desktop - rm -f ${pkgdir}/usr/share/icons/hicolor/icon-theme.cache - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/data/${pkgname}.desktop.in ${pkgdir}/usr/share/applications/${pkgname}.desktop - sed -i 's|_||' ${pkgdir}/usr/share/applications/${pkgname}.desktop -} diff --git a/community/terminator/terminator.install b/community/terminator/terminator.install deleted file mode 100644 index b4ee8556f..000000000 --- a/community/terminator/terminator.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - diff --git a/community/torcs/torcs-gcc.patch b/community/torcs/torcs-gcc.patch deleted file mode 100644 index fcc5604e7..000000000 --- a/community/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/tp_smapi-lts/PKGBUILD b/community/tp_smapi-lts/PKGBUILD deleted file mode 100644 index 1d74c5df3..000000000 --- a/community/tp_smapi-lts/PKGBUILD +++ /dev/null @@ -1,56 +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-lts -_pkgname=tp_smapi -_extramodules=/usr/lib/modules/extramodules-3.0-lts -pkgver=0.41 -pkgrel=9 -pkgdesc="linux-lts modules for ThinkPad's SMAPI functionality" -arch=('i686' 'x86_64') -url='https://github.com/evgeni/tp_smapi' -license=('GPL') -depends=('linux-lts>=3.0' 'linux-lts<3.1') -makedepends=('linux-lts-headers>=3.0' 'linux-lts-headers<3.1') -install="${pkgname}.install" -source=("https://github.com/downloads/evgeni/${_pkgname}/${_pkgname}-${pkgver}.tar.gz") -md5sums=('63c683415c764568f6bf17c7eabe4752') - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - - _kernver=$(< "${_extramodules}/version") - - sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \ - -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile - - make HDAPS=1 -} - -package() { - _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/tp_smapi-lts/tp_smapi-lts.install b/community/tp_smapi-lts/tp_smapi-lts.install deleted file mode 100644 index 4d671007d..000000000 --- a/community/tp_smapi-lts/tp_smapi-lts.install +++ /dev/null @@ -1,13 +0,0 @@ -extramodules=/usr/lib/modules/extramodules-3.0-lts - -post_install() { - depmod -v $(< "$extramodules/version") &>/dev/null -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/ubuntuone-client-gnome/fix-build.patch b/community/ubuntuone-client-gnome/fix-build.patch deleted file mode 100644 index 237ba323e..000000000 --- a/community/ubuntuone-client-gnome/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c ubuntuone-client-gnome-3.0.0/nautilus/utils.c ---- ubuntuone-client-gnome-3.0.0.orig/nautilus/utils.c 2012-02-22 16:40:56.000000000 +0100 -+++ ubuntuone-client-gnome-3.0.0/nautilus/utils.c 2012-05-13 22:26:35.267409857 +0200 -@@ -26,8 +26,7 @@ - #include <limits.h> - #include <stdlib.h> - #include <glib/gi18n.h> --#include <glib/gutils.h> --#include <glib/gfileutils.h> -+#include <glib.h> - #include <libnautilus-extension/nautilus-file-info.h> - #include <libsyncdaemon/libsyncdaemon.h> - #include "ubuntuone-nautilus.h" diff --git a/community/ucarp/ucarp.conf b/community/ucarp/ucarp.conf deleted file mode 100644 index 1fb8eae07..000000000 --- a/community/ucarp/ucarp.conf +++ /dev/null @@ -1,3 +0,0 @@ -# vim:set ts=2 sw=2 ft=sh noet: - -DAEMON_OPTS='--interface=eth0 --srcip=10.1.1.1 --vhid=1 --pass=mypassword --addr=10.1.1.252 --upscript=/usr/local/sbin/vip-up.sh --downscript=/usr/local/sbin/vip-down.sh' diff --git a/community/ucarp/ucarp.rc b/community/ucarp/ucarp.rc deleted file mode 100644 index f8c9d54f3..000000000 --- a/community/ucarp/ucarp.rc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -NAME=ucarp -DAEMON=/usr/sbin/ucarp -PID=$(pidof -o %PPID $DAEMON) -DAEMON_OPTS="--daemonize $DAEMON_OPTS" - -case "$1" in - start) - stat_busy "Starting $NAME daemon" - [[ ! $PID ]] && $DAEMON $DAEMON_OPTS && add_daemon $NAME && stat_done && exit 0 - stat_fail - ;; - stop) - stat_busy "Stopping $NAME daemon" - [[ $PID ]] && kill $PID &> /dev/null && rm_daemon $NAME && 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 noet: diff --git a/community/udunits/PKGBUILD b/community/udunits/PKGBUILD deleted file mode 100644 index edf46032f..000000000 --- a/community/udunits/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 66543 2012-02-26 00:22:29Z lfleischer $ -# Maintainer: Kaiting Chen <kaitocracy@gmail.com> -# Contributor: Anton Bazhenov <anton.bazhenov at gmail> - -pkgname=udunits -pkgver=2.1.24 -pkgrel=1 -pkgdesc='A tool for calculations of physical quantities' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.unidata.ucar.edu/software/udunits/' -license=('custom') -options=('!libtool') -depends=('glibc' 'expat') -provides=('udunits2') -install=udunits.install -source=("ftp://ftp.unidata.ucar.edu/pub/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('6986545721747a51285c765644dcd9d8') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # stupid workaround for broken make install - install -dm755 "$pkgdir/usr/share/doc/$pkgname" - - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --disable-static - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - for x in so so.0 so.0.1.0; do - ln -s "libudunits2.$x" "$pkgdir/usr/lib/libudunits.$x" - done - - install -Dm0644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/community/udunits/udunits.install b/community/udunits/udunits.install deleted file mode 100644 index 1a2fbfd7b..000000000 --- a/community/udunits/udunits.install +++ /dev/null @@ -1,26 +0,0 @@ -INFO_DIR=/usr/share/info - -INFO_FILES=(udunits2.info udunits2lib.info udunits2prog.info) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${INFO_FILES[@]}; do install-info \ - $INFO_DIR/$file.gz $INFO_DIR/dir 2> /dev/null - done -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${INFO_FILES[@]}; do - install-info --delete \ - $INFO_DIR/$file.gz $INFO_DIR/dir 2> /dev/null - done -} - -op=$1 -shift -$op $* diff --git a/community/ufoai/PKGBUILD b/community/ufoai/PKGBUILD deleted file mode 100644 index 670deb600..000000000 --- a/community/ufoai/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# $Id: PKGBUILD 70141 2012-04-30 15:53:06Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> -pkgname=ufoai -pkgver=2.4 -pkgrel=2 -pkgdesc="In UFO: Alien Invasion you fight aliens trying to capture Earth" -arch=('i686' 'x86_64') -url="http://ufoai.ninex.info/" -license=('GPL') -depends=('libjpeg' 'libgl' 'libpng' 'curl' 'sdl_image' 'sdl_mixer' 'sdl_ttf' 'xvidcore' 'ufoai-data') -makedepends=('mesa') -source=(http://downloads.sourceforge.net/project/ufoai/UFO_AI%202.x/$pkgver/ufoai-$pkgver-source.tar.bz2) -md5sums=('d7e88aee0ea94149c8b9d90eb6c21ba9') - -build() { - cd "$srcdir"/$pkgname-$pkgver-source - - ./configure --prefix=/usr --datadir=/usr/share/ufoai --enable-release --localedir=/usr/share/ufoai/base/i18n/ - make - make lang -} - -package() { - cd "$srcdir"/$pkgname-$pkgver-source - - install -Dm755 ufo "$pkgdir"/usr/bin/ufo - install -Dm755 ufoded "$pkgdir"/usr/bin/ufoded - install -Dm755 ufo2map "$pkgdir"/usr/bin/ufo2map - install -Dm755 ufomodel "$pkgdir"/usr/bin/ufomodel - - mkdir -p "$pkgdir"/usr/share/ufoai - cp -r base "$pkgdir"/usr/share/ufoai/ - - install -Dm644 debian/ufoai.desktop "$pkgdir"/usr/share/applications/ufoai.desktop - install -Dm644 debian/ufoai-safe.desktop "$pkgdir"/usr/share/applications/ufoai-safe.desktop - install -Dm644 debian/ufoded.desktop "$pkgdir"/usr/share/applications/ufoded.desktop - - sed -i 's|/usr/games/||' "$pkgdir"/usr/share/applications/* - - install -Dm644 debian/ufoai.xpm "$pkgdir"/usr/share/pixmaps/ufoai.xpm - install -Dm644 debian/ufoded.xpm "$pkgdir"/usr/share/pixmaps/ufoded.xpm -} - -# vim: sw=2:ts=2 et: diff --git a/community/ufoai/ufo-ai-2.3.1-libpng15.patch b/community/ufoai/ufo-ai-2.3.1-libpng15.patch deleted file mode 100644 index 2099f7ab7..000000000 --- a/community/ufoai/ufo-ai-2.3.1-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- src/shared/images.c.old 2011-04-02 19:31:52.000000000 +0200 -+++ src/shared/images.c 2011-04-02 19:32:13.000000000 +0200 -@@ -32,6 +32,7 @@ - - #include <jpeglib.h> - #include <png.h> -+#include <zlib.h> - - /** image formats, tried in this order */ - static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL }; diff --git a/community/ulogd/logrotate b/community/ulogd/logrotate deleted file mode 100644 index 312c71acb..000000000 --- a/community/ulogd/logrotate +++ /dev/null @@ -1,10 +0,0 @@ -/var/log/ulogd.log /var/log/ulogd.syslogemu { - missingok - notifempty - sharedscripts - create 0640 root root - - postrotate - [ -e /var/run/ulogd.pid ] && /etc/rc.d/ulogd restart > /dev/null - endscript -} diff --git a/community/ulogd/mac-addr.patch b/community/ulogd/mac-addr.patch deleted file mode 100644 index 87a76a22b..000000000 --- a/community/ulogd/mac-addr.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- ulogd_BASE.c-save 2007-08-06 11:23:53.000000000 +0200 -+++ ulogd_BASE.c 2007-08-06 11:28:47.000000000 +0200 -@@ -63,7 +63,7 @@ static ulog_iret_t *_interp_raw(ulog_int - { - unsigned char *p; - int i; -- char *buf, *oldbuf = NULL; -+ char *buf = NULL; - ulog_iret_t *ret = ip->result; - - if (pkt->mac_len) { -@@ -75,9 +75,8 @@ static ulog_iret_t *_interp_raw(ulog_int - *buf = '\0'; - - p = pkt->mac; -- oldbuf = buf; - for (i = 0; i < pkt->mac_len; i++, p++) -- sprintf(buf, "%s%02x%c", oldbuf, *p, i==pkt->mac_len-1 ? ' ':':'); -+ sprintf(buf + (i*3), "%02x%c", *p, i==pkt->mac_len-1 ? ' ':':'); - ret[0].value.ptr = buf; - ret[0].flags |= ULOGD_RETF_VALID; - } diff --git a/community/ulogd/rc b/community/ulogd/rc deleted file mode 100644 index 83f0550cc..000000000 --- a/community/ulogd/rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/sbin/ulogd -} - -case "$1" in - start) - stat_busy "Starting ulogd daemon" - - [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid - PID=`get_pid` - if [ -z "$PID" ]; then - /usr/sbin/ulogd -d &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/ulogd.pid - add_daemon ulogd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ulog daemon" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ulogd.pid &> /dev/null - rm_daemon ulogd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/ulogd/ulogd.conf.min b/community/ulogd/ulogd.conf.min deleted file mode 100644 index 822575613..000000000 --- a/community/ulogd/ulogd.conf.min +++ /dev/null @@ -1,20 +0,0 @@ -[global] -nlgroup=1 -logfile="/var/log/ulogd.log" -loglevel=5 -rmem=131071 -bufsize=150000 - -plugin="/usr/lib/ulogd/ulogd_inppkt_ULOG.so" -plugin="/usr/lib/ulogd/ulogd_raw2packet_BASE.so" -plugin="/usr/lib/ulogd/ulogd_filter_IP2STR.so" -plugin="/usr/lib/ulogd/ulogd_filter_PRINTPKT.so" -plugin="/usr/lib/ulogd/ulogd_output_LOGEMU.so" - -stack=ulog1:ULOG,base1:BASE,ip2str1:IP2STR,print1:PRINTPKT,emu1:LOGEMU - -[ulog1] -nlgroup=1 - -[emu1] -file=/var/log/ulogd.syslogemu diff --git a/community/ulogd/ulogd.rc b/community/ulogd/ulogd.rc deleted file mode 100644 index 83f0550cc..000000000 --- a/community/ulogd/ulogd.rc +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -get_pid() { - pidof /usr/sbin/ulogd -} - -case "$1" in - start) - stat_busy "Starting ulogd daemon" - - [ -f /var/run/ulog.pid ] && rm -f /var/run/ulog.pid - PID=`get_pid` - if [ -z "$PID" ]; then - /usr/sbin/ulogd -d &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - echo `get_pid` > /var/run/ulogd.pid - add_daemon ulogd - stat_done - fi - else - stat_fail - exit 1 - fi - ;; - - stop) - stat_busy "Stopping ulog daemon" - PID=`get_pid` - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - exit 1 - else - rm -f /var/run/ulogd.pid &> /dev/null - rm_daemon ulogd - stat_done - fi - ;; - - restart) - $0 stop - sleep 3 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community/unace/01-makefiles.dpatch b/community/unace/01-makefiles.dpatch deleted file mode 100644 index 798c226e0..000000000 --- a/community/unace/01-makefiles.dpatch +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/sh /usr/share/dpatch/dpatch-run -## 01-makefiles.dpatch by Fabian Greffrath <fabian@debian-unofficial.org> -## -## DP: Fix upstream makefiles - -@DPATCH@ - -diff -Nru unace-nonfree-2.5.orig/base.mk unace-nonfree-2.5/base.mk ---- unace-nonfree-2.5.orig/base.mk 2003-11-27 20:16:20.000000000 +0100 -+++ unace-nonfree-2.5/base.mk 2006-01-31 09:33:04.000000000 +0100 -@@ -427,9 +427,7 @@ - ############################################################################## - - ifndef ISWMAKE
--include $(MAKE_DIR)baseace.mk
- include $(MAKE_DIR)baseuace.mk
- else
--!include $(MAKE_DIR)baseace.mk
- !include $(MAKE_DIR)baseuace.mk
- endif
-diff -Nru unace-nonfree-2.5.orig/makefile unace-nonfree-2.5/makefile ---- unace-nonfree-2.5.orig/makefile 2003-11-24 00:24:24.000000000 +0100 -+++ unace-nonfree-2.5/makefile 2006-01-31 09:40:17.000000000 +0100 -@@ -18,6 +18,6 @@ - INCLDIR = //usr/include
-
--DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -D__HAS_IO_H__
-+DEFINES = -D__LINUX__ -D__unix__ -D__GCC__ -U__HAS_IO_H__
-
- ifdef DEBUG
- LSWITCHES =
-@@ -47,7 +47,7 @@ - $(APPS_UNACEEXE_CFILES)
-
- unace: $(UNACEEXELIN_CFILES)
-- gcc $(LSWITCHES) -Wl,-lncurses -static -I$(INCLDIR) -I$(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace -+ gcc $(LSWITCHES) -Wl,-lncurses -I$(INCLDIR) -idirafter $(INCLSYSDIR) -I$(SRCSsl) $(DEFINES) $(UNACEEXELIN_CFILES) -ggdb -o$(EXECS_DIR)unace - ifndef DEBUG
- tar cfvz linunace25.tgz unace file_id.diz licence - #sh linpack.sh
-diff -Nru unace-nonfree-2.5.orig/unace.mk unace-nonfree-2.5/unace.mk ---- unace-nonfree-2.5.orig/unace.mk 2003-11-27 20:17:46.000000000 +0100 -+++ unace-nonfree-2.5/unace.mk 2006-01-31 09:33:21.000000000 +0100 -@@ -27,8 +27,6 @@ -
- ifndef ISWMAKE
- include $(MAKE_DIR)unaceexe.mk
--include $(MAKE_DIR)unacedll.mk
- else
- !include $(MAKE_DIR)unaceexe.mk
--!include $(MAKE_DIR)unacedll.mk
- endif
diff --git a/community/unace/04-64bit.dpatch b/community/unace/04-64bit.dpatch deleted file mode 100644 index 7aad590be..000000000 --- a/community/unace/04-64bit.dpatch +++ /dev/null @@ -1,119 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 04-64bit.dpatch by Michael Karcher -## <debian@mkarcher.dialup.fu-berlin.de> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Replace declare.h by a generic stdint based version. - -@DPATCH@ -diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h ---- unace-nonfree-2.5~/source/base/all/declare.h 2007-11-06 00:11:47.000000000 +0100 -+++ unace-nonfree-2.5/source/base/all/declare.h 2007-11-06 00:13:18.498574104 +0100 -@@ -7,76 +7,47 @@ - #ifndef _DECLARE_H_INCLUDED
- #define _DECLARE_H_INCLUDED
-
--#if !defined(__OS2__) && !defined(_WINDOWS_)
-- typedef int BOOL;
--
-- typedef char CHAR;
-- typedef unsigned char UCHAR;
-- typedef UCHAR *PUCHAR;
-- typedef char *PSZ;
--
-- typedef short SHORT;
-- typedef unsigned short USHORT;
-- typedef USHORT *PUSHORT;
--
-- typedef long LONG;
-- typedef unsigned long ULONG;
--
-- typedef ULONG *PULONG;
--
-- typedef int INT;
-- typedef unsigned int UINT;
-- typedef unsigned int *PUINT;
-+#include <stdint.h>
-
-- typedef CHAR *LPSTR;
--#endif
-+typedef int BOOL;
-+typedef BOOL *PBOOL;
-
--#if __WATCOMC__==1060
-- typedef long __int64[2];
-- typedef __int64 LONGLONG;
-- typedef LONGLONG *PLONGLONG;
-- typedef __int64 ULONGLONG;
-- typedef ULONGLONG DWORDLONG;
--#else
-- #if !defined(_WINDOWS_)
-- #if !defined(__WATCOMC__) && !defined(__int64)
-- #define __int64 long long
-- #endif
-+typedef char CHAR;
-+typedef CHAR *PCHAR;
-+typedef unsigned char UCHAR;
-+typedef UCHAR *PUCHAR;
-+typedef signed char SCHAR;
-+typedef CHAR *PSZ;
-+typedef CHAR *LPSTR;
-
-- typedef __int64 LONGLONG;
-- typedef LONGLONG *PLONGLONG;
-- typedef unsigned __int64 ULONGLONG;
-- typedef ULONGLONG DWORDLONG;
-- #endif
--#endif
-+typedef int INT;
-+typedef INT *PINT;
-+typedef unsigned int UINT;
-+typedef unsigned int *PUINT;
-
-+typedef int16_t SHORT;
-+typedef SHORT *PSHORT;
-+typedef uint16_t USHORT;
-+typedef USHORT *PUSHORT;
-
--#if !defined(_WINDOWS_)
-- typedef BOOL *PBOOL;
-- typedef INT *PINT;
--#endif
-+typedef int32_t LONG;
-+typedef LONG *PLONG;
-+typedef uint32_t ULONG;
-+typedef ULONG *PULONG;
-
--#if !defined(__wtypes_h__)
-- typedef void *PVOID;
-- typedef CHAR *PCHAR;
-- typedef SHORT *PSHORT;
-- typedef LONG *PLONG;
-- typedef ULONGLONG *PULONGLONG;
--#endif
-+typedef int64_t LONGLONG;
-+typedef LONGLONG *PLONGLONG;
-+typedef uint64_t ULONGLONG;
-+typedef ULONGLONG *PULONGLONG;
-
--#if defined(_GNU_H_WINDOWS32_BASE)
-- typedef LONGLONG ULONGLONG;
-- typedef ULONGLONG *PULONGLONG;
--#endif
-+typedef void *PVOID;
-
--typedef signed char SCHAR;
-+/* Dear ACE team, please clean your code to remove the following types */
-+typedef LONGLONG __int64;
-+typedef ULONGLONG DWORDLONG;
-
- #ifndef NULL
-- #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__)
-- #define NULL 0
-- #else
-- #define NULL 0L
-- #endif
-+#include <stdlib.h>
- #endif
-
-
diff --git a/community/unace/ChangeLog b/community/unace/ChangeLog deleted file mode 100644 index 41533eb7b..000000000 --- a/community/unace/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2008-04-04 Eric Belanger <eric@archlinux.org> - - * unace-2.5-5.1 - * fixed seg faults on x86_64 - -2007-05-28 Alessio 'mOLOk' Bolognino <themolok@gmail.com> - * unace-2.5-5 - moved in [community] - now it's built from source (from debian) diff --git a/community/unace/PKGBUILD b/community/unace/PKGBUILD deleted file mode 100644 index 8a5c338f3..000000000 --- a/community/unace/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# $Id: PKGBUILD 67507 2012-03-12 21:46:37Z lcarlier $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: lowercase - -pkgname=unace -pkgver=2.5 -pkgrel=7 -pkgdesc="An extraction tool for the proprietary ace archive format" -arch=('i686' 'x86_64') -url="http://www.winace.com/" -license=("custom") -depends=(ncurses) -install=unace.install -source=(http://ftp.debian.org/debian/pool/non-free/u/unace-nonfree/unace-nonfree_2.5.orig.tar.gz \ - 01-makefiles.dpatch 04-64bit.dpatch) -md5sums=('59013e74e5ac2ee15c1e92026ec1e3cc' '6a1498f24d6430723acf556e0d1cc72b'\ - 'c46de484cf5dc0e04c342062139a8aaf') -sha1sums=('f658f03aa6f663c1a90af85e3e8c6e7ef12adb42' - '83b2b84223072b6f456d7255c80bec4e01572be0' - 'cccd98f1b99218ec69f27425b56b44d23c75eb1e') - -build() { - cd ${srcdir}/unace-$pkgver - - patch -p1 < ../01-makefiles.dpatch - [ "$CARCH" = "x86_64" ] && (patch -p1 < ../04-64bit.dpatch) - make -} - -package() { - cd ${srcdir}/unace-$pkgver - - install -D -m755 unace ${pkgdir}/usr/bin/unace - install -D -m644 licence ${pkgdir}/usr/share/licenses/unace/license -} diff --git a/community/unace/unace.install b/community/unace/unace.install deleted file mode 100644 index 68408ad40..000000000 --- a/community/unace/unace.install +++ /dev/null @@ -1,14 +0,0 @@ -# arg 1: the new package version -post_install() { - -cat << EOM - -==> unace post-install message: -==> to use this software, you have to accept the Public UnAce Licence, -==> ( it's in /usr/share/licenses/unace/license ) -==> otherwise, remove this package! - -EOM - -} - diff --git a/community/unarj/LICENSE b/community/unarj/LICENSE deleted file mode 100644 index 944334a7a..000000000 --- a/community/unarj/LICENSE +++ /dev/null @@ -1,86 +0,0 @@ - * Copyright (c) 1991-2000 by ARJ Software, Inc. All rights reserved. - * - * This code may be freely used in programs that are NOT ARJ archivers - * (both compress and extract ARJ archives). - * - * If you wish to distribute a modified version of this program, you - * MUST indicate that it is a modified version both in the program and - * source code. - * - * We are holding the copyright on the source code, so please do not - * delete our name from the program files or from the documentation. - * - * We wish to give credit to Haruhiko Okumura for providing the - * basic ideas for ARJ and UNARJ in his program AR. Please note - * that UNARJ is significantly different from AR from an archive - * structural point of view. - * - - - - UNARJ LICENSE POLICY FOR ALL USERS: - - The UNARJ program, source code, and the associated documentation - are copyright (c) 1990-2000 ARJ Software, Inc. all rights reserved. - - If you distribute this software to others, you are required to - distribute the ENTIRE package consisting of the following files: - - README.DOC - UNARJ.EXE - UNARJ.DOC - UNARJ.C - DECODE.C - ENVIRON.C - UNARJ.H - UNARJ.DEF - TCCUNARJ.MAK - BCCUNARJ.MAK - BCC32.MAK - QCLUNARJ.MAK - OS2UNARJ.MAK - TECHNOTE.DOC - - We strongly prefer that the files be distributed in the format - originally released: UNARJ243.EXE with the ARJ-SECURITY envelope as - created by the author. If you must distribute the UNARJ archive in - another archive format, please archive the UNARJ243.EXE as one file - inside the other archive. Re-archival of the software as separate - files means losing the ARJ security envelope. - - You may freely use the UNARJ C source code. If you wish to - distribute a modified version of UNARJ.EXE, you MUST indicate that it - is a modified version both in the program and source code. - - We are holding the copyright on the source code, so please do not - delete our name from the program files or the documentation. - - The UNARJ.EXE program is built from this source using Borland C++ 3.1. - - You may freely use, copy, and distribute UNARJ.EXE, provided that no - fee is charged for such use, copying or distribution. - - You may use UNARJ.EXE in a commercial software package provided that - no additional fee is charged for using UNARJ.EXE and provided that - the user fully understands that NO warranty or support is provided - for UNARJ.EXE by ARJ Software. Moreover, the user must fully - understand that UNARJ does not have the long usage history that ARJ - does. - - This source code is intended to promote the building of utilities to - support the use of ARJ and ARJ archives. - - DISCLAIMER: - - This software UNARJ is provided on an "as is" basis without warranty - of any kind, expressed or implied, including but not limited to the - implied warranties of merchantability and fitness for a particular - purpose. The person using the software bears all risk as to the - quality and performance of the software. Should the software prove - defective, the user assumes the entire cost of all necessary repair, - servicing, or correction. ARJ Software, Inc. will not be liable - for any special, incidental, consequential, indirect or similar - damages due to loss of data or any other reason, even if ARJ - Software, Inc. or its agents have been advised of the possibility - of such damages. - diff --git a/community/unarj/PKGBUILD b/community/unarj/PKGBUILD deleted file mode 100644 index e0baa00e3..000000000 --- a/community/unarj/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 55533 2011-09-14 07:44:04Z andrea $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.co> -# Contributor: dale <dale@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> - -pkgname=unarj -pkgver=2.63a -pkgrel=3 -pkgdesc="An utility to extract, test and view the contents of archives created with the ARJ archiver" -arch=('i686' 'x86_64') -url="http://www.ibiblio.org/pub/Linux/utils/compress/" -license=('custom') -depends=('glibc') -source=("http://ibiblio.org/pub/Linux/utils/compress/$pkgname-$pkgver.tar.gz" - 'LICENSE') -md5sums=('a83d139c245f911f22cb1b611ec9768f' - 'c2467ee8c1cb61d843bc2c16cc5e2a2d') - -build() { - cd "${srcdir}"/$pkgname-$pkgver - make -} - -package() { - cd "${srcdir}"/$pkgname-$pkgver - install -D -m755 unarj $pkgdir/usr/bin/unarj - install -D -m644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE -} diff --git a/community/unetbootin/PKGBUILD b/community/unetbootin/PKGBUILD deleted file mode 100644 index 6f068c62d..000000000 --- a/community/unetbootin/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 75751 2012-08-30 19:02:00Z arodseth $ -# Maintainer: Alexander Rødseth <rodseth@gmail.com> -# Contributor: Det <nimetonmaili at gmail a-dot com> -# Contributor: Godane aka Christopher Rogers <slaxemulator@gmail.com> - -pkgname=unetbootin -pkgver=581 -pkgrel=1 -arch=('x86_64' 'i686') -license=('GPL') -pkgdesc="Create bootable Live USB drives" -url="http://unetbootin.sourceforge.net/" -depends=('syslinux' 'p7zip' 'qt' 'mtools' 'xorg-xmessage' 'desktop-file-utils' 'gtk-update-icon-cache') -optdepends=('gksu: GUI authentication' - 'kdebase-runtime: GUI authentication') -install=$pkgname.install -source=("http://downloads.sourceforge.net/project/$pkgname/UNetbootin/$pkgver/$pkgname-source-$pkgver.tar.gz" - "$pkgname.sh") -sha256sums=('b8bf5972653c023c159358f0e4c743dfaf1c6c27f28fd15cd97739d08c751509' - 'c35329011559288b964cc4c927c969fe35cb8cb3f88020583affe359fc72de10') - -build() { - cd "$srcdir" - - lupdate "$pkgname.pro" - lrelease "$pkgname.pro" - qmake - make -} - -package() { - cd "$srcdir" - - install -Dm755 "$pkgname.sh" "$pkgdir/usr/bin/$pkgname" - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname.elf" - mkdir -p "$pkgdir/usr/share/$pkgname" - install -m644 "$pkgname"_*.qm "$pkgdir/usr/share/$pkgname/" - install -Dm644 "$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - for i in 16 22 24 32 48 256; do - install -D "${pkgname}_${i}.png" \ - "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png" - done -} - -# vim:set ts=2 sw=2 et: diff --git a/community/unetbootin/unetbootin.install b/community/unetbootin/unetbootin.install deleted file mode 100644 index f95667aa4..000000000 --- a/community/unetbootin/unetbootin.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/unetbootin/unetbootin.sh b/community/unetbootin/unetbootin.sh deleted file mode 100644 index a6c8969b6..000000000 --- a/community/unetbootin/unetbootin.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# wrapper script for starting unetbootin with root permissions -ELF=/usr/bin/unetbootin.elf -if [ -e /usr/bin/pkexec ]; then - pkexec $ELF && exit 0 -fi -if [ -z "$KDE_FULL_SESSION" ]; then - if [ -e /usr/bin/gksudo ]; then - gksudo $ELF && exit 0 - fi - if [ -e /usr/bin/gksu ]; then - gksu $ELF && exit 0 - fi - echo "Could not use pkexec, gksudo or gksu" - $ELF && exit 0 || exit 1 -fi -if [ -e /usr/bin/kdesudo ]; then - kdesudo $ELF && exit 0 -fi -if [ -e /usr/bin/kdesu ]; then - kdesu $ELF && exit 0 -fi -echo "Could not use kdesudo or kdesu" -$ELF && exit 0 || exit 1 diff --git a/community/uptimed/uptimed b/community/uptimed/uptimed deleted file mode 100755 index 6fe9ec3e3..000000000 --- a/community/uptimed/uptimed +++ /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/urbanterror/PKGBUILD b/community/urbanterror/PKGBUILD deleted file mode 100644 index 598a1b5ba..000000000 --- a/community/urbanterror/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# $Id: PKGBUILD 81627 2012-12-25 03:43:56Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: grimi <grimi at poczta dot fm> - -pkgname=urbanterror -pkgver=4.2.009 -pkgrel=1 -epoch=2 -pkgdesc="A team-based tactical shooter based on the Quake 3 Engine" -arch=('i686' 'x86_64') -url="http://www.urbanterror.net" -license=('GPL2') -depends=('sdl' 'openal' 'curl' 'urbanterror-data') -makedepends=('mesa') -source=("http://download.urbanterror.info/urt/42/zips/UrbanTerror42_full_009.zip" - "urbanterror.sh" - "urbanterror-server.sh" - "urbanterror.desktop" - "urbanterror.png") -md5sums=('434d4b10713d8efa09d8c36a2b254929' - '7812ece92ab71986ef038b3291adc412' - 'fbd3059497cf68769c0cbf02545c6bec' - '08a99f4d7ad63024bc886e118ddcbc0f' - 'f9a57d898df73f43c6a85c8d8cc455ba') - -package() { - install -d $pkgdir/opt/urbanterror - - cd $pkgdir/opt/urbanterror - - # Copy binaries. - [[ $CARCH == "i686" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT.i386 urbanterror - [[ $CARCH == "i686" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT-Ded.i386 urbanterror-ded - [[ $CARCH == "x86_64" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT.x86_64 urbanterror - [[ $CARCH == "x86_64" ]] && install -m755 $srcdir/UrbanTerror42/Quake3-UrT-Ded.x86_64 urbanterror-ded - - # Copy desktop launcher. - install -Dm644 $srcdir/urbanterror.desktop $pkgdir/usr/share/applications/urbanterror.desktop - install -Dm644 $srcdir/urbanterror.png $pkgdir/usr/share/pixmaps/urbanterror.png - - # Copy launch scripts. - install -Dm755 $srcdir/urbanterror.sh $pkgdir/usr/bin/urbanterror - install -Dm755 $srcdir/urbanterror-server.sh $pkgdir/usr/bin/urbanterror-server -} - -# vim: sw=2:ts=2 et: diff --git a/community/urbanterror/urbanterror-server.sh b/community/urbanterror/urbanterror-server.sh deleted file mode 100644 index 8d3f14959..000000000 --- a/community/urbanterror/urbanterror-server.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /opt/urbanterror/ -exec ./urbanterror-ded "$@" diff --git a/community/urbanterror/urbanterror.desktop b/community/urbanterror/urbanterror.desktop deleted file mode 100644 index f4d359dfa..000000000 --- a/community/urbanterror/urbanterror.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Urban Terror -Type=Application -Categories=Game; -Terminal=false -Exec=urbanterror -Icon=urbanterror diff --git a/community/urbanterror/urbanterror.png b/community/urbanterror/urbanterror.png Binary files differdeleted file mode 100644 index df596c29b..000000000 --- a/community/urbanterror/urbanterror.png +++ /dev/null diff --git a/community/urbanterror/urbanterror.sh b/community/urbanterror/urbanterror.sh deleted file mode 100644 index 65c222b4a..000000000 --- a/community/urbanterror/urbanterror.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -cd /opt/urbanterror/ -exec ./urbanterror "$@" diff --git a/community/vidalia/bug6178.patch b/community/vidalia/bug6178.patch deleted file mode 100644 index 5da41ef55..000000000 --- a/community/vidalia/bug6178.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Tomás Touceda <chiiph@torproject.org> -Date: Thu, 28 Jun 2012 23:55:24 +0000 (-0300) -Subject: Do not add relative root to datadirectory if it is empty -X-Git-Url: https://gitweb.torproject.org - -Do not add relative root to datadirectory if it is empty ---- - -diff --git a/changes/bug6178 b/changes/bug6178 -new file mode 100644 -index 0000000..e727ed9 ---- /dev/null -+++ b/changes/bug6178 -@@ -0,0 +1 @@ -+ o Do not add relative root to DataDirectory if it is empty. Fixes bug 6178. -diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp -index a8dce5a..a7a4a09 100644 ---- a/src/vidalia/MainWindow.cpp -+++ b/src/vidalia/MainWindow.cpp -@@ -1104,7 +1104,7 @@ MainWindow::start() - QString dataDirectory = settings.getDataDirectory(); - QFileInfo dataDirectoryInfo(dataDirectory); - -- if(QDir(dataDirectory).isRelative()) { -+ if(not dataDirectory.isEmpty() and QDir(dataDirectory).isRelative()) { - dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; - - QFileInfo newDataDirectoryInfo(dataDirectory); diff --git a/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch b/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch deleted file mode 100644 index d61f3e86e..000000000 --- a/community/vidalia/revert-e36785b3bc90fd33eed45e5ca6d334780d5fab30.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp -index 85bc62e..b13f80b 100644 ---- a/src/vidalia/MainWindow.cpp -+++ b/src/vidalia/MainWindow.cpp -@@ -626,9 +626,6 @@ MainWindow::launchBrowserFromDirectory() - - /** Directory for the browser */ - QString browserDirectory = settings.getBrowserDirectory(); -- if(QDir(browserDirectory).isRelative()) -- browserDirectory = QDir(QDir::toNativeSeparators(QCoreApplication::applicationDirPath() -- + "/" + browserDirectory)).canonicalPath(); - - /** Relative path to the browser executable from the browserDirectory */ - QString browserExecutable = QDir::toNativeSeparators(browserDirectory + "/" + settings.getBrowserExecutable()); -@@ -1068,20 +1065,6 @@ MainWindow::start() - QString torrc = settings.getTorrc(); - QFileInfo torrcInfo(torrc); - -- if(QDir(torrcInfo.filePath()).isRelative()) { -- torrc = QCoreApplication::applicationDirPath() + "/" + torrc; -- -- QFileInfo newTorrcInfo(torrc); -- if(!newTorrcInfo.exists() and torrcInfo.exists()) { -- torrc = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torrcInfo.absoluteFilePath()); -- vWarn("Automigrating configuration for Torrc:\nOld path: %1\nNew path: %2") -- .arg(newTorrcInfo.filePath()) -- .arg(torrc); -- settings.setTorrc(torrc); -- torrc = QCoreApplication::applicationDirPath() + "/" + torrc; -- } -- } -- - if(settings.bootstrap()) { - QString boottorrc = settings.bootstrapFrom(); - vNotice(tr("Bootstrapping torrc from %1 to %2") -@@ -1104,20 +1087,6 @@ MainWindow::start() - QString dataDirectory = settings.getDataDirectory(); - QFileInfo dataDirectoryInfo(dataDirectory); - -- if(QDir(dataDirectory).isRelative()) { -- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; -- -- QFileInfo newDataDirectoryInfo(dataDirectory); -- if(!newDataDirectoryInfo.exists() and dataDirectoryInfo.exists()) { -- dataDirectory = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(dataDirectoryInfo.absoluteFilePath()); -- vWarn("Automigrating configuration for DataDirectory:\nOld path: %1\nNew path: %2") -- .arg(newDataDirectoryInfo.absoluteFilePath()) -- .arg(dataDirectory); -- settings.setDataDirectory(dataDirectory); -- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; -- } -- } -- - QString expDataDirectory = QDir(expand_filename(dataDirectory)).canonicalPath(); - if (!dataDirectory.isEmpty()) - args << "DataDirectory" << expDataDirectory; -@@ -1175,20 +1144,6 @@ MainWindow::start() - QString torExecutable = settings.getExecutable(); - QFileInfo torExecutableInfo(torExecutable); - -- if(QDir(torExecutableInfo.filePath()).isRelative()) { -- torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; -- -- QFileInfo newTorExecutableInfo(torExecutable); -- if(!newTorExecutableInfo.exists() and torExecutableInfo.exists()) { -- torExecutable = QDir(QCoreApplication::applicationDirPath()).relativeFilePath(torExecutableInfo.absoluteFilePath()); -- vWarn("Automigrating configuration for TorExecutable:\nOld path: %1\nNew path: %2") -- .arg(newTorExecutableInfo.filePath()) -- .arg(torExecutable); -- settings.setExecutable(torExecutable); -- torExecutable = QCoreApplication::applicationDirPath() + "/" + torExecutable; -- } -- } -- - _torControl->start(torExecutable, args); - } - -@@ -1251,8 +1206,6 @@ MainWindow::started() - /* Try to connect to Tor's control port */ - if(settings.autoControlPort()) { - QString dataDirectory = settings.getDataDirectory(); -- if(QDir(dataDirectory).isRelative()) -- dataDirectory = QCoreApplication::applicationDirPath() + "/" + dataDirectory; - - QFile file(QString("%1/port.conf").arg(QDir(expand_filename(dataDirectory)).canonicalPath())); - int tries = 0, maxtries = 5; diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index 27c5621a4..1116a6c5b 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 83373 2013-01-30 17:47:34Z tpowa $ +# $Id: PKGBUILD 84040 2013-02-09 01:31:49Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> +# Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.6 -pkgrel=5 +pkgrel=6 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/virtualbox/001-vboxdrv-reference.patch b/community/virtualbox/001-vboxdrv-reference.patch deleted file mode 100644 index 00faa35cb..000000000 --- a/community/virtualbox/001-vboxdrv-reference.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000 -+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000 -@@ -75,10 +75,9 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing<br/><br/>" -- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "as root. If it is available in your distribution, you should install the " -- "DKMS package first. This package keeps track of Linux kernel changes and " -- "recompiles the vboxdrv kernel module if necessary." -+ " <font color=blue>'pacman -S virtualbox-host-modules'</font><br/><br/>" -+ "as root. If you don't use our stock kernel, install virtualbox-host-source and " -+ "execute dkms autoinstall ." - ); - - QString g_QStrHintOtherWrongDriverVersion = QApplication::tr( -@@ -90,11 +89,8 @@ - - QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr( - "The VirtualBox kernel modules do not match this version of " -- "VirtualBox. The installation of VirtualBox was apparently not " -- "successful. Executing<br/><br/>" -- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>" -- "may correct this. Make sure that you do not mix the " -- "OSE version and the PUEL version of VirtualBox." -+ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> " -+ " <font color=blue>'dkms autoinstall'</font><br/><br/>" - ); - - QString g_QStrHintOtherNoDriver = QApplication::tr( -diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000 -+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000 -@@ -32,17 +32,18 @@ - cat << EOF - WARNING: The vboxdrv kernel module is not loaded. Either there is no module - available for the current kernel (`uname -r`) or it failed to -- load. Please recompile the kernel module and install it by -+ load. Please reinstall the kernel module virtualbox-host-modules or -+ if you don't use our stock kernel compile the modules with - -- sudo /etc/init.d/vboxdrv setup -+ sudo dkms autoinstall - - You will not be able to start VMs until this problem is fixed. - EOF - elif [ ! -c /dev/vboxdrv ]; then - cat << EOF --WARNING: The character device /dev/vboxdrv does not exist. Try -+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module - -- sudo /etc/init.d/vboxdrv restart -+ sudo modprobe vboxdrv - - and if that is not successful, try to re-install the package. - diff --git a/community/virtualbox/002-change_default_driver_dir.patch b/community/virtualbox/002-change_default_driver_dir.patch deleted file mode 100644 index d8531499d..000000000 --- a/community/virtualbox/002-change_default_driver_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:11:37.903456612 +0000 -+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-07-19 15:12:41.024021274 +0000 -@@ -36,13 +36,8 @@ - //#define DEBUG_DRI_CALLS - - //@todo this could be different... --#ifdef RT_ARCH_AMD64 --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#endif - - #ifdef DEBUG_DRI_CALLS - #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community/virtualbox/10-vboxdrv.rules b/community/virtualbox/10-vboxdrv.rules deleted file mode 100644 index 37403ae2f..000000000 --- a/community/virtualbox/10-vboxdrv.rules +++ /dev/null @@ -1,5 +0,0 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" -SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community/virtualbox/60-vboxguest.rules b/community/virtualbox/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/community/virtualbox/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community/virtualbox/LocalConfig.kmk b/community/virtualbox/LocalConfig.kmk deleted file mode 100644 index 6eca06d9b..000000000 --- a/community/virtualbox/LocalConfig.kmk +++ /dev/null @@ -1,20 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS) -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD deleted file mode 100644 index bba389c0c..000000000 --- a/community/virtualbox/PKGBUILD +++ /dev/null @@ -1,305 +0,0 @@ -# $Id: PKGBUILD 81600 2012-12-24 17:28:55Z seblu $ -# Maintainer: Ionut Biru <ibiru@archlinux.org> -# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> - -pkgbase=virtualbox -pkgname=('virtualbox' - 'virtualbox-host-dkms' - 'virtualbox-guest-dkms' - 'virtualbox-sdk' - 'virtualbox-guest-utils' - 'virtualbox-ext-vnc') -pkgver=4.2.6 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL' 'custom') -makedepends=('alsa-lib' - 'bin86' - 'cdrkit' - 'curl' - 'dev86' - 'gsoap' - 'iasl' - 'jdk7-openjdk' - 'libidl2' - 'libpulse' - 'libstdc++5' - 'libvncserver' - 'libxcursor' - 'libxinerama' - 'libxml2' - 'libxmu' - 'libxrandr' - 'libxslt' - 'libxtst' - 'linux-headers' - 'mesa' - 'glu' - 'python2' - 'qt' - 'sdl' - 'sdl_ttf' - 'vde2' - 'xalan-c') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2" - "UserManual-$pkgver.pdf::http://download.virtualbox.org/virtualbox/$pkgver/UserManual.pdf" - '10-vboxdrv.rules' - '60-vboxguest.rules' - 'LocalConfig.kmk' - 'vboxservice.conf' - 'vboxservice.rc' - 'vboxservice.service' - 'vboxweb.conf' - 'vboxweb.rc' - 'vboxweb.service' - '001-vboxdrv-reference.patch' - '002-change_default_driver_dir.patch') -md5sums=('d680aeb3b4379b8281527aeb012b2df5' - '5cdffabb7ffacfd49dcc93d747ede762' - '5f85710e0b8606de967716ded7b2d351' - 'ed1341881437455d9735875ddf455fbe' - '58d6e5bb4b4c1c6f3f0b3daa6aaeed03' - '3c08ad30b89add47d3f45121200a5360' - '7d9823507206de9b8528a72af2f18d74' - '07c5f6d86c4b7839d719c8ee0c53653b' - '7e9483b1069a54f181546083ac7e5469' - 'c159d683ba1947290fc2ad2c64194150' - 'bc9efed88e0469cd7fc460d5a5cd7b4b' - '6dbd16b9d1530fc42ff6904cd80be91d' - '97e193f050574dd272a38e5ee5ebe62b') - -build() { - cd "VirtualBox-$pkgver" - - # Apply patches - for _p in "$srcdir"/*.patch; do - [[ -e $_p ]] || continue - msg2 "Appy patch ${_p##*/}" - patch -Np1 -i "$_p" - done - - cp "$srcdir/LocalConfig.kmk" . - - # fake makeself binary to compile without nofatal - ln -s /bin/echo makeself - export PATH="$CWD:$PATH" - - ./configure --disable-docs \ - --enable-webservice \ - --enable-vde \ - --enable-vnc \ - --disable-kmods - source ./env.sh - kmk all - - # fix python2 - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" - - # build rdesktop-vrdp (broken from LocalConfig.kmk) - pushd src/VBox/RDP/client - cp "$srcdir/LocalConfig.kmk" . - # fix keymap path FS#32548 - sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk - kmk all - popd - - # build VNC pack - pushd src/VBox/ExtPacks/VNC - kmk packing - popd -} - -package_virtualbox() { - pkgdesc='Powerful x86 virtualization for enterprise as well as home use' - depends=('curl' - 'libpng' - 'libxcursor' - 'libxinerama' - 'libxml2' - 'libxmu' - 'sdl' - 'shared-mime-info' - 'virtualbox-host-modules') - optdepends=('qt: VirtualBox GUI support' - 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-sdk: Developer kit' - 'virtualbox-host-dkms: Host kernel source modules for non-stock kernels' - 'net-tools: Host-only or bridged networking support') - backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb') - replaces=('virtualbox-ose') - conflicts=('virtualbox-ose') - install=virtualbox.install - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps} - - #doc - install -m 0644 "$srcdir/UserManual-$pkgver.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" - - #Binaries and Wrapper with Launchers - install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - - for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do - ln -sf VBox "$pkgdir/usr/bin/$i" - ln -sf VBox "$pkgdir/usr/bin/${i,,}" - done - install -m 0755 VBoxTunctl "$pkgdir/usr/bin" - install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin" - - #components - install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" - - #lib - install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" - - #setuid root binaries - install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" - #other binaries - install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" - - #language - install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" - - #rdesktop keymaps - install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps" - - #useless scripts - install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" - - #icons - install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" - - pushd icons - for i in *; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - done - popd - - #desktop - install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" - install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" - - #install configuration - mkdir -p "$pkgdir/etc/vbox" - echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" - - #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \ - "$pkgdir/usr/share/licenses/virtualbox/LICENSE" - install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ - "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules" - - # install rc.d script - install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb" - # install systemd service - install -D -m644 "$srcdir/vboxweb.service" \ - "$pkgdir/usr/lib/systemd/system/vboxweb.service" - # install sample config - install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb" - -} - -package_virtualbox-sdk() { - pkgdesc='VirtualBox Software Developer Kit (SDK)' - depends=('python2') - - install -dm755 "$pkgdir/usr/lib/virtualbox" - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" - #python sdk - pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir" - popd - rm -rf sdk/installer - mv sdk "$pkgdir/usr/lib/virtualbox" -} - -package_virtualbox-host-dkms() { - pkgdesc='VirtualBox Host kernel modules sources' - depends=('dkms' 'gcc' 'make') - provides=('virtualbox-host-modules') - replaces=('virtualbox-source' 'virtualbox-host-source') - conflicts=('virtualbox-source' 'virtualbox-host-source') - optdepends=('linux-headers' - 'linux-lts-headers') - install=virtualbox-host-dkms.install - - install -dm755 "$pkgdir/usr/src" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - cp -r src "$pkgdir/usr/src/vboxhost-$pkgver" -} - -package_virtualbox-guest-dkms() { - pkgdesc='VirtualBox Guest kernel modules sources' - depends=('dkms' 'gcc' 'make') - provides=('virtualbox-guest-modules') - replaces=('virtualbox-archlinux-source' 'virtualbox-guest-source') - conflicts=('virtualbox-archlinux-source' 'virtualbox-guest-source') - optdepends=('linux-headers' - 'linux-lts-headers') - install=virtualbox-guest-dkms.install - - install -dm755 "$pkgdir/usr/src" - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - cp -r src "$pkgdir/usr/src/vboxguest-$pkgver" -} - -package_virtualbox-guest-utils() { - pkgdesc='VirtualBox Guest userspace utilities' - depends=('virtualbox-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes') - optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels') - replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') - conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions') - backup=('etc/conf.d/vboxservice') - install=virtualbox-guest-utils.install - - source "VirtualBox-$pkgver/env.sh" - pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - install -d "$pkgdir"/{usr/bin,sbin} - install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" - install -m755 mount.vboxsf "$pkgdir/sbin" - install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \ - "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxvideo_drv_113.so \ - "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" - install -d "$pkgdir/usr/lib/xorg/modules/dri" - install -m755 VBoxOGL*.so "$pkgdir/usr/lib" - ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" - install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so" - popd - # install udev rules - install -D -m 0644 60-vboxguest.rules \ - "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules" - # install rc.d script - install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice" - # install sample config - install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice" - # install systemd service file - install -D -m644 vboxservice.service \ - "$pkgdir/usr/lib/systemd/system/vboxservice.service" -} - -package_virtualbox-ext-vnc() { - pkgdesc='VirtualBox VNC extension pack' - depends=('virtualbox' 'libvncserver') - optdepends=('vncviewver: vnc client') - install=virtualbox-ext-vnc.install - - source "VirtualBox-$pkgver/env.sh" - cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/packages" - install -Dm644 VNC-*.vbox-extpack "$pkgdir/usr/share/virtualbox/extensions/VNC-${pkgver}.vbox-extpack" -} - -# vim:set ts=4 sw=4 et: diff --git a/community/virtualbox/vboxservice.conf b/community/virtualbox/vboxservice.conf deleted file mode 100644 index 9d4ec629f..000000000 --- a/community/virtualbox/vboxservice.conf +++ /dev/null @@ -1,2 +0,0 @@ -# VBoxService -h -VBOX_SERVICE_OPTION="" diff --git a/community/virtualbox/vboxservice.rc b/community/virtualbox/vboxservice.rc deleted file mode 100644 index 5a62d69a3..000000000 --- a/community/virtualbox/vboxservice.rc +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/${0##*/} - -name=VBoxService -PID=$(pidof -o %PPID $name) - -case "$1" in - start) - stat_busy 'Starting VirtualBox Guest Service' - [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \ - && { add_daemon ${0##*/}; stat_done; } \ - || { stat_fail; exit 1; } - ;; - stop) - stat_busy 'Stopping VirtualBox Guest Service' - [[ -n "$PID" ]] && kill $PID &>/dev/null \ - && { rm_daemon ${0##*/}; stat_done; } \ - || { stat_fail; exit 1; } - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - status) - stat_busy 'Checking VirtualBox Guest Service status' - ck_status ${0##*/} - ;; - *) - echo "usage: ${0##*/} {start|stop|restart|status}" >&2 - exit 1 -esac - -exit 0 - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/vboxservice.service b/community/virtualbox/vboxservice.service deleted file mode 100644 index bbd61617d..000000000 --- a/community/virtualbox/vboxservice.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=VirtualBox Guest Service -ConditionVirtualization=oracle - -[Service] -ExecStart=/usr/bin/VBoxService -f - -[Install] -WantedBy=multi-user.target diff --git a/community/virtualbox/vboxweb.conf b/community/virtualbox/vboxweb.conf deleted file mode 100644 index c36f6a143..000000000 --- a/community/virtualbox/vboxweb.conf +++ /dev/null @@ -1,11 +0,0 @@ -# WebService Mandatory Variables -#VBOXWEB_USER= - -# WebService Variables -#VBOXWEB_LOGFILE= -#VBOXWEB_HOST= -#VBOXWEB_PORT= -#VBOXWEB_TIMEOUT= -#VBOXWEB_CHECK_INTERVAL= -#VBOXWEB_THREADS= -#VBOXWEB_KEEPALIVE= diff --git a/community/virtualbox/vboxweb.rc b/community/virtualbox/vboxweb.rc deleted file mode 100644 index 97273e3c7..000000000 --- a/community/virtualbox/vboxweb.rc +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg -. /etc/conf.d/vboxweb - -BINARY="$INSTALL_DIR/vboxwebsrv" - -start() { - stat_busy "Starting VirtualBox Web Service"; - if ! pidof -o %PPID $BINARY >/dev/null; then - [[ "$VBOXWEB_USER" ]] || stat_die - lsmod | grep -q "vboxdrv[^_-]" || stat_die - PARAMS="--background" - [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST" - [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT" - [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT" - [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL" - [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS" - [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE" - [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE" - # prevent inheriting this setting to VBoxSVC - unset VBOX_RELEASE_LOG_DEST - su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null - # ugly: wait until the final process has forked - sleep .2 - if pidof -o %PPID $BINARY >/dev/null; then - add_daemon vboxweb - stat_done - else - stat_die - fi - else - stat_die - fi -} - -stop() { - stat_busy "Stopping VirtualBox Web Service" - PID=$(pidof -o %PPID $BINARY) - [[ $PID ]] && kill $PID &>/dev/null - if ! pidof -o %PPID $BINARY >/dev/null; then - rm_daemon vboxweb - stat_done - else - stat_die - fi -} - -restart() { - stop && start -} - -status() { - stat_busy "Checking for VirtualBox Web Service" - if pidof -o %PPID $BINARY >/dev/null; then - stat_done - else - stat_fail - false - fi -} - -case "$1" in -start) - start - ;; -stop) - stop - ;; -restart) - restart - ;; -force-reload) - restart - ;; -status) - status - ;; -*) - echo "Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/vboxweb.service b/community/virtualbox/vboxweb.service deleted file mode 100644 index 303381597..000000000 --- a/community/virtualbox/vboxweb.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=VirtualBox Web Service -After=network.target - -[Service] -Type=forking -PIDFile=/run/vboxweb.pid -ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background - -[Install] -WantedBy=multi-user.target diff --git a/community/virtualbox/virtualbox-ext-vnc.install b/community/virtualbox/virtualbox-ext-vnc.install deleted file mode 100644 index 828a16a1d..000000000 --- a/community/virtualbox/virtualbox-ext-vnc.install +++ /dev/null @@ -1,25 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - VBoxManage extpack install "/usr/share/virtualbox/extensions/VNC-${1%%-*}.vbox-extpack" >/dev/null -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# 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() { - VBoxManage extpack uninstall 'VNC' >/dev/null -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox-guest-dkms.install b/community/virtualbox/virtualbox-guest-dkms.install deleted file mode 100644 index 2d62eae43..000000000 --- a/community/virtualbox/virtualbox-guest-dkms.install +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# arg 1: the new package version -post_install() { - dkms add vboxguest/${1%-*} - cat << EOF -==> To build and install your modules run dkms install vboxguest/${1%-*} -==> To do this automatically at startup you can add dkms in your DAEMONS -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# 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() { - # Remove modules using dkms - [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox-guest-utils.install b/community/virtualbox/virtualbox-guest-utils.install deleted file mode 100644 index 38bbe807d..000000000 --- a/community/virtualbox/virtualbox-guest-utils.install +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -# arg 1: the new package version -post_install() { - getent group vboxsf > /dev/null || groupadd -g 109 vboxsf - true -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" - # rename /etc/rc.d/vboxservice - if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then - cat << EOF -==> rc.d vbox-service script was renamed to vboxservice. -EOF - fi - # fix gid of vboxsf - if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then - groupmod -g 109 vboxsf - fi - true -} - -# arg 1: the old package version -post_remove() { - groupdel vboxsf >/dev/null 2>&1 || true -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox-host-dkms.install b/community/virtualbox/virtualbox-host-dkms.install deleted file mode 100644 index 8028cb7e0..000000000 --- a/community/virtualbox/virtualbox-host-dkms.install +++ /dev/null @@ -1,30 +0,0 @@ -#/bin/sh - -# arg 1: the new package version -post_install() { - dkms add vboxhost/${1%-*} - cat << EOF -==> To build and install your modules run dkms install vboxhost/${1%-*} -==> To do this automatically at startup you can add dkms in your DAEMONS -EOF -} - -# arg 1: the new package version -# arg 2: the old package version -pre_upgrade() { - pre_remove "$2" -} - -# 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() { - # Remove modules using dkms - [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/virtualbox/virtualbox.install b/community/virtualbox/virtualbox.install deleted file mode 100644 index 6913fe2ed..000000000 --- a/community/virtualbox/virtualbox.install +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh - -utils() { - if [ -x usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime > /dev/null 2>&1 - fi - - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 - fi - - if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q - fi - - if [ -x usr/bin/udevadm ]; then - usr/bin/udevadm control --reload - fi -} - -# arg 1: the new package version -post_install() { - getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers - utils -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install "$1" - if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then - cat << EOF -===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules. -===> Use virtualbox-source package if you don't use our stock linux package. -EOF - fi -} - -# arg 1: the old package version -post_remove() { - groupdel vboxusers >/dev/null 2>&1 || true - utils -} - -# vim:set ts=2 sw=2 ft=sh et: diff --git a/community/visualboyadvance/1.7.2-deprecatedsigc++.patch b/community/visualboyadvance/1.7.2-deprecatedsigc++.patch deleted file mode 100644 index 4bb1787cb..000000000 --- a/community/visualboyadvance/1.7.2-deprecatedsigc++.patch +++ /dev/null @@ -1,692 +0,0 @@ ---- src/gtk/sigccompat.h.old 2008-05-02 10:46:45.000000000 +0200 -+++ src/gtk/sigccompat.h 2008-05-02 10:47:08.000000000 +0200 -@@ -20,7 +20,7 @@ - #ifndef __VBA_SIGCCOMPAT_H__ - #define __VBA_SIGCCOMPAT_H__ - --#undef LIBSIGC_DISABLE_DEPRECATED -+#define LIBSIGC_DISABLE_DEPRECATED - #include <sigc++/bind.h> - #include <sigc++/connection.h> - -@@ -28,9 +28,679 @@ - #include <sigc++/object.h> - #include <sigc++/functors/mem_fun.h> - --namespace SigC -+ -+// From sigc++/bind.h -+namespace SigC { -+ -+template <class T_bound1, class T_functor> -+inline ::sigc::bind_functor<-1, T_functor, -+ typename ::sigc::unwrap_reference<T_bound1>::type> -+bind(const T_functor& _A_functor, T_bound1 _A_b1) -+{ return ::sigc::bind_functor<-1, T_functor, -+ typename ::sigc::unwrap_reference<T_bound1>::type> -+ (_A_functor, _A_b1); -+} -+ -+template <class T_bound1, class T_bound2, class T_functor> -+inline ::sigc::bind_functor<-1, T_functor, -+ typename ::sigc::unwrap_reference<T_bound1>::type, -+ typename ::sigc::unwrap_reference<T_bound2>::type> -+bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2) -+{ return ::sigc::bind_functor<-1, T_functor, -+ typename ::sigc::unwrap_reference<T_bound1>::type, -+ typename ::sigc::unwrap_reference<T_bound2>::type> -+ (_A_functor, _A_b1, _A_b2); -+} -+ -+template <class T_bound1, class T_bound2, class T_bound3, class T_functor> -+inline ::sigc::bind_functor<-1, T_functor, -+ typename ::sigc::unwrap_reference<T_bound1>::type, -+ typename ::sigc::unwrap_reference<T_bound2>::type, -+ typename ::sigc::unwrap_reference<T_bound3>::type> -+bind(const T_functor& _A_functor, T_bound1 _A_b1, T_bound2 _A_b2,T_bound3 _A_b3) -+{ return ::sigc::bind_functor<-1, T_functor, -+ typename ::sigc::unwrap_reference<T_bound1>::type, -+ typename ::sigc::unwrap_reference<T_bound2>::type, -+ typename ::sigc::unwrap_reference<T_bound3>::type> -+ (_A_functor, _A_b1, _A_b2, _A_b3); -+} -+ -+} -+ -+// From sigc++/connection.h -+namespace SigC { -+ -+/** Convinience class for safe disconnection. -+ * Iterators must not be used beyond the lifetime of the list -+ * they work on. A connection object can be created from a -+ * slot list iterator and may safely be used to disconnect -+ * the referred slot at any time (disconnect()). If the slot -+ * has already been destroyed, disconnect() does nothing. empty() or -+ * operator bool() can be used to test whether the connection is -+ * still active. The connection can be blocked (block(), unblock()). -+ * -+ * This is possible because the connection object gets notified -+ * when the referred slot dies (notify()). -+ * -+ * @deprecated Use sigc::connection instead. -+ * @ingroup compat -+ */ -+typedef ::sigc::connection Connection; -+ -+} -+ -+// From sigc++/slot.h -+namespace SigC { -+ -+// SlotN -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot0 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return> -+class Slot0 -+ : public ::sigc::slot<T_return> -+{ -+public: -+ typedef ::sigc::slot<T_return> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot0() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot0(const T_functor& _A_func) -+ : ::sigc::slot<T_return>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot0(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot0& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot1 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1> -+class Slot1 -+ : public ::sigc::slot<T_return, T_arg1> -+{ -+public: -+ typedef ::sigc::slot<T_return, T_arg1> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot1() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot1(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot1(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot1& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot2 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * - @e T_arg2 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2> -+class Slot2 -+ : public ::sigc::slot<T_return, T_arg1,T_arg2> -+{ -+public: -+ typedef ::sigc::slot<T_return, T_arg1,T_arg2> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot2() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot2(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1,T_arg2>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot2(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot2& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot3 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * - @e T_arg2 Argument type used in the definition of operator()(). -+ * - @e T_arg3 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3> -+class Slot3 -+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3> -+{ -+public: -+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot3() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot3(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot3(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot3& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot4 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * - @e T_arg2 Argument type used in the definition of operator()(). -+ * - @e T_arg3 Argument type used in the definition of operator()(). -+ * - @e T_arg4 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4> -+class Slot4 -+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> -+{ -+public: -+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot4() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot4(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot4(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot4& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot5 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * - @e T_arg2 Argument type used in the definition of operator()(). -+ * - @e T_arg3 Argument type used in the definition of operator()(). -+ * - @e T_arg4 Argument type used in the definition of operator()(). -+ * - @e T_arg5 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> -+class Slot5 -+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> -+{ -+public: -+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot5() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot5(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot5(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot5& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot6 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * - @e T_arg2 Argument type used in the definition of operator()(). -+ * - @e T_arg3 Argument type used in the definition of operator()(). -+ * - @e T_arg4 Argument type used in the definition of operator()(). -+ * - @e T_arg5 Argument type used in the definition of operator()(). -+ * - @e T_arg6 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> -+class Slot6 -+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> -+{ -+public: -+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot6() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot6(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot6(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot6& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+/** Converts an arbitrary functor to a unified type which is opaque. -+ * Slot7 itself is a functor or to be more precise a closure. It contains -+ * a single, arbitrary functor (or closure) that is executed in operator()(). -+ * -+ * The template arguments determine the function signature of operator()(): -+ * - @e T_return The return type of operator()(). -+ * - @e T_arg1 Argument type used in the definition of operator()(). -+ * - @e T_arg2 Argument type used in the definition of operator()(). -+ * - @e T_arg3 Argument type used in the definition of operator()(). -+ * - @e T_arg4 Argument type used in the definition of operator()(). -+ * - @e T_arg5 Argument type used in the definition of operator()(). -+ * - @e T_arg6 Argument type used in the definition of operator()(). -+ * - @e T_arg7 Argument type used in the definition of operator()(). -+ * -+ * To use simply assign the slot to the desired functor. If the functor -+ * is not compatible with the parameter list defined with the template -+ * arguments compiler errors are triggered. When called the slot -+ * will invoke the functor with minimal copies. -+ * block() and unblock() can be used to block the functor's invocation -+ * from operator()() temporarily. -+ * -+ * @par Example: -+ * @code -+ * #include <sigc++/slot.h> -+ * void foo(int) {} -+ * SigC::Slot1<void, long> s = SigC::slot(&foo); -+ * s(19); -+ * @endcode -+ * -+ * @deprecated Use the unnumbered template sigc::slot instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7> -+class Slot7 -+ : public ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> - { -+public: -+ typedef ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> parent_type; -+ -+ /// Constructs an empty slot. -+ Slot7() {} -+ -+ /** Constructs a slot from an arbitrary functor. -+ * @param _A_func The desired functor the new slot should be assigned to. -+ */ -+ template <class T_functor> -+ Slot7(const T_functor& _A_func) -+ : ::sigc::slot<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func) {} -+ -+ /** Constructs a slot, copying an existing one. -+ * @param src The existing slot to copy. -+ */ -+ Slot7(const parent_type& src) -+ : parent_type(src) {} -+ -+ /** Overrides this slot making a copy from another slot. -+ * @param src The slot from which to make a copy. -+ * @return @p this. -+ */ -+ Slot7& operator=(const parent_type& src) -+ { parent_type::operator=(src); return *this; } -+}; -+ -+ -+ -+#ifndef DOXYGEN_SHOULD_SKIP_THIS -+/* gcc 3.2 reports a strange conflict between SigC::slot() and sigc::slot<> -+ * when "using namespace SigC" and later using a slot(obj,func) overload -+ * without the prefix "SigC::". Probably a compiler bug. I will investigate. -+ * -+ * This ugly hack avoids the error: -+ */ -+// #define slot(...) make_slot(__VA_ARGS__) /* only works for gcc */ -+#endif - -+ -+// slot() -+/** Creates a functor of type SigC::Slot0 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return> -+inline Slot0<T_return> -+slot(T_return (*_A_func)()) -+{ return Slot0<T_return>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot1 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1> -+inline Slot1<T_return, T_arg1> -+slot(T_return (*_A_func)(T_arg1)) -+{ return Slot1<T_return, T_arg1>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot2 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2> -+inline Slot2<T_return, T_arg1,T_arg2> -+slot(T_return (*_A_func)(T_arg1,T_arg2)) -+{ return Slot2<T_return, T_arg1,T_arg2>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot3 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3> -+inline Slot3<T_return, T_arg1,T_arg2,T_arg3> -+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3)) -+{ return Slot3<T_return, T_arg1,T_arg2,T_arg3>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot4 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4> -+inline Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4> -+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4)) -+{ return Slot4<T_return, T_arg1,T_arg2,T_arg3,T_arg4>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot5 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5> -+inline Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5> -+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5)) -+{ return Slot5<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot6 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6> -+inline Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6> -+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6)) -+{ return Slot6<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6>(_A_func); } -+ -+/** Creates a functor of type SigC::Slot7 that wraps an existing non-member function. -+ * -+ * @param _A_func Pointer to function that should be wrapped. -+ * @return Functor that executes _A_func on invokation. -+ * -+ * @deprecated Use sigc::ptr_fun() instead. -+ * @ingroup compat -+ */ -+template <class T_return, class T_arg1,class T_arg2,class T_arg3,class T_arg4,class T_arg5,class T_arg6,class T_arg7> -+inline Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7> -+slot(T_return (*_A_func)(T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7)) -+{ return Slot7<T_return, T_arg1,T_arg2,T_arg3,T_arg4,T_arg5,T_arg6,T_arg7>(_A_func); } -+ -+ -+ -+} -+ -+// From sigc++/object.h -+namespace SigC { -+ -+// Object -+typedef ::sigc::trackable Object; -+ -+} -+ -+namespace SigC -+{ - template <class T_return, class T_obj1, class T_obj2> - inline Slot0<T_return> - slot( T_obj1& _A_obj, T_return (T_obj2::*_A_func)() ) diff --git a/community/visualboyadvance/1.7.2-gcc34.patch b/community/visualboyadvance/1.7.2-gcc34.patch deleted file mode 100644 index 8fa4fbf8d..000000000 --- a/community/visualboyadvance/1.7.2-gcc34.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -ur src/gtk/joypadconfig.h src/gtk/joypadconfig.h ---- src/gtk/joypadconfig.h 2004-05-10 16:43:21.000000000 +0200 -+++ src/gtk/joypadconfig.h 2004-08-12 22:30:20.838039064 +0200 -@@ -22,8 +22,8 @@ - - #include <vector> - --#include <libglademm.h> - #include <gtkmm.h> -+#include <libglademm.h> - - #ifndef GTKMM20 - # include "sigccompat.h" -diff -ur src/gtk/main.cpp src/gtk/main.cpp ---- src/gtk/main.cpp 2004-05-21 18:02:35.000000000 +0200 -+++ src/gtk/main.cpp 2004-08-12 22:39:08.633801912 +0200 -@@ -22,10 +22,10 @@ - - #include <list> - --#include <libglademm.h> - #include <gtkmm/main.h> - #include <gtkmm/window.h> - #include <gtkmm/messagedialog.h> -+#include <libglademm.h> - - #include "images/vba-wm-pixbufs.h" - -diff -ur src/gtk/window.h src/gtk/window.h ---- src/gtk/window.h 2004-05-21 15:25:41.000000000 +0200 -+++ src/gtk/window.h 2004-08-12 22:30:58.650290728 +0200 -@@ -23,8 +23,8 @@ - #include <sys/types.h> - #include <stdarg.h> - --#include <libglademm.h> - #include <gtkmm.h> -+#include <libglademm.h> - - #ifndef GTKMM20 - # include "sigccompat.h" diff --git a/community/visualboyadvance/1.7.2-gcc41.patch b/community/visualboyadvance/1.7.2-gcc41.patch deleted file mode 100644 index cacf8e251..000000000 --- a/community/visualboyadvance/1.7.2-gcc41.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru src/prof/prof.cpp src/prof/prof.cpp ---- src/prof/prof.cpp 2004-05-14 00:31:58.000000000 +1000 -+++ src/prof/prof.cpp 2006-06-03 13:49:41.000000000 +1000 -@@ -266,7 +266,7 @@ - for (toindex=froms[fromindex]; toindex!=0; toindex=tos[toindex].link) { - if(profWrite8(fd, GMON_TAG_CG_ARC) || - profWrite32(fd, (u32)frompc) || -- profWrite32(fd, (u32)tos[toindex].selfpc) || -+ profWrite32(fd, (u32)(intptr_t)tos[toindex].selfpc) || - profWrite32(fd, tos[toindex].count)) { - systemMessage(0, "mcount: arc"); - fclose(fd); -diff -ru src/sdl/debugger.cpp src/sdl/debugger.cpp ---- src/sdl/debugger.cpp 2004-05-14 00:13:14.000000000 +1000 -+++ src/sdl/debugger.cpp 2006-06-03 13:49:57.000000000 +1000 -@@ -950,9 +950,9 @@ - { - u32 address = 0; - if(mem >= (u32*)&workRAM[0] && mem <= (u32*)&workRAM[0x3ffff]) -- address = 0x2000000 + ((u32)mem - (u32)&workRAM[0]); -+ address = 0x2000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&workRAM[0]); - else -- address = 0x3000000 + ((u32)mem - (u32)&internalRAM[0]); -+ address = 0x3000000 + ((u32)(intptr_t)mem - (u32)(intptr_t)&internalRAM[0]); - - if(size == 2) - printf("Breakpoint (on write) address %08x old:%08x new:%08x\n", diff --git a/community/visualboyadvance/1.7.2-glibc.patch b/community/visualboyadvance/1.7.2-glibc.patch deleted file mode 100644 index 5211b3623..000000000 --- a/community/visualboyadvance/1.7.2-glibc.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- src/GBA.cpp -+++ src/GBA.cpp -@@ -1130,7 +1130,7 @@ - bool CPUIsZipFile(const char * file) - { - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".zip") == 0) -@@ -1145,7 +1145,7 @@ - { - cpuIsMultiBoot = false; - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".gba") == 0) -@@ -1169,7 +1169,7 @@ - bool CPUIsGBABios(const char * file) - { - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".gba") == 0) -@@ -1189,7 +1189,7 @@ - bool CPUIsELF(const char *file) - { - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".elf") == 0) ---- src/Util.cpp -+++ src/Util.cpp -@@ -478,7 +478,7 @@ - { - cpuIsMultiBoot = false; - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".gba") == 0) -@@ -502,7 +502,7 @@ - bool utilIsGBImage(const char * file) - { - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".gb") == 0) -@@ -522,7 +522,7 @@ - bool utilIsZipFile(const char *file) - { - if(strlen(file) > 4) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".zip") == 0) -@@ -552,7 +552,7 @@ - bool utilIsGzipFile(const char *file) - { - if(strlen(file) > 3) { -- char * p = strrchr(file,'.'); -+ const char * p = strrchr(file,'.'); - - if(p != NULL) { - if(_stricmp(p, ".gz") == 0) diff --git a/community/visualboyadvance/1.7.2-homedir.patch b/community/visualboyadvance/1.7.2-homedir.patch deleted file mode 100644 index e93d32cf5..000000000 --- a/community/visualboyadvance/1.7.2-homedir.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/sdl/SDL.cpp.orig 2004-08-15 02:43:28.232750688 -0400 -+++ src/sdl/SDL.cpp 2004-08-15 02:44:01.557684528 -0400 -@@ -887,7 +887,7 @@ - - if(home != NULL) { - fprintf(stderr, "Searching home directory: %s\n", home); -- sprintf(path, "%s%c%s", home, FILE_SEP, name); -+ sprintf(path, "%s%c.%s%c%s", home, FILE_SEP, EXE_NAME, FILE_SEP, name); - f = fopen(path, "r"); - if(f != NULL) - return f; diff --git a/community/visualboyadvance/1.7.2-uninit.patch b/community/visualboyadvance/1.7.2-uninit.patch deleted file mode 100644 index b54c2e8ab..000000000 --- a/community/visualboyadvance/1.7.2-uninit.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ru src/gtk/window.cpp src/gtk/window.cpp ---- src/gtk/window.cpp 2004-05-14 00:31:58.000000000 +1000 -+++ src/gtk/window.cpp 2007-03-17 14:57:22.000000000 -0500 -@@ -91,7 +91,8 @@ - m_iFilterIBMin (FirstFilterIB), - m_iFilterIBMax (LastFilterIB), - m_iJoypadMin (1), -- m_iJoypadMax (4) -+ m_iJoypadMax (4), -+ m_poKeymap (NULL) - { - m_poXml = _poXml; - m_poFileOpenDialog = NULL; diff --git a/community/visualboyadvance/PKGBUILD b/community/visualboyadvance/PKGBUILD deleted file mode 100644 index 4ae2014b7..000000000 --- a/community/visualboyadvance/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# $Id: PKGBUILD 63767 2012-02-05 12:13:21Z ibiru $ -# Maintainer: Daenyth -# Contributor: Eric Belanger <belanger@astro.umontreal.ca> -# Contributor: Shahar Weiss <sweiss4@gmx.net> -# Contributor: Alexander Rødseth <rodseth@gmail.com> -pkgname=visualboyadvance -pkgver=1.7.2 -pkgrel=9 -pkgdesc="Emulator for Gameboy and Gameboy Advance systems" -arch=('x86_64' 'i686') -url="http://vba.ngemu.com/" -license=("GPL") -depends=('libglademm' 'sdl') -makedepends=('nasm') -backup=('etc/VisualBoyAdvance.cfg') -source=("http://downloads.sourceforge.net/sourceforge/vba/VisualBoyAdvance-src-$pkgver.tar.gz" - '1.7.2-deprecatedsigc++.patch' '1.7.2-gcc34.patch' '1.7.2-gcc41.patch' - '1.7.2-glibc.patch' '1.7.2-homedir.patch' '1.7.2-uninit.patch') -md5sums=('cc02339e3fd8efd9f23121b0a2f81fd8' - '95596fbe499c23b8154142b5789cd630' - 'e7c816ac1adf832c8bd3f6b899d6b935' - '22c90f2d75856c8407f70b19038105a4' - 'e7a5188b483e2c4d2fee2a5efb088908' - 'ef02d9be59ab74afa9a8f12e17e359d4' - '004c269a9cdbfa0f4b7fd51978f78705') - -build() { - cd "$srcdir/VisualBoyAdvance-$pkgver" - - sed -i 's:setjmp(png_ptr->jmpbuf):1+1==3:' src/Util.cpp - - patch -Np0 < "$srcdir/$pkgver-homedir.patch" - patch -Np0 < "$srcdir/$pkgver-gcc34.patch" - patch -Np0 < "$srcdir/$pkgver-gcc41.patch" - patch -Np0 < "$srcdir/$pkgver-deprecatedsigc++.patch" - patch -Np0 < "$srcdir/$pkgver-uninit.patch" - patch -Np0 < "$srcdir/$pkgver-glibc.patch" - ./configure --prefix=/usr --sysconfdir=/etc --enable-gtk=2.4 - make -} - -package() { - cd "$srcdir/VisualBoyAdvance-$pkgver" - - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/vlock/ChangeLog b/community/vlock/ChangeLog deleted file mode 100644 index 61e8e1dd3..000000000 --- a/community/vlock/ChangeLog +++ /dev/null @@ -1,18 +0,0 @@ -2008-08-30 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 2.2.2 - - * PKGBUILD: fixed license (GPL -> GPL2), removed sed line in favour of - configure - - * vlock.install: added, it creates the vlock group - - -2007-09-10 Corrado Primier <bardo@aur.archlinux.org> - - * Version bump: 2.1 - - -2007-06-28 tardo <tardo@nagi-fanboi.net> - - * Built for x86_64 diff --git a/community/vlock/PKGBUILD b/community/vlock/PKGBUILD deleted file mode 100644 index 7beb1f60e..000000000 --- a/community/vlock/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# $Id: PKGBUILD 58034 2011-11-05 17:24:10Z ttopper $ -# Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de> -# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=vlock -pkgver=2.2.3 -pkgrel=1 -pkgdesc="A small console locking program" -url="http://cthulhu.c3d2.de/~toidinamai/vlock/vlock.html" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -depends=('pam') -install=vlock.install -source=("http://cthulhu.c3d2.de/~toidinamai/vlock/archive/$pkgname-$pkgver.tar.bz2") -md5sums=('2dd5677c97f2707db62532ae24f58433') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - # vlock gid is 129 - make DESTDIR="$pkgdir" VLOCK_GROUP=129 install -} - -# vim:set ts=2 sw=2 et: diff --git a/community/vlock/vlock.install b/community/vlock/vlock.install deleted file mode 100644 index 4cf592b35..000000000 --- a/community/vlock/vlock.install +++ /dev/null @@ -1,18 +0,0 @@ -post_install() { - echo -n 'Adding vlock group... ' - groupadd -g 129 vlock && echo 'done.' -} - -post_upgrade() { - cut -d: -f1 /etc/group | grep ^vlock$ >/dev/null - if [ $? == 1 ] ; then - post_install - fi -} - -post_remove() { - echo -n 'Removing vlock group... ' - groupdel vlock && echo 'done.' -} - -# vim:set ts=2 sw=2 et: diff --git a/community/wayland/PKGBUILD b/community/wayland/PKGBUILD new file mode 100644 index 000000000..ce252694a --- /dev/null +++ b/community/wayland/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 84054 2013-02-09 14:17:18Z seblu $ +# Maintainer: Sébastien Luttringer +# Contributor: Joel Teichroeb <joel@teichroeb.net> + +pkgname=wayland +pkgver=1.0.4 +pkgrel=1 +pkgdesc='A computer display server protocol' +arch=('i686' 'x86_64') +url='http://wayland.freedesktop.org' +license=('MIT') +depends=('libffi' 'expat') +makedepends=('doxygen') +options=(!libtool) +source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") +sha1sums=('2f65654a54366cacd39a69bc5a41fea21b357e34') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/webfs/webfsd.launcher b/community/webfs/webfsd.launcher deleted file mode 100644 index fe2170617..000000000 --- a/community/webfs/webfsd.launcher +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash - -# wrapper script for systemd service - -[ -f /etc/conf.d/webfsd ] && . /etc/conf.d/webfsd - -# -F for simple target -exec /usr/bin/webfsd -F ${WEBFSD_ARGS} - diff --git a/community/wesnoth/boost_foreach.patch b/community/wesnoth/boost_foreach.patch deleted file mode 100644 index 95b98828e..000000000 --- a/community/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/winefish/PKGBUILD b/community/winefish/PKGBUILD deleted file mode 100644 index 1a098a70a..000000000 --- a/community/winefish/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# $Id: PKGBUILD 64363 2012-02-11 23:24:33Z allan $ -# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com> -# Contributor: Allan McRae <allan@archlinux.org> -# Contributor: Claudio Riva <firetux83@gmail.com> -# Contributor: Stefan Husmann <stefan-husmann@t-online.de> - -pkgname=winefish -pkgver=1.3.3 -pkgrel=11 -pkgdesc="LaTeX editor based on Bluefish with auto-completion and syntax highlighting" -url="http://winefish.berlios.de/" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -depends=('gtk2' 'desktop-file-utils' 'shared-mime-info') -makedepends=('pkgconfig') -optdepends=('aspell: for spell check') -install=$pkgname.install -source=(http://download.berlios.de/$pkgname/$pkgname-$pkgver.tgz) -md5sums=('63531e4dde7a53ab3a74e1152c7af1e9') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-update-databases \ - --with-freedesktop_org-menu=/usr/share/applications \ - --with-icon-path=/usr/share/pixmaps --mandir=/usr/share/man - make -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} diff --git a/community/winefish/winefish.install b/community/winefish/winefish.install deleted file mode 100644 index 8ae71b3e6..000000000 --- a/community/winefish/winefish.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_upgrade() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} - -post_remove() { - update-desktop-database -q - update-mime-database usr/share/mime &> /dev/null -} diff --git a/community/wt/wt-boost-1.47.patch b/community/wt/wt-boost-1.47.patch deleted file mode 100644 index 919e1371f..000000000 --- a/community/wt/wt-boost-1.47.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -wbBur wt-3.1.10.q/src/CMakeLists.txt wt-3.1.10/src/CMakeLists.txt ---- wt-3.1.10.q/src/CMakeLists.txt 2011-07-26 00:58:19.000000000 +0400 -+++ wt-3.1.10/src/CMakeLists.txt 2011-06-24 18:51:54.000000000 +0400 -@@ -236,6 +236,7 @@ - web/TimeUtil.C - web/XSSFilter.C - web/XSSUtils.C -+web/random_device.cpp - web/base64.cpp - Plain_html.C - Boot_html.C diff --git a/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch b/community/wxgtk2.9/wxGTK-2.9.3.1-collision.patch deleted file mode 100644 index cd6c1c13b..000000000 --- a/community/wxgtk2.9/wxGTK-2.9.3.1-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) $(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/xemacs/xemacs-21.5.29-optimization-bug.patch b/community/xemacs/xemacs-21.5.29-optimization-bug.patch deleted file mode 100644 index 32a1a02c2..000000000 --- a/community/xemacs/xemacs-21.5.29-optimization-bug.patch +++ /dev/null @@ -1,14 +0,0 @@ -Work around a GCC optimization bug as described in -http://tracker.xemacs.org/XEmacs/its/issue354 - ---- src/dumper.c.~1~ 2008-01-26 09:54:11.000000000 +0100 -+++ src/dumper.c 2008-05-03 10:17:03.000000000 +0200 -@@ -2584,7 +2584,7 @@ - #endif /* !WIN32_NATIVE */ - - --static int -+int - pdump_file_try (Wexttext *exe_path) - { - Wexttext *w = exe_path + wext_strlen (exe_path); diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch deleted file mode 100644 index d4508c916..000000000 --- a/community/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/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch deleted file mode 100644 index 8372b4144..000000000 --- a/community/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/xmonad/xmonad-0.10-x11-1.6.patch b/community/xmonad/xmonad-0.10-x11-1.6.patch deleted file mode 100644 index 5b7afaf3b..000000000 --- a/community/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/xmonad/xmonad.desktop b/community/xmonad/xmonad.desktop deleted file mode 100644 index 0af0f2d9b..000000000 --- a/community/xmonad/xmonad.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=Xmonad GNOME -Comment=Tiling window manager -TryExec=/usr/bin/gnome-session -Exec=gnome-session --session=xmonad -Type=XSession -Icon=/usr/share/pixmaps/xmonad.svg diff --git a/community/xmonad/xmonad.png b/community/xmonad/xmonad.png Binary files differdeleted file mode 100644 index d957f62f8..000000000 --- a/community/xmonad/xmonad.png +++ /dev/null diff --git a/community/xmonad/xmonad.session b/community/xmonad/xmonad.session deleted file mode 100644 index c0bd16781..000000000 --- a/community/xmonad/xmonad.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/xmoto/xmoto-0.5.9-libpng15.patch b/community/xmoto/xmoto-0.5.9-libpng15.patch deleted file mode 100644 index 0410c81c5..000000000 --- a/community/xmoto/xmoto-0.5.9-libpng15.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/image/tim_png.cpp 2011-10-11 22:18:11.000000000 +0200 -+++ b/src/image/tim_png.cpp 2012-01-19 19:58:24.000000000 +0100 -@@ -24,6 +24,7 @@ - */ - #include <stdio.h> - #include <string.h> -+#include <zlib.h> - #include "tim.h" - #include "png.h" - diff --git a/community/xmoto/xmoto.desktop b/community/xmoto/xmoto.desktop deleted file mode 100644 index 5ae6fe226..000000000 --- a/community/xmoto/xmoto.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Icon=/usr/share/xmoto/xmoto_icone_x.ico -Exec=/usr/bin/xmoto -Terminal=false -StartupNotify=false - -Name=XMoto -GenericName=Game -Comment=is a 2D physics-based motocross game. - -Categories=Game; diff --git a/community/xv/PKGBUILD b/community/xv/PKGBUILD deleted file mode 100644 index bbb0fdc18..000000000 --- a/community/xv/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# $Id: PKGBUILD 63794 2012-02-05 12:15:48Z ibiru $ -# Maintainer: Eric Bélanger <eric@archlinux.org> - -pkgname=xv -pkgver=3.10a -pkgrel=15 -pkgdesc="A nice image viewer" -arch=('i686' 'x86_64') -url="http://www.trilon.com/xv/" -license=('custom') -depends=('libpng' 'libx11' 'libtiff') -makedepends=('libxt' 'jasper') -options=('!emptydirs') -source=(ftp://ftp.trilon.com/pub/xv/${pkgname}-${pkgver}.tar.gz \ - http://downloads.sourceforge.net/sourceforge/png-mng/xv-3.10a-jumbo-patches-20070520.tar.gz \ - license.txt xv-3.10a-libpng15.patch) -sha1sums=('092f8eb100f16d6b91c88b126c2b2b998eb09b99' - 'd00308c1687d9d803d26ef40c73d19a0f593c626' - '4561344e8f2c30eee9c55b14a14f062d89d6e7b7' - '3d19aa0c6ecc8b554081906babe0b4f9a6946da3') - -build() { - cd "${srcdir}" - tar -cJf xv-${pkgver}-source.tar.xz xv-${pkgver} - cd ${pkgname}-${pkgver} - patch -p1 < ../xv-3.10a-jumbo-fix-enh-patch-20070520.txt - patch -p0 < ../xv-3.10a-libpng15.patch - make JP2KDIR=/usr/lib -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - install -d "${pkgdir}"/usr/{bin,lib,share/man/man1} - make DESTDIR="${pkgdir}" PREFIX=/usr install - install -D -m644 "${srcdir}/license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/license.txt" - -# installing source tarball (to comply with license) - install -D -m644 "${srcdir}/xv-${pkgver}-source.tar.xz" "${pkgdir}/usr/share/doc/xv/xv-${pkgver}-source.tar.xz" - ln -s "/usr/share/licenses/${pkgname}/license.txt" "${pkgdir}/usr/share/doc/xv/license.txt" -} diff --git a/community/xv/license.txt b/community/xv/license.txt deleted file mode 100644 index 7dd87c233..000000000 --- a/community/xv/license.txt +++ /dev/null @@ -1,139 +0,0 @@ -XV Licensing Information ------------------------- -XV IS SHAREWARE FOR PERSONAL USE ONLY. - -You may use XV for your own amusement, and if you find it nifty, -useful, generally cool, or of some value to you, your registration fee -would be greatly appreciated. $25 is the standard registration fee, -though of course, larger amounts are quite welcome. Folks who donate -$40 or more can receive a printed, bound copy of the XV manual for no -extra charge. If you want one, just ask. BE SURE TO SPECIFY THE -VERSION OF XV THAT YOU ARE USING! - -COMMERCIAL, GOVERNMENT, AND INSTITUTIONAL USERS MUST REGISTER THEIR -COPIES OF XV. - -This does *not* mean that you are required to register XV just because -you play with it on the workstation in your office. This falls under -the heading of 'personal use'. If you are a sysadmin, you can put XV -up in a public directory for your users amusement. Again, 'personal -use', albeit plural. - -On the other hand, if you use XV in the course of doing your work, -whatever your 'work' may happen to be, you *must* register your -copy of XV. (Note: If you are a student, and you use XV to do -classwork or research, you should get your professor/teacher/advisor -to purchase an appropriate number of copies.) - -XV licenses are $25 each. You should purchase one license per -workstation, or one per XV user, whichever is the smaller number. XV -is *not* sold on a 'number of concurrent users' basis. If XV was some -$1000 program, yes, that would be a reasonable request, but at $25, -it's not. Also, given that XV is completely unlocked, there is no way -to enforce any 'number of concurrent users' limits, so it isn't sold -that way. - -Printed and bound copies of the 100-odd page XV manual are available -for $15 each. Note that manuals are *only* sold with, at minimum, an -equal number of licenses. (e.g. if you purchase 5 licenses, you can -also purchase *up to* 5 copies of the manual) - -The source code to the program can be had (as a compressed 'tar' file -split over a couple 3.5" MS-DOS formatted floppies) for $15, for those -who don't have ftp capabilities. - -Orders outside the US and Canada must add an additional $5 per manual -ordered to cover the additional shipping charges. - -Checks, money orders, and purchase orders are accepted. Credit cards -are not. All forms of payment must be payable in US Funds. Checks -must be payable through a US bank (or a US branch of a non-US bank). -Purchase orders for less than $50, while still accepted, are not -encouraged. - -All payments should be payable to 'John Bradley', and mailed to: - John Bradley - 1053 Floyd Terrace - Bryn Mawr, PA 19010 - USA - - -Site Licenses -------------- -If you are planning to purchase 10 or more licenses, site licenses are -available, at a substantial discount. Site licenses let you run XV on -any and all computing equipment at the site, for any purpose -whatsoever. The site license covers the current version of XV, and -any versions released within one year of the licensing date. You are -also allowed to duplicate and distribute an unlimited number of copies -of the XV manual, but only for use within the site. Covered versions -of the software may be run in perpetuity. - -Also, it should be noted that a 'site' can be defined as anything -you'd like. It can be a physical location (a room, building, -location, etc.), an organizational grouping (a workgroup, department, -division, etc.) or any other logical grouping ("the seventeen -technical writers scattered about our company", etc.). - -The site license cost will be based on your estimate of the number of -XV users or workstations at your site, whichever is the smaller -number. - -If you are interested in obtaining a site license, please contact the -author via electronic mail or FAX (see below for details). Send -information regarding your site (the name or definition of the 'site', -a physical address, a fax number, and an estimate of the number of -users or workstations), and we'll get a site license out to you for -your examination. - - -Copyright Notice ----------------- -XV is Copyright 1989, 1994 by John Bradley - -Permission to copy and distribute XV in its entirety, for -non-commercial purposes, is hereby granted without fee, provided that -this license information and copyright notice appear in all copies. - -If you redistribute XV, the *entire* contents of this distribution -must be distributed, including the README, and INSTALL files, the -sources, and the complete contents of the 'docs' directory. - -Note that distributing XV 'bundled' in with any product is considered -to be a 'commercial purpose'. - -Also note that any copies of XV that are distributed MUST be built -and/or configured to be in their 'unregistered copy' mode, so that it -is made obvious to the user that XV is shareware, and that they should -consider registering, or at least reading this information. - -The software may be modified for your own purposes, but modified -versions may not be distributed without prior consent of the author. - -This software is provided 'as-is', without any express or implied -warranty. In no event will the author be held liable for any damages -arising from the use of this software. - -If you would like to do something with XV that this copyright -prohibits (such as distributing it with a commercial product, using -portions of the source in some other program, distributing registered -copies, etc.), please contact the author (preferably via email). -Arrangements can probably be worked out. - - -The author may be contacted via: - US Mail: John Bradley - 1053 Floyd Terrace - Bryn Mawr, PA 19010 - - FAX: (610) 520-2042 - -Electronic Mail regarding XV should be sent to one of these three addresses: - xv@devo.dccs.upenn.edu - general XV questions - xvbiz@devo.dccs.upenn.edu - all XV licensing questions - xvtech@devo.dccs.upenn.edu - bug reports, technical questions - -Please do *not* send electronic mail directly to the author, as he -gets more than enough as it is. - - diff --git a/community/xv/xv-3.10a-libpng15.patch b/community/xv/xv-3.10a-libpng15.patch deleted file mode 100644 index 43c517668..000000000 --- a/community/xv/xv-3.10a-libpng15.patch +++ /dev/null @@ -1,520 +0,0 @@ ---- xvinfo.c -+++ xvinfo.c -@@ -26,7 +26,7 @@ - #define INFOHIGH 270 - - /* max length of an Info String */ --#define ISTRLEN 80 -+#define ISTRLEN 256 - - /* baseline of top line of text */ - #define TOPBASE (36 + penn_height/2 + 4 + 8 + ASCENT) ---- xvpng.c -+++ xvpng.c -@@ -31,6 +31,7 @@ - - #ifdef HAVE_PNG - -+#include "zlib.h" - #include "png.h" - - /*** Stuff for PNG Dialog box ***/ -@@ -41,7 +42,9 @@ - #define COMPRESSION 6 /* default zlib compression level, not max - (Z_BEST_COMPRESSION) */ - --#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) -+/* old -+#define HAVE_tRNS (info_ptr->valid & PNG_INFO_tRNS) */ -+#define HAVE_tRNS png_get_valid(png_ptr,info_ptr,PNG_INFO_tRNS) - - #define DWIDE 86 - #define DHIGH 104 -@@ -444,6 +447,10 @@ - byte *p, *png_line; - char software[256]; - char *savecmnt; -+ /* for storing values until all are accumulated, so that the image header can be set in full */ -+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type; -+ png_uint_32 _width,_height; -+ png_time _mod_time; - - if ((png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, - png_xv_error, png_xv_warning)) == NULL) { -@@ -458,7 +465,7 @@ - FatalError(software); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -@@ -489,8 +496,8 @@ - png_set_filter(png_ptr, 0, filter); - } - -- info_ptr->width = w; -- info_ptr->height = h; -+ _width = w; -+ _height = h; - if (w <= 0 || h <= 0) { - SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", - fbasename, w, h); -@@ -498,7 +505,7 @@ - return -1; - } - -- info_ptr->interlace_type = interCB.val ? 1 : 0; -+ _interlace_type = interCB.val ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE; - - linesize = 0; /* quiet a compiler warning */ - -@@ -542,40 +549,44 @@ - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; -- info_ptr->bit_depth = 8; -+ _color_type = PNG_COLOR_TYPE_RGB; -+ _bit_depth = 8; - } else /* ptype == PIC8 */ { - linesize = w; -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -+ _color_type = PNG_COLOR_TYPE_PALETTE; - if (numuniqcols <= 2) -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - else - if (numuniqcols <= 4) -- info_ptr->bit_depth = 2; -+ _bit_depth = 2; - else - if (numuniqcols <= 16) -- info_ptr->bit_depth = 4; -+ _bit_depth = 4; - else -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - - for (i = 0; i < numuniqcols; i++) { - palette[i].red = r1[i]; - palette[i].green = g1[i]; - palette[i].blue = b1[i]; - } -- info_ptr->num_palette = numuniqcols; -- info_ptr->palette = palette; -+/* cannot find a setter for this, unsure if it is necessary anymore... - info_ptr->valid |= PNG_INFO_PLTE; -+*/ -+ /* set the header just in case it's needed */ -+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, -+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); -+ png_set_PLTE(png_ptr,info_ptr,palette,numuniqcols); - } - } - - else if (colorType == F_GREYSCALE || colorType == F_BWDITHER) { -- info_ptr->color_type = PNG_COLOR_TYPE_GRAY; -+ _color_type = PNG_COLOR_TYPE_GRAY; - if (colorType == F_BWDITHER) { - /* shouldn't happen */ - if (ptype == PIC24) FatalError("PIC24 and B/W Stipple in WritePNG()"); - -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - if (MONO(r1[0], g1[0], b1[0]) > MONO(r1[1], g1[1], b1[1])) { - remap[0] = 1; - remap[1] = 0; -@@ -595,7 +606,7 @@ - png_destroy_write_struct(&png_ptr, &info_ptr); - return -1; - } -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - } - else /* ptype == PIC8 */ { - int low_precision; -@@ -617,7 +628,7 @@ - for (; i < 256; i++) - remap[i]=0; /* shouldn't be necessary, but... */ - -- info_ptr->bit_depth = 8; -+ _bit_depth = 8; - - /* Note that this fails most of the time because of gamma */ - /* (and that would be a bug: GRR FIXME) */ -@@ -636,7 +647,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 0xf; - } -- info_ptr->bit_depth = 4; -+ _bit_depth = 4; - - /* try to adjust to 2-bit precision grayscale */ - -@@ -652,7 +663,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 3; - } -- info_ptr->bit_depth = 2; -+ _bit_depth = 2; - - /* try to adjust to 1-bit precision grayscale */ - -@@ -668,7 +679,7 @@ - for (i = 0; i < numuniqcols; i++) { - remap[i] &= 1; - } -- info_ptr->bit_depth = 1; -+ _bit_depth = 1; - } - } - } -@@ -677,6 +688,9 @@ - else - png_error(png_ptr, "Unknown colorstyle in WritePNG"); - -+ png_set_IHDR(png_ptr,info_ptr,_width,_height,_bit_depth,_color_type, -+ _interlace_type,PNG_COMPRESSION_TYPE_DEFAULT,PNG_FILTER_TYPE_DEFAULT); -+ - if ((text = (png_textp)malloc(sizeof(png_text)))) { - sprintf(software, "XV %s", REVDATE); - -@@ -685,20 +699,22 @@ - text->text = software; - text->text_length = strlen(text->text); - -- info_ptr->max_text = 1; -- info_ptr->num_text = 1; -- info_ptr->text = text; -+/* max_text seems to be internal only now, do not set -+ info_ptr->max_text = 1; */ -+ png_set_text(png_ptr,info_ptr,text,1); - } - - Display_Gamma = gDial.val; /* Save the current gamma for loading */ - - // GRR FIXME: add .Xdefaults option to omit writing gamma (size, cumulative errors when editing)--alternatively, modify save box to include "omit" checkbox -- info_ptr->gamma = 1.0/gDial.val; -- info_ptr->valid |= PNG_INFO_gAMA; -+ png_set_gAMA(png_ptr,info_ptr,1.0/gDial.val); -+/* doesn't seem to be a way to set valid directly anymore, unnecessary maybe.. -+ info_ptr->valid |= PNG_INFO_gAMA; */ - -+/* might need to be png_write_info_before_PLTE() ... */ - png_write_info(png_ptr, info_ptr); - -- if (info_ptr->bit_depth < 8) -+ if (_bit_depth < 8) - png_set_packing(png_ptr); - - pass=png_set_interlace_handling(png_ptr); -@@ -711,13 +727,13 @@ - int j; - p = pic; - for (j = 0; j < h; ++j) { -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY) { -+ if (_color_type == PNG_COLOR_TYPE_GRAY) { - int k; - for (k = 0; k < w; ++k) - png_line[k] = ptype==PIC24 ? MONO(p[k*3], p[k*3+1], p[k*3+2]) : - remap[pc2nc[p[k]]]; - png_write_row(png_ptr, png_line); -- } else if (info_ptr->color_type == PNG_COLOR_TYPE_PALETTE) { -+ } else if (_color_type == PNG_COLOR_TYPE_PALETTE) { - int k; - for (k = 0; k < w; ++k) - png_line[k] = pc2nc[p[k]]; -@@ -739,28 +755,31 @@ - (savecmnt = (char *)malloc((strlen(picComments) + 1)*sizeof(char)))) { - png_textp tp; - char *comment, *key; -+ int nt; -+ int mt; - - strcpy(savecmnt, picComments); - key = savecmnt; -+ png_get_text(png_ptr,info_ptr,&tp,&mt); /* to get 'max_text' */ - tp = text; -- info_ptr->num_text = 0; -+ nt = 0; - - comment = strchr(key, ':'); - - do { - /* Allocate a larger structure for comments if necessary */ -- if (info_ptr->num_text >= info_ptr->max_text) -+ if (nt >= mt) - { - if ((tp = -- realloc(text, (info_ptr->num_text + 2)*sizeof(png_text))) == NULL) -+ realloc(text, (nt + 2)*sizeof(png_text))) == NULL) - { - break; - } - else - { - text = tp; -- tp = &text[info_ptr->num_text]; -- info_ptr->max_text += 2; -+ tp = &text[nt]; -+ mt += 2; - } - } - -@@ -810,7 +829,7 @@ - } - - tp->compression = tp->text_length > 640 ? 0 : -1; -- info_ptr->num_text++; -+ nt++; - tp++; - } - } -@@ -834,27 +853,29 @@ - tp->text = key; - tp->text_length = q - key; - tp->compression = tp->text_length > 750 ? 0 : -1; -- info_ptr->num_text++; -+ nt++; - key = NULL; - } - } while (key && *key); -+ png_set_text(png_ptr,info_ptr,text,nt); - } - else { -- info_ptr->num_text = 0; -+ png_set_text(png_ptr,info_ptr,text,0); - } - } -- info_ptr->text = text; - -- png_convert_from_time_t(&(info_ptr->mod_time), time(NULL)); -- info_ptr->valid |= PNG_INFO_tIME; -+ png_convert_from_time_t(&_mod_time, time(NULL)); -+ png_set_tIME(png_ptr,info_ptr,&_mod_time); -+/* dunno how to set validity -+ info_ptr->valid |= PNG_INFO_tIME; */ - - png_write_end(png_ptr, info_ptr); - fflush(fp); /* just in case we core-dump before finishing... */ - - if (text) { - free(text); -- /* must do this or png_destroy_write_struct() 0.97+ will free text again: */ -- info_ptr->text = (png_textp)NULL; -+ /* must do this or png_destroy_write_struct() 0.97+ will free text again: -+ info_ptr->text = (png_textp)NULL; */ - if (savecmnt) - { - free(savecmnt); -@@ -886,6 +907,14 @@ - int pass; - int gray_to_rgb; - size_t commentsize; -+ /* temp storage vars for libpng15 migration */ -+ int _bit_depth,_color_type,_interlace_type,_compression_type,_filter_type,_num_text,_num_palette; -+ png_uint_32 _width,_height; -+ png_timep _mod_time; -+ double _gamma; -+ png_textp _text; -+ png_colorp _palette; -+ png_color_16p _background; - - fbasename = BaseName(fname); - -@@ -921,7 +950,7 @@ - FatalError("malloc failure in LoadPNG"); - } - -- if (setjmp(png_ptr->jmpbuf)) { -+ if (setjmp(png_jmpbuf(png_ptr))) { - fclose(fp); - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if (!read_anything) { -@@ -945,8 +974,10 @@ - #endif - png_read_info(png_ptr, info_ptr); - -- pinfo->w = pinfo->normw = info_ptr->width; -- pinfo->h = pinfo->normh = info_ptr->height; -+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); -+ -+ pinfo->w = pinfo->normw = _width; -+ pinfo->h = pinfo->normh = _height; - if (pinfo->w <= 0 || pinfo->h <= 0) { - SetISTR(ISTR_WARNING, "%s: image dimensions out of range (%dx%d)", - fbasename, pinfo->w, pinfo->h); -@@ -957,9 +988,9 @@ - pinfo->frmType = F_PNG; - - sprintf(pinfo->fullInfo, "PNG, %d bit ", -- info_ptr->bit_depth * info_ptr->channels); -+ _bit_depth * png_get_channels(png_ptr,info_ptr)); - -- switch(info_ptr->color_type) { -+ switch(_color_type) { - case PNG_COLOR_TYPE_PALETTE: - strcat(pinfo->fullInfo, "palette color"); - break; -@@ -983,15 +1014,17 @@ - - sprintf(pinfo->fullInfo + strlen(pinfo->fullInfo), - ", %sinterlaced. (%d bytes)", -- info_ptr->interlace_type ? "" : "non-", filesize); -+ _interlace_type ? "" : "non-", filesize); - -- sprintf(pinfo->shrtInfo, "%lux%lu PNG", info_ptr->width, info_ptr->height); -+ sprintf(pinfo->shrtInfo, "%lux%lu PNG", _width, _height); - -- if (info_ptr->bit_depth < 8) -+ if (_bit_depth < 8) - png_set_packing(png_ptr); - -- if (info_ptr->valid & PNG_INFO_gAMA) -- png_set_gamma(png_ptr, Display_Gamma, info_ptr->gamma); -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_gAMA)) { -+ png_get_gAMA(png_ptr,info_ptr,&_gamma); -+ png_set_gamma(png_ptr, Display_Gamma, _gamma); -+ } - /* - *else - * png_set_gamma(png_ptr, Display_Gamma, 0.45); -@@ -1000,7 +1033,7 @@ - gray_to_rgb = 0; /* quiet a compiler warning */ - - if (have_imagebg) { -- if (info_ptr->bit_depth == 16) { -+ if (_bit_depth == 16) { - my_background.red = imagebgR; - my_background.green = imagebgG; - my_background.blue = imagebgB; -@@ -1013,8 +1046,8 @@ - } - png_set_background(png_ptr, &my_background, PNG_BACKGROUND_GAMMA_SCREEN, - 0, Display_Gamma); -- if ((info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA || -- (info_ptr->color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && -+ if ((_color_type == PNG_COLOR_TYPE_GRAY_ALPHA || -+ (_color_type == PNG_COLOR_TYPE_GRAY && HAVE_tRNS)) && - (imagebgR != imagebgG || imagebgR != imagebgB)) /* i.e., colored bg */ - { - png_set_gray_to_rgb(png_ptr); -@@ -1022,8 +1055,9 @@ - gray_to_rgb = 1; - } - } else { -- if (info_ptr->valid & PNG_INFO_bKGD) { -- png_set_background(png_ptr, &info_ptr->background, -+ if (png_get_valid(png_ptr,info_ptr,PNG_INFO_bKGD)) { -+ png_get_bKGD(png_ptr,info_ptr,&_background); -+ png_set_background(png_ptr, _background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); - } else { - my_background.red = my_background.green = my_background.blue = -@@ -1033,13 +1067,13 @@ - } - } - -- if (info_ptr->bit_depth == 16) -+ if (_bit_depth == 16) - png_set_strip_16(png_ptr); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) -+ if (_color_type == PNG_COLOR_TYPE_GRAY || -+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) - { -- if (info_ptr->bit_depth == 1) -+ if (_bit_depth == 1) - pinfo->colType = F_BWDITHER; - else - pinfo->colType = F_GREYSCALE; -@@ -1049,9 +1083,11 @@ - pass=png_set_interlace_handling(png_ptr); - - png_read_update_info(png_ptr, info_ptr); -+ /* get HIDR again just in case the info_ptr changed */ -+ png_get_IHDR(png_ptr,info_ptr,&_width,&_height,&_bit_depth,&_color_type,&_interlace_type,NULL,NULL); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB || -- info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) -+ if (_color_type == PNG_COLOR_TYPE_RGB || -+ _color_type == PNG_COLOR_TYPE_RGB_ALPHA || gray_to_rgb) - { - linesize = 3 * pinfo->w; - if (linesize/3 < pinfo->w) { /* know pinfo->w > 0 (see above) */ -@@ -1065,16 +1101,17 @@ - } else { - linesize = pinfo->w; - pinfo->type = PIC8; -- if (info_ptr->color_type == PNG_COLOR_TYPE_GRAY || -- info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { -+ if (_color_type == PNG_COLOR_TYPE_GRAY || -+ _color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { - for (i = 0; i < 256; i++) - pinfo->r[i] = pinfo->g[i] = pinfo->b[i] = i; - } else { - pinfo->colType = F_FULLCOLOR; -- for (i = 0; i < info_ptr->num_palette; i++) { -- pinfo->r[i] = info_ptr->palette[i].red; -- pinfo->g[i] = info_ptr->palette[i].green; -- pinfo->b[i] = info_ptr->palette[i].blue; -+ png_get_PLTE(png_ptr,info_ptr,&_palette,&_num_palette); -+ for (i = 0; i < _num_palette; i++) { -+ pinfo->r[i] = _palette[i].red; -+ pinfo->g[i] = _palette[i].green; -+ pinfo->b[i] = _palette[i].blue; - } - } - } -@@ -1092,7 +1129,7 @@ - png_error(png_ptr, "can't allocate space for PNG image"); - } - -- png_start_read_image(png_ptr); -+ /*png_start_read_image(png_ptr); -- causes a warning and seems to be unnecessary */ - - for (i = 0; i < pass; i++) { - byte *p = pinfo->pic; -@@ -1106,22 +1143,23 @@ - - png_read_end(png_ptr, info_ptr); - -- if (info_ptr->num_text > 0) { -+ png_get_text(png_ptr,info_ptr,&_text,&_num_text); -+ if (_num_text > 0) { - commentsize = 1; - -- for (i = 0; i < info_ptr->num_text; i++) -- commentsize += strlen(info_ptr->text[i].key) + 1 + -- info_ptr->text[i].text_length + 2; -+ for (i = 0; i < _num_text; i++) -+ commentsize += strlen(_text[i].key) + 1 + -+ _text[i].text_length + 2; - - if ((pinfo->comment = malloc(commentsize)) == NULL) { - png_warning(png_ptr,"can't allocate comment string"); - } - else { - pinfo->comment[0] = '\0'; -- for (i = 0; i < info_ptr->num_text; i++) { -- strcat(pinfo->comment, info_ptr->text[i].key); -+ for (i = 0; i < _num_text; i++) { -+ strcat(pinfo->comment, _text[i].key); - strcat(pinfo->comment, "::"); -- strcat(pinfo->comment, info_ptr->text[i].text); -+ strcat(pinfo->comment, _text[i].text); - strcat(pinfo->comment, "\n"); - } - } -@@ -1143,7 +1181,7 @@ - { - SetISTR(ISTR_WARNING,"%s: libpng error: %s", fbasename, message); - -- longjmp(png_ptr->jmpbuf, 1); -+ longjmp(png_jmpbuf(png_ptr), 1); - } - - diff --git a/community/yaws/yaws.profile b/community/yaws/yaws.profile deleted file mode 100644 index 57303c1f8..000000000 --- a/community/yaws/yaws.profile +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/opt/yaws/bin diff --git a/community/zile/PKGBUILD b/community/zile/PKGBUILD index 4ed801004..34665a8fb 100644 --- a/community/zile/PKGBUILD +++ b/community/zile/PKGBUILD @@ -6,7 +6,7 @@ pkgname=zile pkgver=2.4.9 pkgrel=1 pkgdesc="A small, fast, and powerful Emacs clone" -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/zile/" license=('GPL3') depends=('acl' 'gc' 'ncurses') |
