pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/pstoedit Upstream patch for not finding plugi...
details: https://anonhg.NetBSD.org/pkgsrc/rev/618cc7692b9b
branches: trunk
changeset: 351567:618cc7692b9b
user: markd <markd%pkgsrc.org@localhost>
date: Mon Aug 22 11:20:56 2016 +0000
description:
Upstream patch for not finding plugins. Fixes latex input in inkscape.
diffstat:
graphics/pstoedit/Makefile | 4 +-
graphics/pstoedit/distinfo | 6 +-
graphics/pstoedit/patches/patch-doc_pstoedit.1 | 31 ++++++++++
graphics/pstoedit/patches/patch-doc_pstoedit.htm | 31 ++++++++++
graphics/pstoedit/patches/patch-doc_pstoedit.tex | 15 +++++
graphics/pstoedit/patches/patch-src_pstoedit.cpp | 69 ++++++++++++++++++++++++
6 files changed, 153 insertions(+), 3 deletions(-)
diffs (192 lines):
diff -r 37d3b740635a -r 618cc7692b9b graphics/pstoedit/Makefile
--- a/graphics/pstoedit/Makefile Mon Aug 22 09:54:36 2016 +0000
+++ b/graphics/pstoedit/Makefile Mon Aug 22 11:20:56 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.84 2016/08/03 10:22:55 adam Exp $
+# $NetBSD: Makefile,v 1.85 2016/08/22 11:20:56 markd Exp $
DISTNAME= pstoedit-3.70
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= converters graphics print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pstoedit/}
diff -r 37d3b740635a -r 618cc7692b9b graphics/pstoedit/distinfo
--- a/graphics/pstoedit/distinfo Mon Aug 22 09:54:36 2016 +0000
+++ b/graphics/pstoedit/distinfo Mon Aug 22 11:20:56 2016 +0000
@@ -1,8 +1,12 @@
-$NetBSD: distinfo,v 1.17 2016/05/16 20:17:10 adam Exp $
+$NetBSD: distinfo,v 1.18 2016/08/22 11:20:56 markd Exp $
SHA1 (pstoedit-3.70.tar.gz) = 657f8f7070fde1432cd65a34b6b1c4b5b42f8b50
RMD160 (pstoedit-3.70.tar.gz) = b41a02485ebba3861681d280407a788a59538d15
SHA512 (pstoedit-3.70.tar.gz) = 63668ea039fdf988ba007bafb8dc1f23f06d4eb430a92b97fb93c71b819f63e2708b99476ec9b096598db2ddd30d29a69101f078e7d4fdfec314677f50293cf9
Size (pstoedit-3.70.tar.gz) = 1013949 bytes
SHA1 (patch-configure) = a8078dc9774148c3b3700549d7d37fcd018cb799
+SHA1 (patch-doc_pstoedit.1) = b50bddcc1e1ead67c52db7a54eec828cb1b13570
+SHA1 (patch-doc_pstoedit.htm) = 29e050ca77710c035e0b0640f0d39e2d1214b3ac
+SHA1 (patch-doc_pstoedit.tex) = 74313654e322fefd69d67a23d8e29d63aaffbd08
SHA1 (patch-src_Makefile.in) = e792a4645127910488c89b97679b08aa9a55d33c
+SHA1 (patch-src_pstoedit.cpp) = a2fb3609456e46fcb7e3a5f45ad90f1a62f51463
diff -r 37d3b740635a -r 618cc7692b9b graphics/pstoedit/patches/patch-doc_pstoedit.1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/pstoedit/patches/patch-doc_pstoedit.1 Mon Aug 22 11:20:56 2016 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-doc_pstoedit.1,v 1.1 2016/08/22 11:20:56 markd Exp $
+
+Upstream patch for not finding plugins.
+
+--- doc/pstoedit.1.orig 2015-01-01 19:55:13.000000000 +0000
++++ doc/pstoedit.1
+@@ -1,5 +1,5 @@
+ '\" t
+-.\" Manual page created with latex2man on Thu Jan 1 20:55:12 CET 2015
++.\" Manual page created with latex2man on Fri Mar 13 20:58:53 CET 2015
+ .\" NOTE: This file is generated, DO NOT EDIT.
+ .de Vb
+ .ft CW
+@@ -10,7 +10,7 @@
+
+ .fi
+ ..
+-.TH "PSTOEDIT" "1" "01 January 2015" "Conversion Tools " "Conversion Tools "
++.TH "PSTOEDIT" "1" "13 March 2015" "Conversion Tools " "Conversion Tools "
+ .SH NAME
+
+ pstoedit
+@@ -367,7 +367,7 @@ MS Windows: The same directory where the
+ .B *
+ Unix:
+ .br
+-<\fIThe directory where the pstoedit executable is located\fP>
++The default installation directory. If it fails, then <\fIThe directory where the pstoedit executable is located\fP>
+ /../lib/
+ .RS
+ .PP
diff -r 37d3b740635a -r 618cc7692b9b graphics/pstoedit/patches/patch-doc_pstoedit.htm
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/pstoedit/patches/patch-doc_pstoedit.htm Mon Aug 22 11:20:56 2016 +0000
@@ -0,0 +1,31 @@
+$NetBSD: patch-doc_pstoedit.htm,v 1.1 2016/08/22 11:20:56 markd Exp $
+
+Upstream patch for not finding plugins.
+
+--- doc/pstoedit.htm.orig 2015-01-01 19:55:14.000000000 +0000
++++ doc/pstoedit.htm
+@@ -1,5 +1,5 @@
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+-<!-- Manual page created with latex2man on Thu Jan 1 20:55:13 CET 2015
++<!-- Manual page created with latex2man on Fri Mar 13 20:58:54 CET 2015
+ ** Author of latex2man: Juergen.Vollmer%informatik-vollmer.de@localhost
+ ** NOTE: This file is generated, DO NOT EDIT. -->
+ <html>
+@@ -9,7 +9,7 @@
+ PSTOEDIT
+ </h1>
+ <h4 align=center>Dr. Wolfgang Glunz </h4>
+-<h4 align=center>01 January 2015</h4>
++<h4 align=center>13 March 2015</h4>
+ <h4 align=center>Version 3.70 </h4>
+ <tt>pstoedit</tt>
+ - a tool converting PostScript and PDF files into various
+@@ -561,7 +561,7 @@ in the installation directory and uses t
+ </li>
+ <li>Unix:<br>
+
+-<<em>The directory where the pstoedit executable is located</em>>
++The default installation directory. If it fails, then <<em>The directory where the pstoedit executable is located</em>>
+ <tt>/../lib/</tt>
+ <p>
+ </li>
diff -r 37d3b740635a -r 618cc7692b9b graphics/pstoedit/patches/patch-doc_pstoedit.tex
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/pstoedit/patches/patch-doc_pstoedit.tex Mon Aug 22 11:20:56 2016 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-doc_pstoedit.tex,v 1.1 2016/08/22 11:20:56 markd Exp $
+
+Upstream patch for not finding plugins.
+
+--- doc/pstoedit.tex.orig 2015-01-01 19:55:12.000000000 +0000
++++ doc/pstoedit.tex
+@@ -352,7 +352,7 @@ If the \Opt{-fontmap} option is not spe
+ \item MS Windows: The same directory where the \Prog{pstoedit} executable is located
+
+ \item Unix:\\
+- $<$\emph{The directory where the pstoedit executable is located}$>$\verb+/../lib/+
++ The default installation directory. If it fails, then $<$\emph{The directory where the pstoedit executable is located}$>$\verb+/../lib/+
+
+ \end{itemize}
+
diff -r 37d3b740635a -r 618cc7692b9b graphics/pstoedit/patches/patch-src_pstoedit.cpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/pstoedit/patches/patch-src_pstoedit.cpp Mon Aug 22 11:20:56 2016 +0000
@@ -0,0 +1,69 @@
+$NetBSD: patch-src_pstoedit.cpp,v 1.1 2016/08/22 11:20:56 markd Exp $
+
+Upstream patch for not finding plugins.
+
+--- src/pstoedit.cpp.orig 2014-09-04 18:21:45.000000000 +0000
++++ src/pstoedit.cpp
+@@ -30,6 +30,7 @@
+ #include I_string_h
+
+ #include <assert.h>
++#include <sys/stat.h>
+
+ #include "pstoeditoptions.h"
+
+@@ -261,33 +262,33 @@ static void loadpstoeditplugins(const ch
+ loadPlugInDrivers(plugindir.c_str(), errstream, verbose); // load the driver plugins
+ 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) {
+- *p = '\0';
+- if (!strequal(szExePath, plugindir.c_str())) {
+- loadPlugInDrivers(szExePath, errstream,verbose);
+- pluginsloaded = true;
+- }
+- }
+- // 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) {
++ struct stat s;
++ if (!pluginsloaded &&
++ !stat(PSTOEDITLIBDIR, &s) &&
++ S_ISDIR(s.st_mode)) {
+ // also try to load drivers from the PSTOEDITLIBDIR
+ loadPlugInDrivers(PSTOEDITLIBDIR, errstream,verbose);
+ pluginsloaded = true;
+ }
+ #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 = 0;
++ if (r && (p = strrchr(szExePath, directoryDelimiter)) != 0) {
++ *p = '\0';
++ 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);
++ }
++ }
+
+ // delete[]plugindir;
+ }
Home |
Main Index |
Thread Index |
Old Index