- updated to 3.73

- updated pluginsdir,imagemagick7 patches

diff --git a/imagemagick7.patch b/imagemagick7.patch
index e875a725d2598bcdaa33e8d89f83d6a0632f6e8f..9cf57b4d8243ed1e5643f9b244f66e702b52447f 100644 (file)
--- a/imagemagick7.patch
+++ b/imagemagick7.patch
@@ -10,56 +10,3 @@ diff -ur pstoedit-3.70/configure.ac pstoedit-3.70-im7/configure.ac
                HAVE_LIBMAGICK=yes 
                LIBMAGICK_CFLAGS="-DHAVE_MAGIC $LIBMAGICK_CFLAGS" 
                LIBMAGICK_LDFLAGS="$LIBMAGICK_LIBS" , 
-diff -ur pstoedit-3.70/src/drvmagick++.cpp pstoedit-3.70-im7/src/drvmagick++.cpp
---- pstoedit-3.70/src/drvmagick++.cpp  2015-01-01 18:05:33.000000000 +0100
-+++ pstoedit-3.70-im7/src/drvmagick++.cpp      2016-12-26 23:26:10.491193646 +0100
-@@ -120,14 +120,14 @@
-               const basedrawingelement & elem = pathElement(n);
-               switch (elem.getType()) {
-               case moveto:{
--                              const Point & p = elem.getPoint(0);
-+                                  const ::Point & p = elem.getPoint(0);
-                               const Magick::Coordinate coord(p.x_ + x_offset,
-                                                                                          currentDeviceHeight - p.y_ + y_offset);
-                               vpath.push_back(PathMovetoAbs(coord));
-                       }
-                       break;
-               case lineto:{
--                              const Point & p = elem.getPoint(0);
-+                                  const ::Point & p = elem.getPoint(0);
-                               const Magick::Coordinate coord(p.x_ + x_offset,
-                                                                                          currentDeviceHeight - p.y_ + y_offset);
-                               vpath.push_back(PathLinetoAbs(coord));
-@@ -137,9 +137,9 @@
-                       vpath.push_back(PathClosePath());
-                       break;
-               case curveto:{
--                              const Point & p0 = elem.getPoint(0);
--                              const Point & p1 = elem.getPoint(1);
--                              const Point & p2 = elem.getPoint(2);
-+                                   const ::Point & p0 = elem.getPoint(0);
-+                                   const ::Point & p1 = elem.getPoint(1);
-+                                   const ::Point & p2 = elem.getPoint(2);
-                               vpath.
-                                       push_back(PathCurvetoAbs
-                                                         (PathCurvetoArgs
-@@ -278,7 +278,7 @@
-                       dasharray[i] = d_numbers[i];
-               }
-               dasharray[dp.nrOfEntries] = 0;  // mark last element
--              drawList.push_back(DrawableDashArray(dasharray));       // pulls a copy, so we are the owner of dasharray
-+              drawList.push_back(DrawableStrokeDashArray(dasharray)); // pulls a copy, so we are the owner of dasharray
- //??    DrawableDashOffset
-               delete[]dasharray;
-       }
-@@ -300,7 +300,9 @@
- #ifndef onedrawlist
-       drawList.push_back(DrawablePopGraphicContext());
-       // Draw everything using completed drawing list 
--      imageptr->draw(drawList);
-+      std::vector<Magick::Drawable> drawVect;
-+      copy(drawList.begin(),drawList.end(),back_inserter(drawVect));
-+      imageptr->draw(drawVect);
- #endif
- 
- }

diff --git a/pluginsdir.patch b/pluginsdir.patch
index 38b5222b89f1390fd3a9f088c4cf0da864a79728..0af6e04e906ab0fdd71394ccf435b7dfc4eff0c1 100644 (file)
--- a/pluginsdir.patch
+++ b/pluginsdir.patch
@@ -1,29 +1,33 @@
---- pstoedit-3.70/src/pstoedit.cpp~    2014-09-04 20:21:45.000000000 +0200
-+++ pstoedit-3.70/src/pstoedit.cpp     2015-12-06 11:50:17.944605841 +0100
-@@ -261,26 +261,6 @@
-               loadPlugInDrivers(plugindir.c_str(), errstream, verbose);       // load the driver plugins
-               pluginsloaded = true;
+--- pstoedit-3.73/src/pstoedit.cpp.orig        2019-03-09 09:17:34.193450804 +0100
++++ pstoedit-3.73/src/pstoedit.cpp     2019-03-09 09:19:23.226193457 +0100
+@@ -271,30 +271,6 @@
+         pluginsloaded = true;
        }
--      // also look in the directory where the pstoedit .exe/dll was found
--      char szExePath[1000];
--      szExePath[0] = '\0';
--      const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
--      if (verbose)  errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
--      char *p = 0;
--      if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
+ #endif
+-      // If the above failed, also look in the directory where the pstoedit .exe/dll was found
+-      if (!pluginsloaded) {
+-        char szExePath[1000];
+-        szExePath[0] = '\0';
+-        const unsigned long r = P_GetPathToMyself(progname, szExePath, sizeof(szExePath));
+-        if (verbose)  errstream << "pstoedit : path to myself:" << progname << " " << r << " " << szExePath<< endl;
+-        char *p = nullptr;
+-        if (r && (p = strrchr(szExePath, directoryDelimiter)) != nullptr) {
 -              *p = '\0';
--              if (!strequal(szExePath, plugindir.c_str())) {
--                      loadPlugInDrivers(szExePath, errstream,verbose);
--                      pluginsloaded = true;
--              }
+-              loadPlugInDrivers(szExePath, errstream,verbose);
+-        }
+-        // now try also $exepath/../lib/pstoedit
+-          if (szExePath[0]) {
+-            // it is not an empty string
+-#if COMPILEDFOR64BIT 
+-          strcat_s(szExePath,1000,"/../lib64/pstoedit");
+-#else
+-          strcat_s(szExePath,1000,"/../lib/pstoedit");
+-#endif
+-          if (!strequal(szExePath, plugindir.c_str())) {
+-            loadPlugInDrivers(szExePath, errstream,verbose);
+-          }
+-        }
 -      }
--      // now try also $exepath/../lib/pstoedit
--      strcat_s(szExePath,1000,"/../lib/pstoedit");
--      if (!strequal(szExePath, plugindir.c_str())) {
--      loadPlugInDrivers(szExePath, errstream,verbose);
--              pluginsloaded = true;
--      }
--
- #ifdef PSTOEDITLIBDIR
-       if (!pluginsloaded) {
-         // also try to load drivers from the PSTOEDITLIBDIR
+ 
+       // delete[]plugindir;
+ }

diff --git a/pstoedit.spec b/pstoedit.spec
index 72250760b941e63aea7accd9ed0b436cf47bddfe..514544f949924bde41dd0d7fac224e430292d9a7 100644 (file)
--- a/pstoedit.spec
+++ b/pstoedit.spec
@@ -1,28 +1,30 @@
 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.70
-Release:       9
+Version:       3.73
+Release:       1
 License:       GPL v2+
 Group:         Applications/Graphics
 Source0:       http://downloads.sourceforge.net/pstoedit/%{name}-%{version}.tar.gz
-# Source0-md5: d3ad4657b4944a8400f7ca76f78cb943
+# Source0-md5: aec93415ede08505e950ec7fee4289ff
 Patch0:                pluginsdir.patch
 Patch1:                imagemagick7.patch
 URL:           http://www.helga-glunz.homepage.t-online.de/pstoedit/
-BuildRequires: ImageMagick-c++-devel
+BuildRequires: ImageMagick-c++-devel >= 6
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
 BuildRequires: gd-devel
 BuildRequires: ghostscript
+# TODO: change to texlive component when ready in PLD
+BuildRequires: latex2man
 BuildRequires: libEMF-devel
-BuildRequires: libplot-devel >= 2.3
 BuildRequires: libplotter-devel >= 2.3
 BuildRequires: libstdc++-devel >= 5:3.0
-BuildRequires: libtool >= 2:1.4d-3
+BuildRequires: libtool >= 2:2
 BuildRequires: libzip-devel
 BuildRequires: ming-devel
 BuildRequires: pkgconfig
+BuildRequires: texlive-format-pdflatex
 Requires:      ghostscript
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -138,12 +140,11 @@ Wtyczka wmf dla biblioteki pstoedit. Używa biblioteki libEMF.
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-export CPPFLAGS="%{rpmcflags} `pkg-config --cflags libzip`"
-export CFLAGS="%{rpmcflags} `pkg-config --cflags libzip`"
+export CPPFLAGS="%{rpmcppflags} $(pkg-config --cflags libzip)"
 %configure \
        GS=%{_bindir}/gs \
        --enable-static \
@@ -153,12 +154,12 @@ export CFLAGS="%{rpmcflags} `pkg-config --cflags libzip`"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT{%{_mandir}/man1,%{_aclocaldir}}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-#install doc/pstoedit.1 $RPM_BUILD_ROOT%{_mandir}/man1
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/pstoedit
 
 cp -af contrib/java $RPM_BUILD_ROOT%{_datadir}/pstoedit
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/pstoedit/java/*/{readme*,Makefile*} \