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

[Ronald van Haren]

    Date: Thursday, August 26, 2010 @ 11:26:52
  Author: ronald
Revision: 88955

upgpkg: pstoedit 3.50-4
fix FS#19221 - [pstoedit] plugin close problem

Added:
  pstoedit/trunk/pstoedit-3.50-parallel.patch
  pstoedit/trunk/pstoedit-3.50-plugin-close.patch
Modified:
  pstoedit/trunk/PKGBUILD

----------------------------------+
 PKGBUILD                         |   17 ++++++++++---
 pstoedit-3.50-parallel.patch     |   47 +++++++++++++++++++++++++++++++++++++
 pstoedit-3.50-plugin-close.patch |   14 +++++++++++
 3 files changed, 74 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-08-26 15:25:47 UTC (rev 88954)
+++ PKGBUILD	2010-08-26 15:26:52 UTC (rev 88955)
@@ -5,7 +5,7 @@
 
 pkgname=pstoedit
 pkgver=3.50
-pkgrel=3
+pkgrel=4
 pkgdesc="Translates PostScript and PDF graphics into other vector formats"
 arch=("i686" "x86_64")
 url="http://www.pstoedit.net/"
@@ -13,13 +13,22 @@
 depends=('gcc-libs' 'plotutils' 'gd' 'imagemagick')
 makedepends=('ghostscript')
 options=('!libtool' '!makeflags')
-source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz")
-md5sums=('97d649305ad90fab7a569154f17e0916')
-sha1sums=('5685bef29fa00aae7cc314d3a1dd21612a98eb2b')
+source=("http://downloads.sourceforge.net/sourceforge/pstoedit/pstoedit-${pkgver}.tar.gz"
+	'pstoedit-3.50-parallel.patch'	'pstoedit-3.50-plugin-close.patch')
+sha1sums=('5685bef29fa00aae7cc314d3a1dd21612a98eb2b'
+          '6e278b164d3e59fbb11e7fd5ae8ffb038932d69a'
+          '54bbe019de66eb4cb8525371462595d21fbd074e')
 
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # fix FS#19221 - [pstoedit] plugin close problem 
+  patch -Np1 -i ../pstoedit-3.50-parallel.patch
+  patch -Np1 -i ../pstoedit-3.50-plugin-close.patch
+
   sed -i 's/-pedantic//' configure
+
   ./configure --prefix=/usr
   make
 }

Added: pstoedit-3.50-parallel.patch
===================================================================
--- pstoedit-3.50-parallel.patch	                        (rev 0)
+++ pstoedit-3.50-parallel.patch	2010-08-26 15:26:52 UTC (rev 88955)
@@ -0,0 +1,47 @@
+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				\

Added: pstoedit-3.50-plugin-close.patch
===================================================================
--- pstoedit-3.50-plugin-close.patch	                        (rev 0)
+++ pstoedit-3.50-plugin-close.patch	2010-08-26 15:26:52 UTC (rev 88955)
@@ -0,0 +1,14 @@
+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;
+ }
+