Thu Mar 21 00:05:30 PDT 2013

3 files changed, 5 insertions, 69 deletions

diff --git a/extra/pstoedit/PKGBUILD b/extra/pstoedit/PKGBUILD
index 41d5560cc..f147709c3 100644
--- a/extra/pstoedit/PKGBUILD
+++ b/extra/pstoedit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 175857 2013-01-23 00:12:48Z eric $
+# $Id: PKGBUILD 180314 2013-03-20 02:35:35Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tobias Powalowski <t.powa@gmx.de>
 
 pkgname=pstoedit
-pkgver=3.60
-pkgrel=4
+pkgver=3.61
+pkgrel=1
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=('i686' 'x86_64')
 url="http://www.pstoedit.net/"
@@ -13,11 +13,8 @@ license=('GPL')
 depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
 makedepends=('ghostscript')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
-	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
-sha1sums=('649ade3d873429548eb6dd9f3e13cb79a8d6a1a2'
-          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
-          '54bbe019de66eb4cb8525371462595d21fbd074e')
+source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz")
+sha1sums=('426f3746ecb441caa0db401d5880e1ac04a399d5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/pstoedit/pstoedit-3.50-parallel.patch b/extra/pstoedit/pstoedit-3.50-parallel.patch
deleted file mode 100644
index 4f1f73b04..000000000
--- a/extra/pstoedit/pstoedit-3.50-parallel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index d6178df..66f377b 100755
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -86,6 +86,7 @@ libp2edrvstd_la_SOURCES=			\
-         $(sample_drivers_src)                   
- libp2edrvstd_la_LIBADD=-L. libpstoedit.la
- libp2edrvstd_la_LDFLAGS=-no-undefined -module
-+libp2edrvstd_la_DEPENDENCIES = libpstoedit.la
- 
- #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
- #libp2edrvplugins_la_LIBADD=
-@@ -95,15 +96,18 @@ libp2edrvstd_la_LDFLAGS=-no-undefined -module
- libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
- libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
- libp2edrvlplot_la_LDFLAGS=-no-undefined -module
-+libp2edrvlplot_la_DEPENDENCIES = libpstoedit.la
- 
- libp2edrvswf_la_SOURCES=drvswf.cpp drvswf.h initlibrary.cpp
- libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) -L. libpstoedit.la
- libp2edrvswf_la_LDFLAGS=-no-undefined -module
-+libp2edrvswf_la_DEPENDENCIES = libpstoedit.la
- 
- # note the __ stand for ++ - automake treats all no alphanums chars as _
- libp2edrvmagick___la_SOURCES=drvmagick++.cpp drvmagick++.h initlibrary.cpp
- libp2edrvmagick___la_LIBADD=-L. libpstoedit.la
- libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS}  -module
-+libp2edrvmagick___la_DEPENDENCIES = libpstoedit.la
- # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
- 
- if USE_EMFBYSOURCE
-@@ -113,6 +117,7 @@ else
- libp2edrvwmf_la_SOURCES=drvwmf.cpp drvwmf.h initlibrary.cpp
- libp2edrvwmf_la_LDFLAGS=-no-undefined $(LIBEMF_LDFLAGS) -L. libpstoedit.la -module
- endif
-+libp2edrvwmf_la_DEPENDENCIES = libpstoedit.la
- 
- libpstoedit_la_SOURCES =			\
- 	dynload.cpp dynload.h			\
-@@ -135,6 +140,7 @@ libpstoedit_la_LDFLAGS = -no-undefined
- 
- pstoedit_SOURCES = cmdmain.cpp
- pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS}
-+pstoedit_DEPENDENCIES = libpstoedit.la
- 
- pkginclude_HEADERS =				\
- 	pstoedit.h				\
diff --git a/extra/pstoedit/pstoedit-3.50-plugin-close.patch b/extra/pstoedit/pstoedit-3.50-plugin-close.patch
deleted file mode 100644
index 6787d6aef..000000000
--- a/extra/pstoedit/pstoedit-3.50-plugin-close.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugzilla.redhat.com/507035
-
-diff --git a/src/dynload.cpp b/src/dynload.cpp
-index c0db355..7c073ef 100644
---- a/src/dynload.cpp
-+++ b/src/dynload.cpp
-@@ -147,7 +147,6 @@ void DynLoader::close()
- 
- DynLoader::~DynLoader()
- {
--	close();
- 	libname=0;
- }
-