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

[Eric Belanger]

    Date: Tuesday, April 22, 2008 @ 23:42:52
  Author: eric
Revision: 786

Merged revisions 2-785 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/pstoedit/trunk

........
  r214 | eric | 2008-04-13 18:41:57 -0400 (Sun, 13 Apr 2008) | 2 lines
  
  upgpkg: pstoedit 3.45-2
      rebuild for imagemagick 6.4.0.2
........
  r256 | eric | 2008-04-13 22:05:07 -0400 (Sun, 13 Apr 2008) | 1 line
  
  upgpkg: pstoedit 3.45-2
........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........

Added:
  pstoedit/repos/extra-i686/pstoedit-3.45-gcc-4.3.patch
    (from rev 356, pstoedit/trunk/pstoedit-3.45-gcc-4.3.patch)
Modified:
  pstoedit/repos/extra-i686/	(properties)
  pstoedit/repos/extra-i686/PKGBUILD

-----------------------------+
 PKGBUILD                    |   13 +++++++------
 pstoedit-3.45-gcc-4.3.patch |   12 ++++++++++++
 2 files changed, 19 insertions(+), 6 deletions(-)


Property changes on: pstoedit/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /pstoedit/trunk:1
   + /pstoedit/trunk:1-785

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-04-23 03:42:33 UTC (rev 785)
+++ extra-i686/PKGBUILD	2008-04-23 03:42:52 UTC (rev 786)
@@ -4,20 +4,21 @@
 
 pkgname=pstoedit
 pkgver=3.45
-pkgrel=1
-depends=("gcc-libs>=4.2.1" "plotutils>=2.5" "gd" "imagemagick")
+pkgrel=2
+depends=("gcc-libs>=4.2.1" "plotutils>=2.5" "gd" "imagemagick>=6.4.0.2")
 pkgdesc="translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64")
 license=('GPL')
-source=("http://puzzle.dl.sourceforge.net/sourceforge/pstoedit/pstoedit-$pkgver.tar.gz")
+source=("http://puzzle.dl.sourceforge.net/sourceforge/pstoedit/pstoedit-$pkgver.tar.gz" "pstoedit-3.45-gcc-4.3.patch")
+md5sums=('071efc64d9edf5d942b407348ac7451d' '97c5893859c98f446e3b47423dc851fd')
 url="http://www.pstoedit.net/"
-options=('!libtool')
+options=('!libtool' '!makeflags')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
+  patch -p0 < ../pstoedit-3.45-gcc-4.3.patch || return 1
+  sed -i 's/-pedantic//' configure
   ./configure --prefix=/usr
   make || return 1
   make DESTDIR=$startdir/pkg install
 }
-
-md5sums=('071efc64d9edf5d942b407348ac7451d')

Copied: pstoedit/repos/extra-i686/pstoedit-3.45-gcc-4.3.patch (from rev 356, pstoedit/trunk/pstoedit-3.45-gcc-4.3.patch)
===================================================================
--- extra-i686/pstoedit-3.45-gcc-4.3.patch	                        (rev 0)
+++ extra-i686/pstoedit-3.45-gcc-4.3.patch	2008-04-23 03:42:52 UTC (rev 786)
@@ -0,0 +1,12 @@
+--- src/cppcomp.h-orig	2008-04-03 18:58:13.000000000 +0100
++++ src/cppcomp.h	2008-04-03 18:59:08.000000000 +0100
+@@ -37,6 +37,9 @@
+ #define _unix
+ #endif
+ 
++#include <cstring>
++#include <cstdlib>
++
+ #if defined (_MSC_VER) && (_MSC_VER >= 1100) 
+ // MSVC 5 and 6 have ANSI C++ header files, but the compilation
+ // is much slower and object files get bigger.