Switch to using external pdftops utility to convert pdf to ps on mac.

This commit is contained in:
Roman Telezhynskyi 2023-09-12 14:46:23 +03:00
parent db1b4496f1
commit 4eba1fa673
6 changed files with 2 additions and 31 deletions

View File

@ -39,6 +39,7 @@
- New option: Pointer mode. - New option: Pointer mode.
- Fix GUI freezing while nesting. - Fix GUI freezing while nesting.
- New option: Use Tool Groups. - New option: Use Tool Groups.
- Switch to using external pdftops utility to convert pdf to ps on mac.
# Valentina 0.7.52 September 12, 2022 # Valentina 0.7.52 September 12, 2022
- Fix crash when default locale is ru. - Fix crash when default locale is ru.

Binary file not shown.

View File

@ -201,16 +201,6 @@ VToolApp {
qbs.installDir: buildconfig.installBinaryPath qbs.installDir: buildconfig.installBinaryPath
} }
Group {
condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64") && buildconfig.enableMultiBundle
name: "pdftops MacOS"
prefix: project.sourceDirectory + "/dist/macx/bin64/"
files: ["pdftops"]
fileTags: ["pdftops_dist_macx"]
qbs.install: true
qbs.installDir: buildconfig.installBinaryPath
}
Group { Group {
name: "48x48/apps" name: "48x48/apps"
prefix: project.sourceDirectory + "/share/icons/48x48/apps/" prefix: project.sourceDirectory + "/share/icons/48x48/apps/"

View File

@ -304,10 +304,6 @@ unix{
puzzle.path = $$MACOS_DIR puzzle.path = $$MACOS_DIR
puzzle.files += $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.app/$$MACOS_DIR/puzzle puzzle.files += $${OUT_PWD}/../puzzle/$${DESTDIR}/puzzle.app/$$MACOS_DIR/puzzle
# Utility pdftops need for saving a layout image to PS and EPS formates.
xpdf.path = $$MACOS_DIR
xpdf.files += $${PWD}/../../../dist/macx/bin64/pdftops
# logo on macx. # logo on macx.
ICON = ../../../dist/Valentina.icns ICON = ../../../dist/Valentina.icns
@ -346,7 +342,6 @@ unix{
libraries \ libraries \
tape \ tape \
puzzle \ puzzle \
xpdf \
icns_resources icns_resources
} }
} }

View File

@ -265,15 +265,6 @@ VToolApp {
qbs.installDir: buildconfig.installBinaryPath qbs.installDir: buildconfig.installBinaryPath
} }
Group {
condition: qbs.targetOS.contains("macos") && qbs.architecture.contains("x86_64")
name: "pdftops MacOS"
prefix: project.sourceDirectory + "/dist/macx/bin64/"
files: ["pdftops"]
qbs.install: true
qbs.installDir: buildconfig.installBinaryPath
}
Group { Group {
name: "freedesktop" name: "freedesktop"
prefix: project.sourceDirectory + "/dist/" prefix: project.sourceDirectory + "/dist/"

View File

@ -405,7 +405,7 @@ void VLayoutExporter::ExportToHPGL2(const QVector<VLayoutPiece> &details) const
auto VLayoutExporter::SupportPDFConversion() -> bool auto VLayoutExporter::SupportPDFConversion() -> bool
{ {
QProcess proc; QProcess proc;
#if defined(Q_OS_WIN) || defined(Q_OS_OSX) #if defined(Q_OS_WIN)
// Seek pdftops in app bundle or near valentina.exe // Seek pdftops in app bundle or near valentina.exe
proc.start(qApp->applicationDirPath() + QLatin1String("/") + *PDFTOPS, QStringList()); proc.start(qApp->applicationDirPath() + QLatin1String("/") + *PDFTOPS, QStringList());
#else #else
@ -435,13 +435,7 @@ void VLayoutExporter::PdfToPs(const QStringList &params)
#endif #endif
QProcess proc; QProcess proc;
#if defined(Q_OS_MAC)
// Fix issue #594. Broken export on Mac.
proc.setWorkingDirectory(qApp->applicationDirPath());
proc.start(QLatin1String("./") + *PDFTOPS, params);
#else
proc.start(*PDFTOPS, params); proc.start(*PDFTOPS, params);
#endif
const int timeout = 15000; const int timeout = 15000;
if (proc.waitForStarted(timeout)) if (proc.waitForStarted(timeout))