diff options
Diffstat (limited to 'community')
41 files changed, 32 insertions, 1761 deletions
diff --git a/community/binutils-avr/PKGBUILD b/community/binutils-avr/PKGBUILD deleted file mode 100644 index d052033fd..000000000 --- a/community/binutils-avr/PKGBUILD +++ /dev/null @@ -1,72 +0,0 @@ -# $Id: PKGBUILD 60627 2011-12-15 18:55:59Z jelle $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: danst0 <danst0@west.de> - -pkgname=binutils-avr -pkgver=2.22 -pkgrel=1 -pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.gnu.org/software/binutils/" -license=('GPL') -depends=('glibc>=2.12-5' 'zlib') -options=('!libtool' '!distcc' '!ccache') -source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2{,.sig}) -md5sums=('ee0f10756c84979622b992a4a61ea3f5' - '6aea2485019497583e5c3f5fc4a39cd5') - -build() { - cd ${srcdir}/${pkgname/-avr}-${pkgver} - - mkdir build - cd build - - CC="gcc -L$(pwd)/bfd/.libs/" - if [ "${CARCH}" = "x86_64" ]; then - ../configure --build=$(../config.guess) \ - --disable-multilib \ - --disable-nls \ - --enable-64-bit-bfd \ - --enable-install-libbfd \ - --includedir=/usr/$(../config.guess)/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --target=avr - else - ../configure --build=$(../config.guess) \ - --disable-nls \ - --enable-install-libbfd \ - --includedir=/usr/$(../config.guess)/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --target=avr - fi - - # This checks the host environment and makes sure all the necessary tools are available to compile Binutils. - make configure-host - - make tooldir=/usr -} - -package() { - cd ${srcdir}/${pkgname/-avr}-${pkgver} - - cd build - make DESTDIR=${pkgdir} tooldir=/usr install - - rm -f ${pkgdir}/usr/lib/libiberty.a - - for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do - rm -f ${pkgdir}/usr/bin/${bin} || return 1 - done - - for info in as bfd binutils configure gprof ld standards; do - mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info - done -} - diff --git a/community/cuda-toolkit/PKGBUILD b/community/cuda-toolkit/PKGBUILD deleted file mode 100644 index e886b8a88..000000000 --- a/community/cuda-toolkit/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -pkgname=cuda-toolkit -pkgver=4.1.28 -pkgrel=2 -_fedver=14 -pkgdesc="NVIDIA's GPU programming toolkit" -arch=('i686' 'x86_64') - -url="http://www.nvidia.com/object/cuda_home.html" -license=('custom') -depends=('gcc-libs' 'opencl-nvidia') -optdepends=('gdb: for cuda-gdb') -if [ "$CARCH" = "i686" ]; then - _arch=32 - md5sums=('835d403e86f4b014b348c587ffb23c0d' - '5af5226b36cd3f9993f762f85b5d236a' - 'c0781c63e726eaf03e10135b42b85729') -else - _arch=64 - md5sums=('c82103da07d0e96f3d65d7b308b74446' - '5af5226b36cd3f9993f762f85b5d236a' - 'c0781c63e726eaf03e10135b42b85729') -fi - -install=cuda-toolkit.install -source=(http://developer.download.nvidia.com/compute/cuda/4_1/rel/toolkit/cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run - cuda-toolkit.sh - cuda-toolkit.conf) - -build() { - cd "$srcdir" -} - -package() { - cd "$srcdir" - - mkdir -p $pkgdir/opt/cuda-toolkit - sh cudatoolkit_${pkgver}_linux_${_arch}_fedora${_fedver}.run --keep -- --prefix=$pkgdir/opt/cuda-toolkit - - sed -i "/unsupported GNU/d" $pkgdir/opt/cuda-toolkit/include/host_config.h - sed -i "s|/build/pkg||g" $pkgdir/opt/cuda-toolkit/bin/nvvp - - install -Dm755 cuda-toolkit.sh $pkgdir/etc/profile.d/cuda-toolkit.sh - install -Dm644 cuda-toolkit.conf $pkgdir/etc/ld.so.conf.d/cuda-toolkit.conf - install -Dm644 $pkgdir/opt/cuda-toolkit/doc/EULA.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE - - mkdir -p $pkgdir/usr/lib - cd $pkgdir/usr/lib - ln -s /usr/lib/libncurses.so.5 libtinfo.so.5 -} diff --git a/community/cuda-toolkit/cuda-toolkit.conf b/community/cuda-toolkit/cuda-toolkit.conf deleted file mode 100644 index 0f55b39a7..000000000 --- a/community/cuda-toolkit/cuda-toolkit.conf +++ /dev/null @@ -1,2 +0,0 @@ -/opt/cuda-toolkit/lib64 -/opt/cuda-toolkit/lib diff --git a/community/cuda-toolkit/cuda-toolkit.install b/community/cuda-toolkit/cuda-toolkit.install deleted file mode 100644 index 4e1a1a6b7..000000000 --- a/community/cuda-toolkit/cuda-toolkit.install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - echo "You need to relogin in order for the cuda-toolkit binaries to appear in your path." - post_upgrade -} - -post_upgrade() { - ldconfig -r . -} diff --git a/community/cuda-toolkit/cuda-toolkit.sh b/community/cuda-toolkit/cuda-toolkit.sh deleted file mode 100755 index 737eb1d3e..000000000 --- a/community/cuda-toolkit/cuda-toolkit.sh +++ /dev/null @@ -1 +0,0 @@ -export PATH=$PATH:/opt/cuda-toolkit/bin diff --git a/community/extremetuxracer/libpng14.patch b/community/extremetuxracer/libpng14.patch deleted file mode 100644 index 5c9999857..000000000 --- a/community/extremetuxracer/libpng14.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Nur extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp ---- extremetuxracer-0.4.orig/src/ppgltk/images/png_reader.cpp 2007-09-01 19:38:12.000000000 +0300 -+++ extremetuxracer-0.4/src/ppgltk/images/png_reader.cpp 2010-01-25 03:47:21.000000000 +0200 -@@ -53,7 +53,7 @@ - if (!info_ptr) - { - png_destroy_read_struct(&png_ptr, -- (png_infopp)NULL, (png_infopp)NULL); -+ NULL, NULL); - fclose(fp); - return; - } -@@ -62,7 +62,7 @@ - if (!end_info) - { - png_destroy_read_struct(&png_ptr, &info_ptr, -- (png_infopp)NULL); -+ NULL); - fclose(fp); - return; - } -@@ -77,7 +77,7 @@ - - - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - - if(bit_depth == 16) - png_set_strip_16(png_ptr); -@@ -88,7 +88,7 @@ - png_set_expand(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - } - - if( color_type == PNG_COLOR_TYPE_GRAY || -@@ -96,7 +96,7 @@ - png_set_gray_to_rgb(png_ptr); - png_read_update_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &width, &height, -- &bit_depth, &color_type, &interlace_type,int_p_NULL, int_p_NULL); -+ &bit_depth, &color_type, &interlace_type, NULL, NULL); - } - - this->width=width; -@@ -114,7 +114,7 @@ - } - - png_read_end(png_ptr, info_ptr); -- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - } - diff --git a/community/fltk2/libpng14.patch b/community/fltk2/libpng14.patch deleted file mode 100644 index f6c49228e..000000000 --- a/community/fltk2/libpng14.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr fltk-2.0.x-r6829.orig/images/fl_png.cxx fltk-2.0.x-r6829/images/fl_png.cxx ---- fltk-2.0.x-r6829.orig/images/fl_png.cxx 2010-01-23 04:42:12.000000000 +0200 -+++ fltk-2.0.x-r6829/images/fl_png.cxx 2010-01-23 04:58:31.000000000 +0200 -@@ -62,7 +62,7 @@ bool pngImage::test(const uchar* datas, - #if !HAVE_LIBPNG - return 0; - #else -- return png_check_sig((png_byte*)datas, (int)size)!=0; -+ return png_sig_cmp((png_byte*)datas, 0, (int)size)==0; - #endif - } - diff --git a/community/freecol/PKGBUILD b/community/freecol/PKGBUILD deleted file mode 100644 index a3dcccc95..000000000 --- a/community/freecol/PKGBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# $Id: PKGBUILD 56049 2011-09-29 16:29:17Z svenstaro $ -# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Contributor: TDY <tdy@gmx.com> -# Contributor: Nelson Menon <nelsonmenon@gmail.com insanatorium.wordpress.com> - -pkgname=freecol -pkgver=0.10.3 -pkgrel=1 -pkgdesc="A turn-based strategy game based on Colonization" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.freecol.org/" -license=('GPL') -depends=('java-runtime') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.zip - fc.desktop fc.sh) -md5sums=('9aafa286247470831cd322e688ed5103' - '55594d770904af3e3e3852d375085357' - 'ae473cd1d86f8f764250ee00b6fda90b') - -build() { - cd "$srcdir/$pkgname" -} - -package() { - cd "$srcdir/$pkgname" - - install -Dm644 FreeCol.jar "$pkgdir/usr/share/java/$pkgname/FreeCol.jar" - install -Dm644 FreeCol.pdf "$pkgdir/usr/share/doc/$pkgname/FreeCol.pdf" - install -Dm644 $pkgname.xpm "$pkgdir/usr/share/pixmaps/$pkgname.xpm" - install -Dm644 ../fc.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm755 ../fc.sh "$pkgdir/usr/bin/$pkgname" - - cp -r data jars "$pkgdir/usr/share/java/$pkgname/" - find "$pkgdir/usr/share/java/$pkgname" -type d -exec chmod 755 '{}' \; - find "$pkgdir/usr/share/java/$pkgname" -type f -exec chmod 644 '{}' \; -} diff --git a/community/freecol/fc.desktop b/community/freecol/fc.desktop deleted file mode 100644 index 83ed6a97d..000000000 --- a/community/freecol/fc.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=FreeCol -GenericName=Strategy Game -Comment=A free Colonization clone -TryExec=/usr/bin/freecol -Exec=freecol -Icon=/usr/share/pixmaps/freecol.xpm -Categories=Game;StrategyGame; diff --git a/community/freecol/fc.sh b/community/freecol/fc.sh deleted file mode 100644 index 0ce3dac3a..000000000 --- a/community/freecol/fc.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -FC_PATH=/usr/share/java/freecol -LOG_PATH=/tmp/freecol - -[ ! -d "$LOG_PATH" ] && install -dm755 $LOG_PATH -cd $LOG_PATH -java -Xmx256M -jar $FC_PATH/FreeCol.jar "$@" --freecol-data $FC_PATH/data \ - &> ./messages.log diff --git a/community/gcc-avr/PKGBUILD b/community/gcc-avr/PKGBUILD deleted file mode 100644 index 045c1f17f..000000000 --- a/community/gcc-avr/PKGBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# $Id: PKGBUILD 57845 2011-11-03 12:26:59Z jelle $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Corrado Primier <bardo@aur.archlinux.org> -# Contributor: danst0 <danst0@west.de> - -pkgname=gcc-avr -pkgver=4.6.2 -pkgrel=1 -pkgdesc="The GNU avr Compiler Collection" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL' 'LGPL' 'custom') -url="http://gcc.gnu.org/" -depends=('binutils-avr>=2.21' 'cloog' 'ppl' 'gcc-libs>=4.6.0' 'libmpc') -options=('!ccache' '!distcc' '!emptydirs' '!libtool' '!strip') -source=(http://ftp.gnu.org/gnu/gcc/${pkgname/-avr}-${pkgver}/gcc-{core,g++}-${pkgver}.tar.bz2) -md5sums=('0c0e7e35d2215e19de9c97efba507553' - '0d75ca7ca35b1e7f252223f9d23a6ad1') - -build() { - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - cd "${srcdir}/${pkgname/-avr}-${pkgver}" - - mkdir build - cd build - ../configure --disable-libssp \ - --disable-nls \ - --enable-languages=c,c++ \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --mandir=/usr/share/man \ - --prefix=/usr \ - --target=avr \ - --with-gnu-as \ - --with-gnu-ld \ - --with-as=/usr/bin/avr-as \ - --with-ld=/usr/bin/avr-ld - - make -} - -package() { - cd "${srcdir}/${pkgname/-avr}-${pkgver}" - - cd build - make -j1 DESTDIR=${pkgdir} install - - install -Dm644 "${srcdir}/${pkgname/-avr}-${pkgver}/COPYING.RUNTIME" \ - "${pkgdir}/usr/share/licenses/${pkgname}/RUNTIME.LIBRARY.EXCEPTION" - - rm -f ${pkgdir}/usr/lib/libiberty.a - rm -rf ${pkgdir}/usr/share/man/man7 - rm -rf ${pkgdir}/usr/share/info -} - -md5sums=('780f614ab18c7a9066dec6387d7490b2' - '87ecd60431e41096419dd8a10f76e46b') diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog deleted file mode 100644 index d0a376568..000000000 --- a/community/geos/geos.changelog +++ /dev/null @@ -1,5 +0,0 @@ -2010-11-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 3.2.2 - -2010-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> - * Update to major release 3.2.1 diff --git a/community/glpng/libglpng-1.45-debian.patch b/community/glpng/libglpng-1.45-debian.patch deleted file mode 100644 index 062bf6364..000000000 --- a/community/glpng/libglpng-1.45-debian.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up libglpng-1.45.orig libglpng-1.45 -diff -up libglpng-1.45.orig/src/glpng.c.orig libglpng-1.45.orig/src/glpng.c ---- libglpng-1.45.orig/src/glpng.c.orig 2000-07-10 21:27:10.000000000 +0200 -+++ libglpng-1.45.orig/src/glpng.c 2009-05-17 23:02:38.000000000 +0200 -@@ -29,7 +29,7 @@ - #include <GL/gl.h>
- #include <stdlib.h> - #include <math.h> --#include "png/png.h" -+#include <png.h> -
- /* Used to decide if GL/gl.h supports the paletted extension */
- #ifdef GL_COLOR_INDEX1_EXT
-@@ -113,6 +113,7 @@ static void Resize(int components, const - } - } -
-+#ifdef _WIN32 - static int ExtSupported(const char *x) { - static const GLubyte *ext = NULL; - const char *c; -@@ -129,6 +130,7 @@ static int ExtSupported(const char *x) { - - return 0; - } -+#endif
-
- #define GET(o) ((int)*(data + (o)))
-
diff --git a/community/glpng/libpng14.patch b/community/glpng/libpng14.patch deleted file mode 100644 index b9fae8c2d..000000000 --- a/community/glpng/libpng14.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur libglpng-1.45.orig-old/src/glpng.c libglpng-1.45.orig/src/glpng.c ---- libglpng-1.45.orig-old/src/glpng.c 2000-07-11 05:27:10.000000000 +1000 -+++ libglpng-1.45.orig/src/glpng.c 2010-02-13 22:53:53.000000000 +1000 -@@ -269,7 +269,7 @@ - if (pinfo == NULL) return 0; - - fread(header, 1, 8, fp); -- if (!png_check_sig(header, 8)) return 0; -+ if (png_sig_cmp(header, 0, 8)) return 0; - - png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct(png); -@@ -373,7 +373,7 @@ - png_uint_32 i; - - fread(header, 1, 8, fp); -- if (!png_check_sig(header, 8)) return 0; -+ if (png_sig_cmp(header, 0, 8)) return 0; - - png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); - info = png_create_info_struct(png); diff --git a/community/lightspark/PKGBUILD b/community/lightspark/PKGBUILD deleted file mode 100644 index a49e2aa10..000000000 --- a/community/lightspark/PKGBUILD +++ /dev/null @@ -1,44 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com> - -pkgname=lightspark -pkgver=0.5.4 -pkgrel=1 -pkgdesc='An alternative Flash Player for Linux.' -arch=('i686' 'x86_64' 'mips64el') -url='http://lightspark.sourceforge.net' -license=('LGPL3') -conflicts=('lightspark-git') -depends=('mesa' 'ftgl' 'sdl' 'gtk2' 'curl' 'zlib' 'ffmpeg' 'glew' 'pcre' 'libpulse' 'libffi' 'boost-libs' 'glibmm' 'gtkglext' 'desktop-file-utils' 'libxml++' 'libxml2') -makedepends=('cmake' 'nasm' 'xulrunner' 'llvm' 'glproto' 'boost' 'fontconfig') -optdepends=('gnash-gtk: fallback support') -install="lightspark.install" -source=("http://launchpad.net/lightspark/trunk/lightspark-${pkgver}/+download/lightspark-${pkgver}.tar.gz" - 'llvm29.diff') -md5sums=('1101e1d1cb1b55b84b9214ef02217ec3' - '5f717d1d9ead478184ca68f6ac068099') - -build() { - #cd lightspark-${pkgver} - #patch -Np0 -i ${srcdir}/llvm29.diff - cd ${srcdir} - - rm -rf build - mkdir build - cd build - - cmake \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCOMPILE_PLUGIN=1 \ - -DCMAKE_BUILD_TYPE=Release \ - -DGNASH_EXE_PATH=/usr/bin/gtk-gnash \ - ../lightspark-${pkgver} - - make -} - -package() { - cd build - - make DESTDIR=${pkgdir} install -} diff --git a/community/lightspark/lightspark.install b/community/lightspark/lightspark.install deleted file mode 100644 index 75e2b7b55..000000000 --- a/community/lightspark/lightspark.install +++ /dev/null @@ -1,13 +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() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/community/lightspark/llvm29.diff b/community/lightspark/llvm29.diff deleted file mode 100644 index f859852af..000000000 --- a/community/lightspark/llvm29.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- CMakeLists.txt.old 2011-11-01 22:07:52.475608726 +0000 -+++ CMakeLists.txt 2011-11-01 22:08:52.046241925 +0000 -@@ -152,7 +152,8 @@ - MESSAGE(FATAL_ERROR "LLVM >=2.8 is required!") - ENDIF(${LLVM_STRING_VERSION} VERSION_LESS 2.8) - IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) -- MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") -+ #MESSAGE(FATAL_ERROR "LLVM !=2.9 is required!") -+ ADD_DEFINITIONS(-DLLVM_29) - ENDIF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.9) - IF(${LLVM_STRING_VERSION} VERSION_EQUAL 2.8) - ADD_DEFINITIONS(-DLLVM_28) diff --git a/community/lorcon-old-svn/PKGBUILD b/community/lorcon-old-svn/PKGBUILD deleted file mode 100644 index 0a9fb9e0b..000000000 --- a/community/lorcon-old-svn/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 60383 2011-12-12 18:03:48Z andrea $ -# Maintainer: -# Contributor: Brad Fanella <bradfanella@archlinux.us> -# Contributor: fnord0 [fnord0 <AT> riseup <DOT> net] - -pkgname=lorcon-old-svn -pkgver=224 -pkgrel=1 -pkgdesc="Loss Of Radio CONnectivity: A generic library for injecting 802.11 frames" -url='http://802.11ninja.net' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('libnl') -options=('!libtool') -source=("ftp://ftp.archlinux.org/other/community/lorcon-old/lorcon-old-${pkgver}.tar.bz2") -md5sums=('7a939cc8ec0d70d1b312b9fe9f0dfaf8') - -build() { - cd "${srcdir}/lorcon-old-${pkgver}" - ./configure --prefix=/usr - make -} - -package() { - cd "${srcdir}/lorcon-old-${pkgver}" - make DESTDIR="${pkgdir}" install -} diff --git a/community/mdf2iso/ChangeLog b/community/mdf2iso/ChangeLog deleted file mode 100644 index c206c3cde..000000000 --- a/community/mdf2iso/ChangeLog +++ /dev/null @@ -1,9 +0,0 @@ -2007-06-29 tardo <tardo@nagi-fanboi.net> -* Rebuilt with LFS patch - -2007-06-29 Georg Grabler (STiAT) <ggrabler@gmail.com> -* Added lfs.patch (long file system support) for images > 4GB - -2007-06-28 tardo <tardo@nagi-fanboi.net> -* Built for x86_64 - diff --git a/community/mdf2iso/PKGBUILD b/community/mdf2iso/PKGBUILD deleted file mode 100644 index 2c8decc4c..000000000 --- a/community/mdf2iso/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 25104 2010-08-30 23:20:53Z lcarlier $ -# Contributor: Jeff Mickey <j@codemac.net> -# Contributer: Henrik Ronellenfitsch <henrik at searinox dot de> -# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=mdf2iso -pkgver=0.3.0 -pkgrel=4 -pkgdesc="Converts Alcohol 120% .mdf files into .iso files" -arch=('i686' 'x86_64' 'mips64el') -url="http://mdf2iso.berlios.de" -license=('GPL') -depends=('glibc') -source=(http://download.berlios.de/mdf2iso/${pkgname}-${pkgver}-src.tar.bz2 lfs.patch) -md5sums=('a190625318476a196930ac66acd8fd07' 'a7510b8bc36d468ace80df3ecf55a3a3') - -build() { - cd ${srcdir}/${pkgname} - - patch -p1 < ../lfs.patch - ./configure --prefix=/usr - make || return 1 -} - -package() { - cd ${srcdir}/${pkgname} - - make DESTDIR=${pkgdir} install -} diff --git a/community/mdf2iso/lfs.patch b/community/mdf2iso/lfs.patch deleted file mode 100644 index 5ff62c0ba..000000000 --- a/community/mdf2iso/lfs.patch +++ /dev/null @@ -1,683 +0,0 @@ -Only in mdf2iso/src: .deps -Only in mdf2iso.new/src: .kdbgrc.mdf2iso -diff -bur mdf2iso/src/Makefile.am mdf2iso.new/src/Makefile.am ---- mdf2iso/src/Makefile.am 2005-05-19 11:24:11.000000000 +0200 -+++ mdf2iso.new/src/Makefile.am 2005-07-31 17:47:36.000000000 +0200 -@@ -1,2 +1,3 @@ - bin_PROGRAMS = mdf2iso - mdf2iso_SOURCES = mdf2iso.c -+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall -diff -bur mdf2iso/src/Makefile.in mdf2iso.new/src/Makefile.in ---- mdf2iso/src/Makefile.in 2005-05-22 21:42:09.000000000 +0200 -+++ mdf2iso.new/src/Makefile.in 2005-07-31 17:49:16.000000000 +0200 -@@ -136,6 +136,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - mdf2iso_SOURCES = mdf2iso.c -+AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wall - all: all-am - - .SUFFIXES: -@@ -149,9 +150,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign src/Makefile -+ $(AUTOMAKE) --gnu src/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -diff -bur mdf2iso/src/mdf2iso.c mdf2iso.new/src/mdf2iso.c ---- mdf2iso/src/mdf2iso.c 2005-05-22 21:52:08.000000000 +0200 -+++ mdf2iso.new/src/mdf2iso.c 2005-07-31 19:41:56.000000000 +0200 -@@ -1,4 +1,4 @@ -- /* $Id: mdf2iso.c, 22/05/05 -+/* $Id: mdf2iso.c, 22/05/05 - - Copyright (C) 2004,2005 Salvatore Santagati <salvatore.santagati@gmail.com> - -@@ -16,19 +16,14 @@ - along with this program; if not, write to the - Free Software Foundation, Inc., - 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -- */ -+*/ - - #include <stdio.h> - #include <stdlib.h> - #include <string.h> - #include <errno.h> - --#define VERSION "0.3.0" -- --/* Support Large File */ -- --#define _FILE_OFFSET_BITS 64 -- -+#define VERSION "0.3.1" - - - const char SYNC_HEADER[12] = { (char) 0x00, -@@ -83,14 +78,21 @@ - (char) 0x00 - }; - -+#define ISO9660 0 -+#define SYNC 1 -+#define SYNC_MDF 2 -+#define MDF_AUDIO 3 -+#define UNKNOWN -1 - --void --toc_file (char *destfilename, int sub) -+int toc_file (char *destfilename, int sub) - { -- char destfiletoc[1024], destfiledat[1024]; -+ int ret=0; -+ char *destfiletoc; -+ char *destfiledat; - FILE *ftoc; -- strcpy (destfiletoc, destfilename); -- strcpy (destfiledat, destfilename); -+ -+ destfiletoc=strdup(destfilename); -+ destfiledat=strdup(destfilename); - strcpy (destfiletoc + strlen (destfilename) - 4, ".toc"); - strcpy (destfiledat + strlen (destfilename) - 4, ".dat"); - -@@ -100,11 +102,8 @@ - fprintf (ftoc, "// Track 1\n"); - fprintf (ftoc, "TRACK MODE1_RAW"); - -- if (sub == 1) -- fprintf (ftoc, " RW_RAW\n"); -- -- else -- fprintf (ftoc, "\n"); -+ if (sub == 1) fprintf (ftoc, " RW_RAW\n"); -+ else fprintf (ftoc, "\n"); - - fprintf (ftoc, "NO COPY\n"); - fprintf (ftoc, "DATAFILE \"%s\"\n", destfiledat); -@@ -114,26 +113,27 @@ - } - else - { -- printf ("%s\n", strerror (errno)); -- exit (EXIT_FAILURE); -+ printf ("Error opening %s for output: %s\n",destfiletoc,strerror(errno)); -+ ret=-1; - }; -- -+ free(destfiletoc); -+ free(destfiledat); -+ return ret; - } - --int --number_file (char *destfilename) -+/* -+int number_file (char *destfilename) - { - int i = 1, test_mdf = 0; - int n_mdf; - char mdf[2], destfilemdf[2354]; - FILE *fsource; -+ - strcpy (destfilemdf, destfilename); - strcpy (destfilemdf + strlen (destfilename) - 1, ".0"); - for (i = 0; test_mdf == 0; i++) -- - { - if ((fsource = fopen (destfilemdf, "rb")) != NULL) -- - { - printf ("\nCheck : "); - sprintf (mdf, "md%d", i); -@@ -141,203 +141,219 @@ - printf ("%s, ", destfilemdf); - fclose (fsource); - } -- - else - { - test_mdf = 1; - } -- }; -+ } - printf ("\r \n"); - n_mdf = i - 1; - return (n_mdf); - } -+*/ - --void --cuesheets (char *destfilename) -+int cuesheets (char *destfilename) - { -- char destfilecue[1024], destfilebin[1024]; -+ int ret=0; -+ char *destfilecue; -+ char *destfilebin; - FILE *fcue; -- strcpy (destfilecue, destfilename); -- strcpy (destfilebin, destfilename); -+ -+ destfilecue=strdup(destfilename); -+ destfilebin=strdup(destfilename); - strcpy (destfilecue + strlen (destfilename) - 4, ".cue"); - strcpy (destfilebin + strlen (destfilename) - 4, ".bin"); -- fcue = fopen (destfilecue, "w"); -+ if ((fcue = fopen (destfilecue, "w"))!=NULL) -+ { - fprintf (fcue, "FILE \"%s\" BINARY\n", destfilebin); - fprintf (fcue, "TRACK 1 MODE1/2352\n"); - fprintf (fcue, "INDEX 1 00:00:00\n"); - rename (destfilename, destfilebin); - printf ("Create Cuesheets : %s\n", destfilecue); - fclose (fcue); -+ } -+ else -+ { -+ printf ("Error opening %s for output: %s\n",destfilecue,strerror(errno)); -+ ret=-1; -+ } -+ return ret; - } - --void --main_percent (int percent_bar) -+int previous_percent=-1; -+void main_percent (int percent_bar) -+// Prints a progress bar, takes a percentage as argument. - { -- int progress_bar, progress_space; -+ //int progress_bar, progress_space; -+ -+ if (percent_bar==previous_percent) return; // Nothing changed, don't waste CPU cycles. -+ -+ printf("%3d%% [:%.*s>%.*s:]\r",percent_bar,20-(percent_bar/5)," ", -+ percent_bar/5,"===================="); -+ /* - printf ("%d%% [:", percent_bar); -- for (progress_bar = 1; progress_bar <= (int) (percent_bar / 5); -- progress_bar++) -+ for (progress_bar = 1; progress_bar <= (int) (percent_bar / 5); progress_bar++) - printf ("="); - printf (">"); - -- for (progress_space = 0; progress_space < (20 - progress_bar); -- progress_space++) -- printf (" "); -+ for (; progress_bar <= 20; ++progress_bar) printf (" "); - printf (":]\r"); -+ */ - } - --void --usage () -+void usage () -+// Prints the command line syntax - { -- printf ("mdf2iso v%s by Salvatore Santagati\n", VERSION); -- printf ("Web : http//mdf2iso.berlios.de\n"); -- printf ("Email : salvatore.santagati@gmail.com\n"); -- printf ("Irc : irc.freenode.net #ignus\n"); -- printf ("Note : iodellavitanonhocapitouncazzo\n"); -- printf ("License : released under the GNU GPL v2 or later\n\n"); -+ printf (" Web : http//mdf2iso.berlios.de\n"); -+ printf (" Email : salvatore.santagati@gmail.com\n"); -+ printf (" Irc : irc.freenode.net #ignus\n"); -+ printf (" Note : iodellavitanonhocapitouncazzo\n\n"); - printf ("Usage :\n"); -- printf ("mdf2iso [OPTION] [BASENAME.MDF] [DESTINATION]\n\n"); -- printf ("OPTION\n"); -- printf ("\t--toc Generate toc file\n"); -- printf ("\t--cue Generate cue file\n"); -- printf ("\t--help display this notice\n\n"); -+ printf ("mdf2iso [--cue|--toc|--help] <sourcefile> [destfile]\n\n"); -+ printf ("Options:\n"); -+ printf (" --toc Generate toc/dat files\n"); -+ printf (" --cue Generate cue/bin files\n"); -+ printf (" --help Display this notice\n"); -+ printf (" sourcefile\tFilename of the .mdf file to be converted\n"); -+ printf (" destfile\tFilename of the target ISO9660 file.\n"\ -+ "\t\tIf none given, one is derived from sourcefile.\n\n"); - } - --int --main (int argc, char **argv) -+char mdftype(FILE *f) -+/* returns -+ -1 for unknown -+ 0 for ISO9660 -+ 1 for SYNC -+ 2 for SYNC MDF -+ 3 for MDF Audio -+ (see #defines above) -+*/ - { -- int seek_ecc, sector_size, seek_head, sector_data, n_mdf; -+ char buf[12]; -+ -+ fseek(f, 32768, SEEK_SET); -+ fread(buf, sizeof (char), 8, f); -+ if (!memcmp (ISO_9660, buf, 8)) return ISO9660; // File is ISO9660 -+ -+ fseek(f, 0L, SEEK_SET); -+ fread(buf, sizeof (char), 12, f); -+ -+ fseek (f, 2352, SEEK_SET); -+ -+ if (!memcmp (SYNC_HEADER, buf, 12)) // Has SYNC_HEADER -+ { -+ fread (buf, sizeof (char), 12, f); -+ if (!memcmp (SYNC_HEADER_MDF, buf, 12)) return SYNC_MDF; // File is SYNC MDF -+ if (!memcmp (SYNC_HEADER, buf, 12)) return SYNC; // File is SYNC -+ } -+ else // Does not have SYNC_HEADER -+ { -+ fread(buf, sizeof (char), 12, f); -+ if (!memcmp (SYNC_HEADER_MDF_AUDIO, buf, 12)) return MDF_AUDIO; // File is MDF Audio -+ } -+ -+ // Reached a point where nothing else matters. -+ return UNKNOWN; // Unknown format -+} -+ -+ -+// === Main program code === -+ -+int main (int argc, char **argv) -+{ -+ int seek_ecc, sector_size, seek_head, sector_data;//, n_mdf; - int cue = 0, cue_mode = 0, sub = 1, toc = 0, sub_toc = 0; - int opts = 0; -- double size_iso, write_iso; -- long percent = 0; -- long i, source_length, progressbar; -- char buf[2448], destfilename[2354]; -+ long i, source_length; -+ char buf[2448]; -+ char *destfilename=NULL; -+ char *basefilename=NULL; - FILE *fdest, *fsource; - -+ // Print identification -+ printf ("mdf2iso v%s by Salvatore Santagati\n", VERSION); -+ printf ("Licensed under GPL v2 or later\n"); - -- if (argc < 2) - -+ // *** Process command line options *** -+ -+ if (argc < 2) - { -- usage (); -- exit (EXIT_FAILURE); -+ // Not enough parameters; print help -+ usage(); -+ exit(EXIT_FAILURE); - } - -- else -- -- { -+ // Search for options --cue and --toc - for (i = 0; i < argc; i++) -- - { -- - if (!strcmp (argv[i], "--help")) -- - { - usage (); - exit (EXIT_SUCCESS); - } - if (!strcmp (argv[i], "--cue")) -- - { - cue = 1; - opts++; - } - if (!strcmp (argv[i], "--toc")) -- - { - toc = 1; - opts++; - } - } - -- if ((cue == 1) && (toc == 1)) -- -- { -- usage (); -- exit (EXIT_FAILURE); -- } -- if ((opts == 1) && (argc <= 2)) -- -+ // Catch impossible parameter combinations -+ if (((cue == 1) && (toc == 1)) || -+ ((opts == 1) && (argc <= 2))) - { -- usage (); -- exit (EXIT_FAILURE); -+ usage(); -+ exit(EXIT_FAILURE); - } - -+ // Get the base filename -+ basefilename=argv[1+opts]; // simple pointer, but makes life easier. - -+ // Get the destination filename - if (argc >= (3 + opts)) -- strcpy (destfilename, argv[2 + opts]); -- -- else -- -- { -- strcpy (destfilename, argv[1 + opts]); -- if (strlen (argv[1 + cue]) < 5 -- || strcmp (destfilename + strlen (argv[1 + opts]) - 4, ".mdf")) -- strcpy (destfilename + strlen (argv[1 + opts]), ".iso"); -- -+ // The destination filename is explicitly entered at the prompt -+ destfilename=strdup(argv[2 + opts]); - else -- strcpy (destfilename + strlen (argv[1 + opts]) - 4, ".iso"); -- } -- if ((fsource = fopen (argv[1 + opts], "rb")) != NULL) -- - { -- fseek (fsource, 32768, SEEK_CUR); -- fread (buf, sizeof (char), 8, fsource); -- if (memcmp (ISO_9660, buf, 8)) -- -+ // Derive destination filename from the basename: -+ // If basename is "*.mdf" use "*.iso" als destname -+ // otherwise simply append ".iso" to the basename to create destname. -+ destfilename=strdup(basefilename); -+ i=strlen(destfilename); // Reusing 'i' here as temporary variable -+ if (i < 5 || strcmp(destfilename + i - 4, ".mdf")) - { -- fseek (fsource, 0L, SEEK_SET); -- fread (buf, sizeof (char), 12, fsource); -- if (!memcmp (SYNC_HEADER, buf, 12)) -- -- { -- fseek (fsource, 0L, SEEK_SET); -- fseek (fsource, 2352, SEEK_CUR); -- fread (buf, sizeof (char), 12, fsource); -- if (!memcmp (SYNC_HEADER_MDF, buf, 12)) -- -- { -- if (cue == 1) -- { -- cue_mode = 1; -- -- /* BAD SECTOR TO NORMAL IMAGE */ -- seek_ecc = 96; -- sector_size = 2448; -- sector_data = 2352; -- seek_head = 0; -- } -- -- else if (toc == 0) -- -- { -- -- /*BAD SECTOR */ -- seek_ecc = 384; -- sector_size = 2448; -- sector_data = 2048; -- seek_head = 16; -+ destfilename=realloc(destfilename,i+5); -+ strcat(destfilename, ".iso"); - } -- - else -- -- { -- -- /*BAD SECTOR */ -- seek_ecc = 0; -- sector_size = 2448; -- sector_data = 2448; -- seek_head = 0; -- sub_toc = 1; -- } -+ strcpy(destfilename + i - 3, "iso"); - } - -- else -+ // *** Preprocess basefile *** - -+ // Try opening basefile -+ if ((fsource = fopen(basefilename, "rb")) == NULL) - { -- if (!memcmp (SYNC_HEADER, buf, 12)) -+ free(destfilename); -+ printf ("Could not open %s: %s\n", basefilename, strerror(errno)); -+ exit (EXIT_FAILURE); -+ } - -+ // Determine filetype & set some stuff accordingly (or exit) -+ switch (mdftype(fsource)) - { -+ case ISO9660: -+ printf("%s is already ISO9660.\n",basefilename); -+ fclose(fsource); -+ free(destfilename); -+ exit(EXIT_SUCCESS); -+ case SYNC: - if (cue == 1) - { - cue_mode = 1; -@@ -348,129 +364,134 @@ - seek_head = 0; - } - if (toc == 0) -- - { -- - /*NORMAL IMAGE */ - seek_ecc = 288; - sector_size = 2352; - sector_data = 2048; - seek_head = 16; - } -- - else -- - { - seek_ecc = 0; - sector_size = 2352; - sector_data = 2352; - seek_head = 0; - } -- } -- -- else -- -- { -- printf ("Sorry I don't know this format :(\n"); -- exit (EXIT_FAILURE); -- } -- } -- } -- -- else -- -+ break; -+ case SYNC_MDF: -+ if (cue == 1) - { -- fseek (fsource, 0L, SEEK_SET); -- fseek (fsource, 2352, SEEK_CUR); -- fread (buf, sizeof (char), 12, fsource); -- if (memcmp (SYNC_HEADER_MDF_AUDIO, buf, 12)) -+ cue_mode = 1; - -+ /* BAD SECTOR TO NORMAL IMAGE */ -+ seek_ecc = 96; -+ sector_size = 2448; -+ sector_data = 2352; -+ seek_head = 0; -+ } -+ else if (toc == 0) - { -- printf ("Sorry I don't know this format :(\n"); -- exit (EXIT_FAILURE); -+ /*BAD SECTOR */ -+ seek_ecc = 384; -+ sector_size = 2448; -+ sector_data = 2048; -+ seek_head = 16; - } -- - else -- - { -- -+ /*BAD SECTOR */ -+ seek_ecc = 0; -+ sector_size = 2448; -+ sector_data = 2448; -+ seek_head = 0; -+ sub_toc = 1; -+ } -+ break; -+ case MDF_AUDIO: - /*BAD SECTOR AUDIO */ - seek_head = 0; - sector_size = 2448; - seek_ecc = 96; - sector_data = 2352; - cue = 0; -+ break; -+ default:printf("Unknown format for %s.\n",basefilename); -+ fclose(fsource); -+ free(destfilename); -+ exit (EXIT_FAILURE); - } -- } -- if ((fdest = fopen (destfilename, "wb")) != NULL); - -- else -+ // *** Create destination file *** -+ -+ // Try opening the destination file for output -+ if ((fdest = fopen (destfilename, "wb")) == NULL) - { -- printf ("%s\n", strerror (errno)); -+ printf ("Unable to open %s for output: %s\n",destfilename,strerror(errno)); -+ free(destfilename); -+ fclose(fsource); - exit (EXIT_FAILURE); -- }; -+ } -+ -+ - fseek (fsource, 0L, SEEK_END); - source_length = ftell (fsource) / sector_size; -- size_iso = (int) (source_length * sector_data); -- progressbar = 100 / source_length; - fseek (fsource, 0L, SEEK_SET); -- - { - for (i = 0; i < source_length; i++) -- - { - fseek (fsource, seek_head, SEEK_CUR); -- if (fread (buf, sizeof (char), sector_data, fsource)); -- -- else -+ if (fread(buf, sizeof (char), sector_data, fsource)!=sector_data) - { -- printf ("%s\n", strerror (errno)); -+ printf ("Error reading from %s: %s\n",basefilename, strerror (errno)); -+ fclose(fsource); -+ fclose(fdest); -+ remove(destfilename); -+ free(destfilename); - exit (EXIT_FAILURE); -- }; -- if (fwrite (buf, sizeof (char), sector_data, fdest)); -- -- else -+ } -+ if (fwrite (buf, sizeof (char), sector_data, fdest)!=sector_data) - { -- printf ("%s\n", strerror (errno)); -+ printf ("Error writing to %s: %s\n",destfilename, strerror (errno)); -+ fclose(fsource); -+ fclose(fdest); -+ remove(destfilename); -+ free(destfilename); - exit (EXIT_FAILURE); -- }; -+ } - fseek (fsource, seek_ecc, SEEK_CUR); -- write_iso = (int) (sector_data * i); -- if (i != 0) -- percent = (int) (write_iso * 100 / size_iso); -- main_percent (percent); -- }} printf ("100%%[:====================:]\n"); -+ main_percent(i*100/source_length); -+ } -+ } printf ("100%% [:=====================:]\n"); - - fclose (fsource); - fclose (fdest); - -- if (cue == 1) -- cuesheets (destfilename); -- if (toc == 1) -- toc_file (destfilename, sub_toc); -+ // *** create Toc or Cue file is requested *** -+ if (cue == 1) if (cuesheets(destfilename)) -+ { -+ free(destfilename); -+ exit(EXIT_FAILURE); -+ } -+ if (toc == 1) if (toc_file(destfilename, sub_toc)) -+ { -+ free(destfilename); -+ exit(EXIT_FAILURE); -+ } - if ((toc == 0) && (cue == 0)) -- printf ("Create iso9660: %s\n", destfilename); -+ printf("Created iso9660: %s\n", destfilename); -+ -+ free(destfilename); - - exit (EXIT_SUCCESS); -- } - -- else -- printf ("This is file iso9660 ;)\n"); -+/* - n_mdf = number_file (destfilename) - 1; -- /* if (n_mdf > 1) -- -+ / * if (n_mdf > 1) - { - printf ("\rDetect %d md* file and now emerge this\n", n_mdf); - } -- */ -+ * / - fclose (fsource); -- exit (EXIT_SUCCESS); -- } -- -- else -- { -- printf ("%s\n", strerror (errno)); -- exit (EXIT_FAILURE); -- }; -- } -+ exit (EXIT_SUCCESS);*/ - } diff --git a/community/megaglest/megaglest.sh b/community/megaglest/megaglest.sh deleted file mode 100644 index 571a01be7..000000000 --- a/community/megaglest/megaglest.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - # Wrapper script for Megaglest. - - MAINDIR=/usr/share/megaglest - BASEDIR="$HOME/.config" - DIR="$BASEDIR/megaglest" - if [ ! -d "$DIR" ]; then - mkdir -p $DIR - fi - cd $DIR - [ -f glest.ini ] || cp /usr/share/megaglest/glest.ini . - [ -h megaglest ] || ln -s /usr/share/megaglest/megaglest . - [ -f servers.ini ] || cp $MAINDIR/servers.ini . - [ -f glestkeys.ini ] || cp $MAINDIR/glestkeys.ini . - for i in data scenarios techs tilesets tutorials; do - [ -h $i ] || ln -s $MAINDIR/$i . - done - [ -d maps ] || mkdir maps - [ -d screens ] || mkdir screens - cd maps - for i in $MAINDIR/maps/*; do - [ -h `basename $i` ] || ln -s $i . - done - cd .. - - exec ./megaglest
\ No newline at end of file diff --git a/community/mtpaint/libpng14.patch b/community/mtpaint/libpng14.patch deleted file mode 100644 index 7df3b2127..000000000 --- a/community/mtpaint/libpng14.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -upr mtpaint-3.31.orig/src/png.c mtpaint-3.31/src/png.c ---- mtpaint-3.31.orig/src/png.c 2010-01-25 00:43:07.000000000 +0200 -+++ mtpaint-3.31/src/png.c 2010-01-25 00:43:39.000000000 +0200 -@@ -539,7 +539,7 @@ static int load_png(char *file_name, ls_ - if (settings->bpp == 3) - { - png_set_strip_16(png_ptr); -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - png_set_palette_to_rgb(png_ptr); - png_set_gray_to_rgb(png_ptr); - -@@ -644,7 +644,7 @@ static int load_png(char *file_name, ls_ - png_set_strip_alpha(png_ptr); - png_set_packing(png_ptr); - if ((color_type == PNG_COLOR_TYPE_GRAY) && (bit_depth < 8)) -- png_set_gray_1_2_4_to_8(png_ptr); -+ png_set_expand_gray_1_2_4_to_8(png_ptr); - for (i = 0; i < height; i++) - { - row_pointers[i] = settings->img[CHN_IMAGE] + i * width; diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD index 54acc8f53..4e6fe8694 100644 --- a/community/ngspice/PKGBUILD +++ b/community/ngspice/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 49542 2011-06-18 04:13:44Z kkeen $ +# $Id: PKGBUILD 64464 2012-02-14 05:45:33Z kkeen $ # Maintainer: Kyle Keen <keenerd@gmail.com> # Contributor: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Jason Taylor <jftaylor21@gmail.com> pkgname=ngspice -pkgver=23 +pkgver=24 pkgrel=1 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.' url='http://ngspice.sourceforge.net' @@ -12,7 +12,7 @@ license=('BSD') arch=('i686' 'x86_64' 'mips64el') depends=('libxaw' 'libedit') source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz") -sha1sums=('65fa23d1168cb3af7651b990344f763c77bf6132') +sha1sums=('a6bb0e65c1c07d48f1d3e4df44fc17f6262952eb') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pylorcon/PKGBUILD b/community/pylorcon/PKGBUILD deleted file mode 100644 index 55866fb71..000000000 --- a/community/pylorcon/PKGBUILD +++ /dev/null @@ -1,18 +0,0 @@ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributer: fnord0 <fnord0 AT riseup DOT net> - -pkgname=pylorcon -pkgver=3 -pkgrel=4 -pkgdesc="Python wrapper for the C LORCON (Loss Of Radio CONnectivity) library" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/pylorcon/" -license=('GPLv2') -depends=('python2' 'lorcon-old-svn') -source="http://pylorcon.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2" -md5sums=('214d97bdf84e47131f8b55445fea1def') - -package() { - cd ${srcdir}/${pkgname} - python2 setup.py install --root=${pkgdir} --optimize=1 -} diff --git a/community/python-bsddb/db_5.3.patch b/community/python-bsddb/db_5.3.patch deleted file mode 100644 index 6ea4d18bb..000000000 --- a/community/python-bsddb/db_5.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Jesus Cea <jcea@jcea.es> -# Date 1324876054 -3600 -# Node ID b9ff8f6918a383ed4985e4a09ca36ed1776dba12 -# Parent 670b1ec4472908a9dc745a338a9f595f92aba667 -Support Berkeley DB 5.3.x - -diff -r 670b1ec44729 -r b9ff8f6918a3 setup2.py ---- a/setup2.py Mon Dec 26 06:04:34 2011 +0100 -+++ b/setup2.py Mon Dec 26 06:07:34 2011 +0100 -@@ -128,7 +128,7 @@ - incdir = libdir = None - if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR: - # Supported Berkeley DB versions, in order of preference. -- db_ver_list = ((5, 2), (5, 1), (5, 0), -+ db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0), - (4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3), (4, 2)) - - # construct a list of paths to look for the header file in on - 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/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD deleted file mode 100644 index 73858f5e8..000000000 --- a/community/qbittorrent/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> - -pkgname=qbittorrent -pkgver=2.9.3 -pkgrel=1 -pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.qbittorrent.org/" -license=('GPL') -depends=('qt' 'libtorrent-rasterbar' 'xdg-utils') -makedepends=('boost' 'geoip') -optdepends=('python: needed for search' - 'geoip: improves peer country resolution') -install='qbittorrent.install' -source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz") -md5sums=('bd35950260f633215db8acd7c22317dc') - -build() { - tar xf qbittorrent-${pkgver}.tar.gz - - cd qbittorrent-${pkgver} - - ./configure \ - --prefix=/usr - - make -} - -package() { - cd qbittorrent-${pkgver} - - make INSTALL_ROOT=${pkgdir} install -} diff --git a/community/qbittorrent/qbittorrent.install b/community/qbittorrent/qbittorrent.install deleted file mode 100644 index e70c054ec..000000000 --- a/community/qbittorrent/qbittorrent.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/remmina-plugins/PKGBUILD b/community/remmina-plugins/PKGBUILD deleted file mode 100644 index df1f52521..000000000 --- a/community/remmina-plugins/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# $Id: PKGBUILD 63730 2012-02-05 12:09:50Z ibiru $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Stijn Segers <francesco dot borromini at gmail dot com> - -pkgname=remmina-plugins -pkgver=0.9.2 -pkgrel=3 -pkgdesc="Remina plugins" -#"Remmina supports multiple network protocols in an integrated and consistant user interface. -# Currently RDP, VNC, XDMCP and SSH are supported." -arch=(i686 x86_64 'mips64el') -url="http://sourceforge.net/projects/remmina/" -license=('GPL') -conflicts=(remmina-plugins-svn) -depends=("remmina>=0.9.0" freerdp libxkbfile telepathy-glib) -makedepends=(intltool pkgconfig gettext perl avahi) -install=remmina-plugins.install -options=('!libtool') -source=(http://downloads.sourceforge.net/project/remmina/0.9/$pkgname-$pkgver.tar.gz) -md5sums=('6f6b7cb18f7604f3f17eeda5173ede6a') - -build() { - cd $srcdir/${pkgname}-${pkgver} - ./configure --prefix=/usr --enable-ssh --enable-rdp \ - --enable-vnc --enable-xdmcp --enable-nx \ - --enable-telepathy - make - make DESTDIR=${pkgdir} install -} diff --git a/community/remmina-plugins/remmina-plugins.install b/community/remmina-plugins/remmina-plugins.install deleted file mode 100644 index 1a05f573e..000000000 --- a/community/remmina-plugins/remmina-plugins.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/community/systemd/PKGBUILD b/community/systemd/PKGBUILD deleted file mode 100644 index 7ae0e15f8..000000000 --- a/community/systemd/PKGBUILD +++ /dev/null @@ -1,86 +0,0 @@ -# $Id: PKGBUILD 61447 2011-12-31 17:01:55Z dreisner $ -# Maintainer: Dave Reisner <dreisner@archlinux.org> - -pkgname=systemd -pkgver=37 -pkgrel=3 -pkgdesc="Session and Startup manager" -arch=('i686' 'x86_64' 'mips64el') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2') -depends=('dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172') -makedepends=('gperf' 'cryptsetup' 'gtk2' 'intltool' 'libnotify' 'linux-api-headers') -optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'gtk2: systemadm' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'libnotify: systemadm' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') -groups=('systemd') -options=('!libtool' '!strip') -backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - etc/dbus-1/system.d/org.freedesktop.hostname1.conf - etc/dbus-1/system.d/org.freedesktop.login1.conf - etc/dbus-1/system.d/org.freedesktop.locale1.conf - etc/dbus-1/system.d/org.freedesktop.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf) -install=systemd.install -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.bz2" - "os-release" - systemctl-completion.patch) -md5sums=('1435f23be79c8c38d1121c6b150510f3' - '752636def0db3c03f121f8b4f44a63cd' - '8acca6b7be4bfebe4174d89e4625b0ee') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - # Don't unset locale in getty - # https://bugzilla.redhat.com/show_bug.cgi?id=663900 - sed -i -e '/^Environ.*LANG/s/^/#/' \ - -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - - # fix bash completion - patch -Np1 < "$srcdir"/systemctl-completion.patch - - ./configure --prefix=/usr \ - --sysconfdir=/etc \ - --libexecdir=/usr/lib/systemd \ - --libdir=/usr/lib \ - --localstatedir=/var \ - --with-rootdir= \ - --with-rootlibdir=/lib - - make - - # fix .so links in manpages - sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 - sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # fix systemd-analyze for python2 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # rename man pages to avoid conflicts with sysvinit and initscripts - cd "$pkgdir/usr/share/man" - - manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - man5/{hostname,{vconsole,locale}.conf}.5) - - for manpage in "${manpages[@]}"; do - IFS='/' read section page <<< "$manpage" - mv "$manpage" "$section/systemd.$page" - done -} diff --git a/community/systemd/os-release b/community/systemd/os-release deleted file mode 100644 index 5e24a6031..000000000 --- a/community/systemd/os-release +++ /dev/null @@ -1,5 +0,0 @@ -NAME="Arch Linux" -ID=arch -PRETTY_NAME="Arch Linux" -ANSI_COLOR="1;36" - diff --git a/community/systemd/systemctl-completion.patch b/community/systemd/systemctl-completion.patch deleted file mode 100644 index afa1ae73f..000000000 --- a/community/systemd/systemctl-completion.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 255e63837bc985ce6f3c3b5ce5d2856e2240138b Mon Sep 17 00:00:00 2001 -From: Dave Reisner <dreisner@archlinux.org> -Date: Tue, 11 Oct 2011 20:53:05 -0400 -Subject: [PATCH] systemctl-completion: always invoke with --no-legend - -In the case of completion for the 'restart' verb, passing the invalid -unit name (the colums header) causes completion to cease functioning -entirely, with the error: - - Failed to issue method call: Unit name UNIT is not valid. - -This adds a small wrapper function for systemctl which can have common -options added to it. - ---- - src/systemctl-bash-completion.sh | 20 ++++++++++++-------- - 1 files changed, 12 insertions(+), 8 deletions(-) - -diff --git a/src/systemctl-bash-completion.sh b/src/systemctl-bash-completion.sh -index 6369a6c..6ebb792 100644 ---- a/src/systemctl-bash-completion.sh -+++ b/src/systemctl-bash-completion.sh -@@ -15,6 +15,10 @@ - # You should have received a copy of the GNU General Public License - # along with systemd; If not, see <http://www.gnu.org/licenses/>. - -+__systemctl() { -+ systemctl --no-legend "$@" -+} -+ - __contains_word () { - local word=$1; shift - for w in $*; do [[ $w = $word ]] && return 0; done -@@ -24,7 +28,7 @@ __contains_word () { - __filter_units_by_property () { - local property=$1 value=$2 ; shift ; shift - local -a units=( $* ) -- local -a props=( $(systemctl show --property "$property" -- ${units[*]} | grep -v ^$) ) -+ local -a props=( $(__systemctl show --property "$property" -- ${units[*]} | grep -v ^$) ) - for ((i=0; $i < ${#units[*]}; i++)); do - if [[ "${props[i]}" = "$property=$value" ]]; then - echo "${units[i]}" -@@ -32,10 +36,10 @@ __filter_units_by_property () { - done - } - --__get_all_units () { systemctl list-units --full --all | awk ' {print $1}' ; } --__get_active_units () { systemctl list-units --full | awk ' {print $1}' ; } --__get_inactive_units () { systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; } --__get_failed_units () { systemctl list-units --full | awk '$3 == "failed" {print $1}' ; } -+__get_all_units () { __systemctl list-units --full --all | awk ' {print $1}' ; } -+__get_active_units () { __systemctl list-units --full | awk ' {print $1}' ; } -+__get_inactive_units () { __systemctl list-units --full --all | awk '$3 == "inactive" {print $1}' ; } -+__get_failed_units () { __systemctl list-units --full | awk '$3 == "failed" {print $1}' ; } - - _systemctl () { - local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} -@@ -134,13 +138,13 @@ _systemctl () { - comps='' - - elif __contains_word "$verb" ${VERBS[JOBS]}; then -- comps=$( systemctl list-jobs | awk '{print $1}' ) -+ comps=$( __systemctl list-jobs | awk '{print $1}' ) - - elif __contains_word "$verb" ${VERBS[SNAPSHOTS]}; then -- comps=$( systemctl list-units --type snapshot --full --all | awk '{print $1}' ) -+ comps=$( __systemctl list-units --type snapshot --full --all | awk '{print $1}' ) - - elif __contains_word "$verb" ${VERBS[ENVS]}; then -- comps=$( systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' ) -+ comps=$( __systemctl show-environment | sed 's_\([^=]\+=\).*_\1_' ) - compopt -o nospace - fi - --- -1.7.7 - diff --git a/community/systemd/systemd.install b/community/systemd/systemd.install deleted file mode 100644 index 04b29688a..000000000 --- a/community/systemd/systemd.install +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -checkgroups() { - if ! usr/bin/getent group lock >/dev/null; then - usr/sbin/groupadd -g 54 lock - fi -} - -sd_booted() { - [ -e sys/fs/cgroups/systemd ] -} - -post_install() { - checkgroups - - if [ ! -f etc/machine-id ]; then - bin/systemd-machine-id-setup - fi - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - if [ ! -f etc/machine-id ]; then - bin/systemd-machine-id-setup - fi - - if sd_booted; then - bin/systemctl daemon-reexec >/dev/null - fi - - newpkgver=${1%-*} - oldpkgver=${2%-*} - - # catch v31 need for restarting systemd-logind.service - if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then - # but only if systemd is running - if sd_booted; then - bin/systemctl try-restart systemd-logind.service - fi - fi -} - -post_remove() { - if usr/bin/getent group lock >/dev/null; then - usr/sbin/groupdel lock - fi -} - -# vim:set ts=2 sw=2 et: diff --git a/community/texmaker/PKGBUILD b/community/texmaker/PKGBUILD deleted file mode 100644 index ce71432bb..000000000 --- a/community/texmaker/PKGBUILD +++ /dev/null @@ -1,35 +0,0 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: furester <xfurester@hotmail.com> -# Contributor: Firmicus <firmicus gmx net> -# Contributor: Paulo Matias <matiasΘarchlinux-br·org> - -pkgname=texmaker -pkgver=3.2.2 -pkgrel=1 -pkgdesc='Free cross-platform latex editor' -arch=('i686' 'x86_64' 'mips64el') -url="http://www.xm1math.net/texmaker/index.html" -license=('GPL') -install='texmaker.install' -depends=('poppler-qt' 'ghostscript' 'qtwebkit') -source=("http://www.xm1math.net/texmaker/texmaker-${pkgver}.tar.bz2") -md5sums=('aa04c37a0117a6f924c0f7eed5732fe2') - -build() { - cd texmaker-${pkgver} - - export INSTALL_ROOT=${pkgdir} - - qmake -unix PREFIX=//usr texmaker.pro - - make -} - -package() { - cd texmaker-${pkgver} - - export INSTALL_PATH=${pkgdir} - - make install -} diff --git a/community/texmaker/texmaker.install b/community/texmaker/texmaker.install deleted file mode 100644 index 9591f6c5d..000000000 --- a/community/texmaker/texmaker.install +++ /dev/null @@ -1,7 +0,0 @@ -post_install() { - update-desktop-database -q -} - -post_remove() { - update-desktop-database -q -} diff --git a/community/tuxpaint/desktop.patch b/community/tuxpaint/desktop.patch deleted file mode 100644 index 78d2ed397..000000000 --- a/community/tuxpaint/desktop.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- tuxpaint.desktop2 2008-03-20 15:45:22.000000000 +0100 -+++ tuxpaint.desktop 2008-03-20 15:56:33.000000000 +0100 -@@ -205,3 +205,4 @@ - Comment[zh_cn]=孩子的绘图程序。 - Comment[zh_tw]=適合兒童的畫圖程式 - Comment[zw]=Diif program paar keé men Dibuj paar biét biss -+Categories=Game;KidsGame;Graphics;RasterGraphics; diff --git a/community/volumeicon/PKGBUILD b/community/volumeicon/PKGBUILD new file mode 100644 index 000000000..daa61ed5d --- /dev/null +++ b/community/volumeicon/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 64486 2012-02-14 08:50:43Z arodseth $ +# Maintainer: Alexander Rødseth <rodseth@gmail.com> +# Contributor: Maato <maato softwarebakery com> + +pkgname=volumeicon +pkgver=0.4.6 +pkgrel=3 +pkgdesc="Volume control for your system tray" +arch=('x86_64' 'i686') +url="http://softwarebakery.com/maato/volumeicon.html" +license=('GPL3') +depends=('gtk2>=2.16.0' 'alsa-lib') +source=("http://softwarebakery.com/maato/files/volumeicon/$pkgname-$pkgver.tar.gz") +sha256sums=('32f94adc5f346404ae564405dd483ae4bd04212df08e46f18d369b4ba2cb6590') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch b/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch deleted file mode 100644 index 5aee3118c..000000000 --- a/community/wesnoth/wesnoth-1.8.6-boost-foreach.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp~ 2011-07-21 23:05:56.594879049 +0200 -+++ wesnoth-1.8.6/src/gui/widgets/tree_view_node.cpp 2011-07-21 23:28:07.540358742 +0200 -@@ -238,6 +238,17 @@ void ttree_view_node::clear() - - struct ttree_view_node_implementation - { -+ template<class W, class It> -+ static W* find_at_aux(It begin, It end, -+ const tpoint& coordinate, const bool must_be_active) { -+ for (It it = begin; it != end; ++it) { -+ if(W* widget = it->find_at(coordinate, must_be_active)) { -+ return widget; -+ } -+ } -+ return NULL; -+ } -+ - template<class W> - static W* find_at( - typename tconst_duplicator<W, ttree_view_node>::type& -@@ -255,13 +266,9 @@ struct ttree_view_node_implementation - } - - typedef typename tconst_duplicator<W, ttree_view_node>::type thack; -- foreach(thack& node, tree_view_node.children_) { -- if(W* widget = node.find_at(coordinate, must_be_active)) { -- return widget; -- } -- } -- -- return NULL; -+ return find_at_aux<W>(tree_view_node.children_.begin(), -+ tree_view_node.children_.end(), -+ coordinate, must_be_active); - } - }; - -@@ -313,7 +320,9 @@ tpoint ttree_view_node::get_current_size - return size; - } - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; -@@ -344,7 +353,9 @@ tpoint ttree_view_node::get_unfolded_siz - size.x += (get_indention_level() - 1) * tree_view().indention_step_size_; - } - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; -@@ -378,7 +389,9 @@ tpoint ttree_view_node::calculate_best_s - - DBG_GUI_L << LOG_HEADER << " own grid best size " << best_size << ".\n"; - -- foreach(const ttree_view_node& node, children_) { -+ for (boost::ptr_vector<ttree_view_node>::const_iterator it -+ = children_.begin (); it != children_.end (); ++it) { -+ const ttree_view_node& node = *it; - - if(node.grid_.get_visible() == twidget::INVISIBLE) { - continue; diff --git a/community/wesnoth/wesnoth-libpng-1.4.0.patch b/community/wesnoth/wesnoth-libpng-1.4.0.patch deleted file mode 100644 index 338f467af..000000000 --- a/community/wesnoth/wesnoth-libpng-1.4.0.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Nur wesnoth-1.8.orig/src/tools/exploder_utils.cpp wesnoth-1.8/src/tools/exploder_utils.cpp ---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp 2010-01-01 15:16:49.000000000 +0200 -+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2010-04-08 17:38:03.066201123 +0300 -@@ -174,8 +174,8 @@ - //TODO: review whether providing NULL error handlers is something - //sensible - png_struct* png_ptr = png_create_write_struct -- (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(png_voidp_NULL), -- png_error_ptr_NULL, png_error_ptr_NULL); -+ (PNG_LIBPNG_VER_STRING, reinterpret_cast<png_voidp>(NULL), -+ NULL, NULL); - if(!png_ptr) - throw exploder_failure("Unable to initialize the png write structure"); - ---- wesnoth-1.8.orig/src/tools/exploder_utils.cpp.libpng 2011-11-06 14:44:26.618711420 -0600 -+++ wesnoth-1.8/src/tools/exploder_utils.cpp 2011-11-06 14:57:12.150006511 -0600 -@@ -15,6 +15,7 @@ - #include "exploder_utils.hpp" - #include "game_config.hpp" - #include "serialization/string_utils.hpp" -+#include <zlib.h> - #include <png.h> - - exploder_point::exploder_point(const std::string &s) |