[arch-commits] Commit in vips-devel/repos (3 files)

[Eric Belanger]

    Date: Tuesday, April 22, 2008 @ 23:53:39
  Author: eric
Revision: 796

Merged revisions 2-795 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/vips-devel/trunk

........
  r220 | eric | 2008-04-13 19:00:45 -0400 (Sun, 13 Apr 2008) | 2 lines
  
  upgpkg: vips-devel 7.13.0-2
      rebuild for imagemagick 6.4.0.2, fixed license
........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Added:
  vips-devel/repos/unstable-i686/vips-gcc43.diff
    (from rev 356, vips-devel/trunk/vips-gcc43.diff)
Modified:
  vips-devel/repos/unstable-i686/	(properties)
  vips-devel/repos/unstable-i686/PKGBUILD

-----------------+
 PKGBUILD        |   13 +++++++------
 vips-gcc43.diff |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)


Property changes on: vips-devel/repos/unstable-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /vips-devel/trunk:1
   + /vips-devel/trunk:1-795

Modified: unstable-i686/PKGBUILD
===================================================================
--- unstable-i686/PKGBUILD	2008-04-23 03:52:12 UTC (rev 795)
+++ unstable-i686/PKGBUILD	2008-04-23 03:53:39 UTC (rev 796)
@@ -6,19 +6,20 @@
 provides=('vips')
 conflicts=('vips')
 pkgver=7.13.0
-mainver=7.13
-pkgrel=1
-license=('LGPL2.1')
+pkgrel=2
+license=('LGPL')
 pkgdesc="A free image processing system. [devel]"
 arch=("i686" "x86_64")
 url="http://www.vips.ecs.soton.ac.uk/index.php"
-depends=('liboil' 'fftw>=3.0.1-5' 'lcms' 'pango' 'imagemagick>=6.2.6' 'libpng' 'libtiff' 'libjpeg' 'zlib' 'glib2' 'libexif' 'openexr')
-makedepends=('make' 'pkgconfig' 'perl')
+depends=('liboil' 'fftw>=3.0.1-5' 'lcms' 'pango' 'imagemagick>=6.4.0.2' 'libpng' 'libtiff' 'libjpeg' 'zlib' 'glib2' 'libexif' 'openexr')
+makedepends=('make' 'pkgconfig' 'perl' 'perlxml')
 options=('!libtool')
-source=("http://www.vips.ecs.soton.ac.uk/vips-$mainver/vips-${pkgver}.tar.gz")
+source=("http://www.vips.ecs.soton.ac.uk/vips-${pkgver%.*}/vips-${pkgver}.tar.gz" "vips-gcc43.diff")
+md5sums=('d99126c8a187a91c971fce4ef0b54f65' '7fae69288dd10b1710495ff91465bcfc')
 
 build() {
   cd ${startdir}/src/vips-${pkgver}
+  patch -p1 < ../vips-gcc43.diff
   ./configure --prefix=/usr --without-python
   make || return 1
   make DESTDIR=${startdir}/pkg install

Copied: vips-devel/repos/unstable-i686/vips-gcc43.diff (from rev 356, vips-devel/trunk/vips-gcc43.diff)
===================================================================
--- unstable-i686/vips-gcc43.diff	                        (rev 0)
+++ unstable-i686/vips-gcc43.diff	2008-04-23 03:53:39 UTC (rev 796)
@@ -0,0 +1,22 @@
+diff -Naur vips-7.13.0-orig/libsrcCC/VDisplay.cc vips-7.13.0/libsrcCC/VDisplay.cc
+--- vips-7.13.0-orig/libsrcCC/VDisplay.cc	2008-04-13 02:47:27.000000000 -0400
++++ vips-7.13.0/libsrcCC/VDisplay.cc	2008-04-13 02:48:01.000000000 -0400
+@@ -32,6 +32,7 @@
+ #include <vips/intl.h>
+ 
+ #include <cstdlib>
++#include <cstring>
+ 
+ #include <vips/vips.h>
+ #include <vips/vipscpp.h>
+diff -Naur vips-7.13.0-orig/libsrcCC/VImage.cc vips-7.13.0/libsrcCC/VImage.cc
+--- vips-7.13.0-orig/libsrcCC/VImage.cc	2008-04-13 02:47:27.000000000 -0400
++++ vips-7.13.0/libsrcCC/VImage.cc	2008-04-13 02:48:01.000000000 -0400
+@@ -33,6 +33,7 @@
+ 
+ #include <cstdlib>
+ #include <cstdio>
++#include <cstring>
+ 
+ #include <vips/vips.h>
+ #include <vips/vipscpp.h>