From 0f2bde7754233db68c6377a499baccac29475caf Mon Sep 17 00:00:00 2001 From: Chris Morgan Date: Sun, 29 Aug 2010 17:22:59 +1000 Subject: Added inkscape.com to Win32 installer (should have been included in 0.48). (bzr r9730) --- packaging/win32/inkscape.nsi | 1 + 1 file changed, 1 insertion(+) (limited to 'packaging') diff --git a/packaging/win32/inkscape.nsi b/packaging/win32/inkscape.nsi index 00b443f67..b552a23fc 100755 --- a/packaging/win32/inkscape.nsi +++ b/packaging/win32/inkscape.nsi @@ -296,6 +296,7 @@ Section $(Core) SecCore ; Mandatory Inkscape core files section {{{ SetAutoClose false File /a ..\..\inkscape\ink*.exe + File /a ..\..\inkscape\inkscape.com File /a ..\..\inkscape\AUTHORS File /a ..\..\inkscape\COPYING File /a ..\..\inkscape\COPYING.LIB -- cgit v1.2.3 From 26f49e4813747b6cd775d3521bc5597d3231223f Mon Sep 17 00:00:00 2001 From: Michael Wybrow Date: Tue, 9 Nov 2010 09:33:46 +1100 Subject: Fix bug #482993: Python extensions not working on Mac OS X 10.6 Fixed bugs: - https://launchpad.net/bugs/482993 (bzr r9882.1.1) --- packaging/macosx/Resources/bin/inkscape | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'packaging') diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 2621b7db9..07aa65cd2 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -23,6 +23,15 @@ TOP="`dirname \"$CWD\"`" # LaTeX distribution for Mac OS X export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" +# Put /usr/bin at beginning of path so we make sure we use Apple's python +# over one that may be installed be Macports, Fink or some other means. +export PATH="/usr/bin:$PATH" + +# On Snow Leopard, use the 32-bit version of python from Universal build. +# This is because our bundled i386 python libraries are 32-bit only. +export VERSIONER_PYTHON_PREFER_32_BIT=yes + + # Setup PYTHONPATH to use python modules shipped with Inkscape ARCH=`arch` PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` -- cgit v1.2.3