packages: pstoedit/pstoedit-link.patch, pstoedit/pstoedit.spec, pstoedit/ps...
pluto
pluto at pld-linux.org
Thu Mar 4 16:26:43 CET 2010
Author: pluto Date: Thu Mar 4 15:26:43 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 3.50.
---- Files affected:
packages/pstoedit:
pstoedit-link.patch (1.6 -> 1.7) , pstoedit.spec (1.24 -> 1.25) , pstoedit-ming.patch (1.1 -> NONE) (REMOVED), pstoedit-no_pedantic.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/pstoedit/pstoedit-link.patch
diff -u packages/pstoedit/pstoedit-link.patch:1.6 packages/pstoedit/pstoedit-link.patch:1.7
--- packages/pstoedit/pstoedit-link.patch:1.6 Wed Oct 15 21:17:24 2008
+++ packages/pstoedit/pstoedit-link.patch Thu Mar 4 16:26:37 2010
@@ -1,6 +1,6 @@
---- pstoedit-3.45/src/Makefile.am.orig 2007-07-08 12:52:54.000000000 +0200
-+++ pstoedit-3.45/src/Makefile.am 2008-10-15 19:39:15.290634821 +0200
-@@ -64,27 +64,27 @@
+--- pstoedit-3.50/src/Makefile.am.orig 2009-08-13 10:13:53.000000000 +0200
++++ pstoedit-3.50/src/Makefile.am 2010-03-04 13:49:28.246924623 +0100
+@@ -84,7 +84,7 @@
drvsvm.cpp drvsvm.h svm_actions.h \
$(specific_drivers_src) \
$(sample_drivers_src)
@@ -8,6 +8,10 @@
+libp2edrvstd_la_LIBADD=libpstoedit.la
libp2edrvstd_la_LDFLAGS=-no-undefined -module
+ #libp2edrvplugins_la_SOURCES=drvmif.cpp drvcgm.cpp drvrtf.cpp drvwwmf.cpp
+@@ -93,25 +93,25 @@
+ #libp2edrvplugins_la_CFLAGS=-I../Check/ -I../othersrc/cdlib
+
libp2edrvlplot_la_SOURCES=drvlplot.cpp drvlplot.h initlibrary.cpp
-libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) -L. libpstoedit.la
+libp2edrvlplot_la_LIBADD=$(LIBPLOTTER_LDFLAGS) libpstoedit.la
@@ -18,10 +22,12 @@
+libp2edrvswf_la_LIBADD=$(LIBMING_LDFLAGS) libpstoedit.la
libp2edrvswf_la_LDFLAGS=-no-undefined -module
+ # 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_LIBADD=libpstoedit.la
libp2edrvmagick___la_LDFLAGS=-no-undefined ${LIBMAGICK_LDFLAGS} -module
+ # moved to configure.ac because needed only for g++ libp2edrvmagick___la_CPPFLAGS=$(LIBMAGICK_CFLAGS) $(AM_CPPFLAGS) -Wno-long-long
if USE_EMFBYSOURCE
libp2edrvwmf_la_SOURCES=emflib.cpp drvwmf.cpp drvwmf.h initlibrary.cpp
@@ -34,7 +40,7 @@
endif
libpstoedit_la_SOURCES = \
-@@ -107,7 +107,7 @@
+@@ -134,7 +134,7 @@
libpstoedit_la_LDFLAGS = -no-undefined
pstoedit_SOURCES = cmdmain.cpp
================================================================
Index: packages/pstoedit/pstoedit.spec
diff -u packages/pstoedit/pstoedit.spec:1.24 packages/pstoedit/pstoedit.spec:1.25
--- packages/pstoedit/pstoedit.spec:1.24 Wed Oct 15 21:20:17 2008
+++ packages/pstoedit/pstoedit.spec Thu Mar 4 16:26:37 2010
@@ -2,19 +2,17 @@
Summary: Convert PostScript and PDF files into various vector-graphic formats
Summary(pl.UTF-8): Konwerter PostScriptu i PDF do różnych formatów wektorowych
Name: pstoedit
-Version: 3.45
+Version: 3.50
Release: 1
License: GPL v2+
Group: Applications/Graphics
Source0: http://dl.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
-# Source0-md5: 071efc64d9edf5d942b407348ac7451d
+# Source0-md5: 97d649305ad90fab7a569154f17e0916
Patch0: %{name}-opt.patch
-Patch1: %{name}-no_pedantic.patch
-Patch2: %{name}-link.patch
-Patch3: %{name}-am18.patch
-Patch4: %{name}-ming.patch
+Patch1: %{name}-link.patch
+Patch2: %{name}-am18.patch
URL: http://www.helga-glunz.homepage.t-online.de/pstoedit/
-BuildRequires: GraphicsMagick-c++-devel >= 1.0.6
+BuildRequires: ImageMagick-c++-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: bzip2-devel
@@ -124,8 +122,6 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
# need to rebuild - supplied libtool is broken (relink and C++)
@@ -136,8 +132,9 @@
%configure \
GS=/usr/bin/gs \
--enable-static \
+ --with-magick \
--with-libemf-include=/usr/include/libEMF
-%{__make}
+%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
@@ -148,7 +145,7 @@
install doc/pstoedit.1 $RPM_BUILD_ROOT%{_mandir}/man1
-cp -af java $RPM_BUILD_ROOT%{_datadir}/pstoedit
+cp -af contrib/java $RPM_BUILD_ROOT%{_datadir}/pstoedit
rm -f $RPM_BUILD_ROOT%{_datadir}/pstoedit/java/*/{readme*,Makefile*} \
$RPM_BUILD_ROOT%{_datadir}/pstoedit/java/Makefile* \
$RPM_BUILD_ROOT%{_libdir}/pstoedit/lib*.{la,a}
@@ -161,7 +158,7 @@
%files
%defattr(644,root,root,755)
-%doc doc/{readme.txt,*.htm} java/java1/readme_java1.txt java/java2/readme_java2.html
+%doc doc/{readme.txt,*.htm} contrib/java/java1/readme_java1.txt contrib/java/java2/readme_java2.html
%attr(755,root,root) %{_bindir}/pstoedit
%attr(755,root,root) %{_libdir}/libpstoedit.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libpstoedit.so.0
@@ -204,6 +201,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.25 2010/03/04 15:26:37 pluto
+- updated to 3.50.
+
Revision 1.24 2008/10/15 19:20:17 qboosh
- updated to 3.45
- updated link patch, added ming patch
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pstoedit/pstoedit-link.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/pstoedit/pstoedit.spec?r1=1.24&r2=1.25&f=u
More information about the pld-cvs-commit
mailing list