Inkscape

Merge lp://qastaging/~inkscape.dev/inkscape/osx-packaging-update into lp://qastaging/~inkscape.dev/inkscape/trunk

osx-packaging-update
Merge into trunk

Proposed by su_v on 2015-11-20

Status:

Needs review

Proposed branch:

lp://qastaging/~inkscape.dev/inkscape/osx-packaging-update

Merge into:

lp://qastaging/~inkscape.dev/inkscape/trunk

Diff against target:

531 lines (+157/-147)

10 files modified

packaging/macosx/Resources/bin/inkscape (+8/-18)
packaging/macosx/Resources/openDoc (+4/-0)
packaging/macosx/Resources/script (+5/-6)
packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh (+10/-19)
packaging/macosx/ScriptExec/main.c (+7/-86)
src/extension/internal/pdfinput/pdf-input.cpp (+6/-1)
src/path-prefix.h (+17/-17)
src/prefix.cpp (+75/-0)
src/prefix.h (+17/-0)
src/ui/dialog/inkscape-preferences.cpp (+8/-0)

To merge this branch:

bzr merge lp://qastaging/~inkscape.dev/inkscape/osx-packaging-update

Related bugs:

Bug #181639: Command-line invocation on Mac OSX partially broken	Low	Triaged
Bug #956282: Unicode characters from PDF import	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Inkscape Developers		2015-11-20	Pending
Review via email: mp+278139@code.qastaging.launchpad.net

Description of the change

Rewrite of relocation support for OS X application bundles:

Instead of requiring CWD to be a specific location inside the app bundle (to resolve relative paths to Inkscape's shared resources), use a macro similar to relocation support for Linux and Windows, based on the path of the current executable. This will ease command line usage (bug #181639).

Revision history for this message

Martin Owens (doctormo) wrote on 2016-10-03:

Is this merge request still useful and open? Should we get these changes into trunk?

Revision history for this message

su_v (suv-lp) wrote on 2016-12-30:

The proposed changes in src/ are still useful (the merge proposal was never closed): future packages for macOS with GTK3/Quartz will still benefit if Inkscape had better internal relocation support on that platform than what the current code offers. The details of the proposed changes will have to be reviewed/adapted by whoever will work on future macOS packages of Inkscape with GTK3/Quartz.

Proposing to keep this one open for now.

Unmerged revisions

14484. By su_v on 2015-11-20: packaging/macosx: update comments in launcher scripts about CWD and relocation support
14483. By su_v on 2015-11-20: packaging/macosx: sync quartz launcher script (currently not used)
14482. By su_v on 2015-11-20: packaging/macosx: use new path-prefix macro for poppler relocation support
14481. By su_v on 2015-11-20: packaging/macosx: no need to store bundleId for relocation support with gtk-mac-integration
14480. By su_v on 2015-11-20: packaging/macosx: rewrite relocation support (bug #181639)
14479. By su_v on 2015-11-20: packaging/macosx: ScriptExec - remove unused code