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

[su_v]

Update of current X11-based Mac OS X packaging scripts to support latest versions of dependencies and newer versions of OS X.

The branch has been tested on Mac OS X 10.5.8 Leopard (Liam P. White) and Mac OS X 10.7.5 Lion (~suv).

Sample DMG (Lion+) available here:
https://www.dropbox.com/sh/dicvshyiddqb923/AABiWV5m15-yNmwhyyCvdjJoa?dl=0

Todo:
- Update documentation (wiki) once the branch has been merged.

Postponed:
- Support trunk's new 'Import Clip Art' (requires bundling dbus (for session dbus) and gvfsd, both not fully relocatable due to absolute paths in service and mount files; see also bug #943148).
The experimental branch 'osxmenu' has a working implementation (DMGs available).

[lp:~inkscape.dev/inkscape/osx-packaging-update]

13550. By Liam P. White on 2014-09-09

Fix bug #1357411

13551. By Liam P. White on 2014-09-10

Fix bug #1367520 (crash regression)

13552. By jazzynico on 2014-09-12

i18n. Fix for Bug #1368375 (Page titles in preferences don't escape text for markup) by houz.

13553. By jazzynico on 2014-09-12

Translations. Italian translation update (79%) by Firas Hanife.

13554. By jazzynico on 2014-09-12

i18n. Adding context to the "Group" verb (undo history).
Translations. Translation template and French translation udpate.

13555. By su_v on 2014-09-13

Fix GTK3 build

13556. By Bryce Harrington on 2014-09-14

Always check result of sp_repr_read_mem for NULL

In cases where undefined or invalid XML is passed to sp_repr_read_mem(),
it will indicate failure by returning NULL. All callers must check for
this and handle the error condition accordingly.

Fixes: lp: #1170248

13557. By Tavmjong Bah on 2014-09-17

Remove MapSymbols.svg which contains messy and incorrect SVG (<symbols> cannot
have the 'transform' attribute, multiple identical <style> elements, etc.).
In compensation, add new file MapSymbolsNPS.svg. Expand README.

13558. By jazzynico on 2014-09-17

Translations. Italian translation update (83%) by Firas Hanife.

13559. By Bryce Harrington on 2014-09-18

win32 packaging: Fix capitalization of "register file extensions"

Fixes: https://bugs.launchpad.net/inkscape/+bug/1365927

13560. By Bryce Harrington on 2014-09-18

Fix build for fink on OS X 10.9 by including unistd.h

Fixes: https://bugs.launchpad.net/inkscape/+bug/1340914

13561. By Alvin Penner on 2014-09-19

scale clip or mask upon unit change (Bug 1287288)

13562. By Alvin Penner on 2014-09-19

improved version of rev 13561, to allow transforming both clip and mask on the same group

13563. By jazzynico on 2014-09-23

Extensions. Fix for Bug #1372200 (Comment within <script> element in INX file triggers crash on launch).

13564. By Tavmjong Bah on 2014-09-23

Fix for #1334792. Correct inheritance for 'line-height' property.

13565. By jazzynico on 2014-09-27

Translations. Updating the Czech translation file with the latest Inkscape strings.

13566. By Alvin Penner on 2014-09-27

transform text in text-on-path the same regardless of whether optimized or preserved (Bug 1279534)

13567. By Tavmjong Bah on 2014-09-29

Conditionally add 'semilight' due to changes in Pango 1.36.6. Curse Behdad.

13568. By Tavmjong Bah on 2014-09-29

Quick fix to unbreak build from last check in.

13569. By Tavmjong Bah on 2014-09-29

Remove NRTypePosDef class and associated cruft. More direct CSS -> Pango translation.

13570. By Liam P. White on 2014-10-01

Revert r13496 (regression -- needs more work)

13571. By jazzynico on 2014-10-01

Fix for bug #690255 (Rename te_IN.po to te.po).

13572. By jazzynico on 2014-10-01

Fix for Bug #1358520 (show/hide other layers not properly recorded in undo history).

13573. By jazzynico on 2014-10-01

Importing. Fix for Bug #1325822 (BMP images resolution not correctly imported).

13574. By Tavmjong Bah on 2014-10-02

Fix style string while searching for best face match.
Fix typo for 'ultra-condensed' face in fontspec_from_style().

13575. By jazzynico on 2014-10-02

Fixing inconsistencies in the PixelArt dialog.

13576. By jazzynico on 2014-10-02

i18n. Fix for Bug #380522 (strings that need to be fixed for translation).
Translations. Inkscape.pot and French translation update.

13577. By Tavmjong Bah on 2014-10-02

Work-around for Pango 1.36.7 which introduced 'Semi-Light' font weight,
bug #1364937.

13578. By Alvin Penner on 2014-10-03

modify scaling procedure for uniform scaling of flowed text (Bug 1278561)

13579. By Tavmjong Bah on 2014-10-05

More direct way of finding font-family in SPText::description.

13580. By Tavmjong Bah on 2014-10-05

Remove unused functions.

13581. By Alvin Penner on 2014-10-08

avoid round-off error when calculating viewbox transform c2p (Bug 1374614 and Bug 1235279)

13582. By Tavmjong Bah on 2014-10-09

Add comment.

13583. By Tavmjong Bah on 2014-10-09

Allow <sodipodi:namedview> attributes to be set by scripts.

13584. By Tavmjong Bah on 2014-10-09

Fix 'viewBox' and 'inkscape:document-units', add 'inkscape:cx' and 'inkscape:cy'.

13585. By Tavmjong Bah on 2014-10-09

Add proper 'viewBox', set 'inkscape:document-units',
set maximum em-size to 2048 as is typical in TrueType.

13586. By Tavmjong Bah on 2014-10-09

Apply cx, cy, etc. from template to newly created document window.

13587. By Johan Engelen on 2014-10-11

Fix "Argument with 'nonnull' attribute passed null" API bug in extension color parameter construction.

Clang static analyzer has found an "Argument with 'nonnull' attribute passed null".
The applied fix here checks if the defaulthex argument is nullptr before making the call. A default initialization value is added to the constructor in case defaulthex == nullptr.

(with additional whitespace improvements)

13588. By Johan Engelen on 2014-10-11

Fix uninitialized variable use in svg-color.cpp. (additionally reduce scope of variable)

Bug found using clang static analyzer.
The bug happens with color_out not being initialized upon definition; then
1. if(icc) == true
2. if(prof) == true
3. if(trans) == false
4. *r = color_out[0]; <-- un-init use
Fixed by initializing color_out (with black).

13589. By Johan Engelen on 2014-10-11

LPEVonKoch : remove redundant assignment (is taken care of by the following if-statement)

Found by clang static analyzer

13590. By Alvin Penner on 2014-10-11

maintain page size units when resizing page to drawing (Bug 1310787)

13591. By Johan Engelen on 2014-10-12

LPEVonKoch: improve rev. 13589 by removing the else branch for complexity calculation for better human readability

13592. By Johan Engelen on 2014-10-12

Change clang-format configuration

Prefer
    ParamColor::ParamColor(const gchar *name, const gchar *guitext, const gchar *desc, const Parameter::_scope_t scope,
                           bool gui_hidden, const gchar *gui_tip, Inkscape::Extension::Extension *ext,
                           Inkscape::XML::Node *xml)
        : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext)
        , _value(0)
        , _changeSignal(0)
    {
over
    ParamColor::ParamColor(const gchar *name, const gchar *guitext, const gchar *desc, const Parameter::_scope_t scope,
                           bool gui_hidden, const gchar *gui_tip, Inkscape::Extension::Extension *ext,
                           Inkscape::XML::Node *xml)
        : Parameter(name, guitext, desc, scope, gui_hidden, gui_tip, ext), _value(0), _changeSignal(0)
    {

13593. By Johan Engelen on 2014-10-12

Mass fix whitespace (clang-format) before working on bug

13594. By Johan Engelen on 2014-10-12

undo whitespace edit. it's an external dependency, and let's assume that the potential bug is not a bug (line 611, possibly uninitialized used of prev[i])

13595. By Tavmjong Bah on 2014-10-12

 Fix "Access to field 'image_out' results in a dereference of a null pointer"

13596. By Tavmjong Bah on 2014-10-12

Fix "Access to field 'image_out' results in a dereference of a null pointer"

13597. By Tavmjong Bah on 2014-10-12

Fix "Access to field 'image_out' results in a dereference of a null pointer"

13598. By Tavmjong Bah on 2014-10-12

Fix "Value stored to 'child' is never read"

13599. By Johan Engelen on 2014-10-12

Extension enumeration/dropdownbox parameter: fix potential NULL-deref crash on xml == nullptr.

13600. By Johan Engelen on 2014-10-12

noop: remove duplicate assignment in sp-lpe-item.cpp

13601. By Johan Engelen on 2014-10-12

object-snapper.cpp : make the logic easier to read (use else-clause as default initialization value)

13602. By Johan Engelen on 2014-10-12

path combine: add an assert to indicate that item list cannot be empty

13603. By Johan Engelen on 2014-10-12

DrawingItem: add NULL check (bug found by clang static analyzer)

13604. By jazzynico on 2014-10-12

Translations. Russian translation update by Alexandre Prokoudine.

13605. By Alvin Penner on 2014-10-12

improve precision of viewBox in mm

13606. By Tavmjong Bah on 2014-10-13

Fix: "Forming reference to null pointer"

13607. By Tavmjong Bah on 2014-10-13

Fix "Called C++ object pointer is null"

13608. By Tavmjong Bah on 2014-10-13

Fix multiple: "Called C++ object pointer is null"

13609. By Tavmjong Bah on 2014-10-13

Fixed: "Called C++ object pointer is null"

13610. By Bryce Harrington on 2014-10-14

2geom: Re-fix IS_NAN and IS_FINITE for solaris

This patch should go upstream to 2geom...

13611. By Bryce Harrington on 2014-10-14

Fix crash with GTK+ 3.14 on launch

Patch from Liam to check for undefined desktop during startup.

** (inkscape:57708): CRITICAL **: SPCanvas* sp_desktop_canvas(const
   SPDesktop*): assertion 'desktop != NULL' failed

Fixes: https://bugs.launchpad.net/inkscape/+bug/1375085

13612. By Tavmjong Bah on 2014-10-14

Add 'white-space' CSS property (replaces deprecated xml:space).

13613. By Tavmjong Bah on 2014-10-14

Implement marker 'orient' attribute value 'auto-start-reverse'.

13614. By Tavmjong Bah on 2014-10-14

Merge hatch rendering code from Tomasz Boczkowski.

13615. By Jon A. Cruz on 2014-10-15

Post-merge cleanup.

13616. By Liam P. White on 2014-10-15

Fix build

13617. By Tavmjong Bah on 2014-10-15

Font caching from experimental branch. Speeds up Inkscape start-up.
Most work by Liam. Various tweeks by Tav.

13618. By Jon A. Cruz on 2014-10-16

Cleanup of unintialized and leaked values.

[Bryce Harrington (bryce)]

I'm probably the least qualified person to review this, but overall it looks fine and I'd have no issue with it going into stable. It doesn't really touch anything in Inkscape's core, so the risk to the project is nil. Worst case is it breaks OSX packaging, but as I understand it OSX packaging is already busted so this brings no additional risk.

I say go ahead and land it now, as is. If there's problems they can be fixed in time.

Below are some comments, mostly trivial stuff, you can take or ignore as desired. I know some of the scripts and patches are third party bits so review comments on those is probably purposeless. If there's any bits that you'd like a more studious review on then please point those out, but otherwise I see no reason to block merging of this.

--- /tmp/7f4cb682-534e-11e4-ab0f-002481e91f22-1.txt 2014-10-16 15:24:29.630670179 -0700
+++ suv.patch 2014-10-16 15:24:11.974602365 -0700
@@ -486,7 +486,10 @@
 + <https://www.macports.org/install.php>
 +
 +2) add MacPorts to your PATH environement variable, for example:
-+
+
+sp. environment
+
+
 +$ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH"
 +
 +3) add 'ports/' subdirectory as local portfile repository:
@@ -1093,8 +1096,14 @@ Binary files packaging/macosx/Resources-
 +unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH
 +unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH
 +unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS
-+
-+
+
+This feels weird to me, I wonder what the intention of unsetting
+all these specific vars are? If the intent is to clear the env,
+then there's simpler ways, like using env -i or even something like:
+
+unset $(/usr/bin/env | egrep '^(\w+)=(.*)$' | \
+ egrep -vw 'PWD|USER|LANG' | /usr/bin/cut -d= -f1);
+
 +# --- detect installed GIMP.app
 +
 +unset GIMP_APP
@@ -1179,7 +1188,13 @@ Binary files packaging/macosx/Resources-
 +# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative
 +# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
 +# of working directory is required:
-+#
+
+Just as an aside...
+If I understand the issue here, I think it's general and not just OSX.
+It should be possible to run Inkscape directly from its build directory
+without having to have had an inkscape installed previously, but last
+I tried it didn't work.
+
 +# Due to changes after 0.48, we have change working directory in the script named 'inkscape':
 +# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
 +# fail (for python-based extensions, inkscape changes the working directory to the
@@ -1566,7 +1581,12 @@ Binary files packaging/macosx/Resources-
 +# ---------------------------------------------------------------------
 +# d) ... otherwise run default python
 +# ---------------------------------------------------------------------
-+
+
+Is all the above commented out stuff even worth including?
+
+Also, since we're not actually doing anything, is it worth the
+bother to wrapper python?
+
 +exec /usr/bin/python "$@"
 +
 +# eof
@@ -2385,6 +2405,11 @@ Binary files packaging/mac...

review: Approve (code)

[lp:~inkscape.dev/inkscape/osx-packaging-update]

13619. By Jon A. Cruz on 2014-10-16

Removed dangerous GTK-mimicking macros.

13620. By Liam P. White on 2014-10-16

Merge in osx-packaging-update branch. OS X packaging now works correctly for trunk.

=== modified file '.bzrignore'
--- .bzrignore	2014-07-23 05:21:25 +0000
+++ .bzrignore	2014-10-14 03:02:11 +0000
@@ -219,3 +219,8 @@
 Inkscape.creator.user
 Inkscape.files
 Inkscape.includes
+# osxapp (X11)
+build-osxapp
+inst-osxapp
+packaging/macosx/ScriptExec/build
+packaging/macosx/Inkscape.app
 
=== modified file 'Info.plist.in'
--- Info.plist.in	2009-06-12 08:06:35 +0000
+++ Info.plist.in	2014-10-14 03:02:11 +0000
@@ -328,9 +328,13 @@
     <string>Inks</string>
     <key>CFBundleVersion</key>
     <string>@VERSION@</string>
+    <key>CGDisableCoalescedUpdates</key>
+    <false/>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.graphics-design</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>10.5</string>
     <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>10.3</string>
+    <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string>
 </dict>
 </plist>
 
=== modified file 'Makefile.am'
--- Makefile.am	2014-06-18 21:40:20 +0000
+++ Makefile.am	2014-10-14 03:02:11 +0000
@@ -102,71 +102,365 @@
 	cxxtest/cxxtest/X11Gui.h \
 	cxxtest/cxxtest/YesNoRunner.h \
 	packaging/autopackage/default.apspec.in	\
-	packaging/macosx/dmg_background.png	\
-	packaging/macosx/inkscape.ds_store	\
-	packaging/macosx/osx-app.sh	\
-	packaging/macosx/osx-dmg.sh	\
-	packaging/macosx/osx-build.sh	\
-	packaging/macosx/Resources/MenuBar.nib/classes.nib	\
-	packaging/macosx/Resources/MenuBar.nib/info.nib	\
-	packaging/macosx/Resources/MenuBar.nib/objects.xib	\
+	packaging/macosx/README.txt \
+	packaging/macosx/Resources/Inkscape.icns \
+	packaging/macosx/Resources/MenuBar.nib/classes.nib \
+	packaging/macosx/Resources/MenuBar.nib/info.nib \
+	packaging/macosx/Resources/MenuBar.nib/objects.xib \
+	packaging/macosx/Resources/ProgressWindow.nib/classes.nib \
+	packaging/macosx/Resources/ProgressWindow.nib/info.nib \
+	packaging/macosx/Resources/ProgressWindow.nib/objects.xib \
+	packaging/macosx/Resources/alert_fccache.sh \
 	packaging/macosx/Resources/application-gimp-gradient.icns \
-	packaging/macosx/Resources/application-vnd.ms.xaml.icns \
-	packaging/macosx/Resources/image-vnd.sk1.icns \
+	packaging/macosx/Resources/application-illustrator-svg.icns \
 	packaging/macosx/Resources/application-illustrator.icns \
+	packaging/macosx/Resources/application-pdf.icns \
+	packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \
+	packaging/macosx/Resources/application-vnd.corel-draw-template.icns \
 	packaging/macosx/Resources/application-vnd.corel-draw.icns \
-	packaging/macosx/Resources/image-x-eps.icns \
-	packaging/macosx/Resources/Inkscape.icns \
-	packaging/macosx/Resources/image-vnd.dxf.icns \
+	packaging/macosx/Resources/application-vnd.ms.xaml.icns \
+	packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \
+	packaging/macosx/Resources/bin/gimp-wrapper.sh \
+	packaging/macosx/Resources/bin/inkscape \
+	packaging/macosx/Resources/bin/python-wrapper.sh \
+	packaging/macosx/Resources/etc/fonts/fonts.conf \
+	packaging/macosx/Resources/etc/gtk-2.0/gtkrc \
 	packaging/macosx/Resources/image-svg+xml-compressed.icns \
-	packaging/macosx/Resources/application-pdf.icns \
-	packaging/macosx/Resources/application-vnd.corel-draw-template.icns \
-	packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \
 	packaging/macosx/Resources/image-svg+xml.icns \
+	packaging/macosx/Resources/image-vnd.dxf.icns \
+	packaging/macosx/Resources/image-vnd.sk1.icns \
 	packaging/macosx/Resources/image-vnd.windows-metafile.icns \
+	packaging/macosx/Resources/image-x-eps.icns \
 	packaging/macosx/Resources/image-x-ps.icns \
-	packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \
-	packaging/macosx/Resources/application-illustrator-svg.icns \
-	packaging/macosx/Resources/openDoc	\
-	packaging/macosx/Resources/script	\
-	packaging/macosx/Resources/ProgressWindow.nib/classes.nib	\
-	packaging/macosx/Resources/ProgressWindow.nib/info.nib	\
-	packaging/macosx/Resources/ProgressWindow.nib/objects.xib	\
-	packaging/macosx/Resources/bin/getdisplay.sh	\
-	packaging/macosx/Resources/bin/inkscape	\
-	packaging/macosx/Resources/etc/fonts/fonts.conf	\
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png \
-	packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png \
-	packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib	\
-	packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib	\
-	packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib	\
-	packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings	\
-	packaging/macosx/ScriptExec/Info.plist	\
-	packaging/macosx/ScriptExec/ScriptExec_Prefix.pch	\
-	packaging/macosx/ScriptExec/main.c	\
-	packaging/macosx/ScriptExec/openDoc	\
-	packaging/macosx/ScriptExec/script	\
-	packaging/macosx/ScriptExec/version.plist	\
-	packaging/macosx/ScriptExec/MenuBar.nib/classes.nib	\
-	packaging/macosx/ScriptExec/MenuBar.nib/info.nib	\
-	packaging/macosx/ScriptExec/MenuBar.nib/objects.xib	\
-	packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj	\
+	packaging/macosx/Resources/openDoc \
+	packaging/macosx/Resources/script \
+	packaging/macosx/Resources/xdg_setup.sh \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png \
+	packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png \
+	packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \
+	packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \
+	packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \
+	packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \
+	packaging/macosx/ScriptExec/Info.plist \
+	packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \
+	packaging/macosx/ScriptExec/MenuBar.nib/info.nib \
+	packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \
 	packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \
+	packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \
+	packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh \
+	packaging/macosx/ScriptExec/main.c \
+	packaging/macosx/ScriptExec/openDoc \
+	packaging/macosx/ScriptExec/script \
+	packaging/macosx/ScriptExec/version.plist \
+	packaging/macosx/create-stock-icon-theme.sh \
+	packaging/macosx/dmg_background.png \
+	packaging/macosx/dmg_background.svg \
+	packaging/macosx/dmg_set_style.scpt \
+	packaging/macosx/inkscape.ds_store \
+	packaging/macosx/osx-app.sh \
+	packaging/macosx/osx-build.sh \
+	packaging/macosx/osx-dmg.sh \
+	packaging/macosx/ports/devel/inkscape-packaging/Portfile \
+	packaging/macosx/ports/lang/python25/Portfile \
+	packaging/macosx/ports/lang/python25/files/_localemodule.c.ed \
+	packaging/macosx/ports/lang/python25/files/locale.py.ed \
+	packaging/macosx/ports/lang/python25/files/patch-64bit.diff \
+	packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff \
+	packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff \
+	packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff \
+	packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff \
+	packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff \
+	packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff \
+	packaging/macosx/ports/lang/python25/files/patch-configure.diff \
+	packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff \
+	packaging/macosx/ports/lang/python25/files/patch-libedit.diff \
+	packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff \
+	packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff \
+	packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff \
+	packaging/macosx/ports/lang/python25/files/patch-setup.py.diff \
+	packaging/macosx/ports/lang/python25/files/pyconfig.ed \
+	packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed \
+	packaging/macosx/ports/lang/python25/files/python25 \
+	packaging/macosx/ports/lang/python26/Portfile \
+	packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff \
+	packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff \
+	packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff \
+	packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff \
+	packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff \
+	packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff \
+	packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff \
+	packaging/macosx/ports/lang/python26/files/patch-setup.py.diff \
+	packaging/macosx/ports/lang/python26/files/pyconfig.ed \
+	packaging/macosx/ports/lang/python26/files/python26 \
+	packaging/macosx/ports/lang/python26/files/version.plist \
+	packaging/macosx/ports/python/py-Pillow/Portfile \
+	packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff \
+	packaging/macosx/ports/python/py-sk1libs/Portfile \
+	packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff \
+	packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff \
+	packaging/macosx/ports/python/py-uniconvertor/Portfile \
+	packaging/macosx/ports/python/py25-Pillow/Portfile \
+	packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff \
+	packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff \
+	packaging/macosx/ports/python/py25-lxml/Portfile \
+	packaging/macosx/ports/python/py25-nose/Portfile \
+	packaging/macosx/ports/python/py25-nose/files/nosetests24 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests25 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests26 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests27 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests31 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests32 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests33 \
+	packaging/macosx/ports/python/py25-nose/files/nosetests34 \
+	packaging/macosx/ports/python/py25-numpy/Portfile \
+	packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff \
+	packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff \
+	packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff \
+	packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff \
+	packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff \
+	packaging/macosx/ports/python/py25-numpy/files/wrapper-template \
+	packaging/macosx/ports/python/py25-setuptools/Portfile \
 	packaging/win32/inkscape.nsi	\
 	packaging/win32/inkscape.nsi.uninstall	\
 	packaging/win32/languages/Breton.nsh	\
 
=== modified file 'configure.ac'
--- configure.ac	2014-09-02 04:05:35 +0000
+++ configure.ac	2014-10-14 03:02:11 +0000
@@ -391,10 +391,7 @@
     have_lcms2=no
 else
     # Have to test LittleCms presence
-    if test "x${platform_osx}" != "xyes"; then
-       # lcms 2.2 & 2.3 have problems on OSX
-	PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no")
-    fi
+    PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no")
 
     if test "x${have_lcms2}" = "xyes"; then
         LIBS="$LIBS $LCMS2_LIBS"
 
=== added file 'packaging/macosx/README.txt'
--- packaging/macosx/README.txt	1970-01-01 00:00:00 +0000
+++ packaging/macosx/README.txt	2014-10-14 03:02:11 +0000
@@ -0,0 +1,31 @@
+Quick instructions:
+===================
+
+1) install MacPorts from source into $MP_PREFIX (e.g. "/opt/local-x11")
+   <https://www.macports.org/install.php>
+
+2) add MacPorts to your PATH environement variable, for example:
+
+$ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH"
+
+3) add 'ports/' subdirectory as local portfile repository:
+
+$ sudo sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macports/sources.conf"
+
+4) index the new local portfile repository: 
+
+$ (cd ports && portindex)
+
+5) add default variants for x11-based package to MacPorts' global variants:
+
+$ sudo bash -c "echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> \"$MP_PREFIX/etc/macports/variants.conf\""
+
+6) install required dependencies: 
+
+$ sudo port install inkscape-packaging
+
+7) compile inkscape, create app bundle and DMG: 
+
+$ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d
+
+8) upload the DMG.
 
=== added directory 'packaging/macosx/Resources-extras'
=== added directory 'packaging/macosx/Resources-extras/src'
=== added directory 'packaging/macosx/Resources-extras/src/icons'
=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons'
=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/16'
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png	2014-10-14 03:02:11 +0000 differ
=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/20'
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png	2014-10-14 03:02:11 +0000 differ
=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/24'
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png	2014-10-14 03:02:11 +0000 differ
=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/32'
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png	2014-10-14 03:02:11 +0000 differ
=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/48'
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png'
 Binary files packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png	1970-01-01 00:00:00 +0000 and packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png	2014-10-14 03:02:11 +0000 differ
=== added file 'packaging/macosx/Resources/alert_fccache.sh'
--- packaging/macosx/Resources/alert_fccache.sh	1970-01-01 00:00:00 +0000
+++ packaging/macosx/Resources/alert_fccache.sh	2014-10-14 03:02:11 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+ALERT_SCRIPT="$(cat << EOM
+try
+	set parent_path to "$CWD"
+	set icon_path to POSIX path of (parent_path & "/Inkscape.icns")
+	set front_app to ((path to frontmost application) as text)
+	tell application front_app
+		display dialog "While Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application.
+
+The first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built." buttons {"OK"} default button 1 with title "Inkscape on OS X" with icon POSIX file icon_path
+		activate
+	end tell
+end try
+EOM)"
+
+if [ -z "$INK_CACHE_DIR" ]; then
+	export INK_CACHE_DIR="${HOME}/.cache/inkscape"
+	mkdir -p "$INK_CACHE_DIR"
+	[ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR"
+fi
+
+# Warn the user about time-consuming generation of fontconfig caches.
+if [ ! -f "${INK_CACHE_DIR}/.fccache-new" ]; then 
+	alert_result=$(osascript -e "$ALERT_SCRIPT")
+	mkdir -p "$INK_CACHE_DIR"
+	touch  "${INK_CACHE_DIR}/.fccache-new"
+fi
 
=== removed file 'packaging/macosx/Resources/bin/getdisplay.sh'
--- packaging/macosx/Resources/bin/getdisplay.sh	2006-01-16 02:36:01 +0000
+++ packaging/macosx/Resources/bin/getdisplay.sh	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-#
-# Author: Aaron Voisine <[e-mail]>
-
-if [ "$DISPLAY"x == "x" ]; then
-    echo :0 > /tmp/display.$UID
-else
-    echo $DISPLAY > /tmp/display.$UID
-fi
 
=== added file 'packaging/macosx/Resources/bin/gimp-wrapper.sh'
--- packaging/macosx/Resources/bin/gimp-wrapper.sh	1970-01-01 00:00:00 +0000
+++ packaging/macosx/Resources/bin/gimp-wrapper.sh	2014-10-14 03:02:11 +0000
@@ -0,0 +1,96 @@
+#!/bin/bash
+#
+# simple gimp wrapper script for Inkscape.app
+#
+
+#_DEBUG=true
+
+# --- defaults for GIMP.app
+
+app_id="org.gnome.gimp"
+app_exec_default="GIMP"
+
+
+# --- defaults for gimp in $PATH
+
+# path for local gimp install
+PATH_local="/opt/local/bin"
+# launch a specific gimp version? (e.g. gimp-2.9)
+gimp_name="gimp"
+
+
+# --- unset environment inherited from Inkscape.app
+
+unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME
+unset XDG_CONFIG_DIRS XDG_DATA_DIRS
+unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE GTK2_RC_FILES 
+unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR
+unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR
+unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS
+unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH
+unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR 
+unset ASPELL_CONF 
+unset POPPLER_DATADIR
+unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH 
+unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH
+unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS
+
+
+# --- detect installed GIMP.app
+
+unset GIMP_APP
+
+APPLESCRIPT1="$(cat << EOM
+try
+	tell application "Finder"
+		set theApp to application file id "$app_id" as string
+		set theApp_path to POSIX path of theApp as string
+		return theApp_path
+	end tell
+end try
+EOM)"
+
+GIMP_APP="$(osascript -e "$APPLESCRIPT1")"
+
+
+# --- pass command line arguments to GIMP.app or gimp or exit
+
+if [ ! -z "$GIMP_APP" ]; then
+
+	app_exec="$(defaults read "${GIMP_APP}/Contents/Info.plist" CFBundleExecutable)"
+	[[ $? -ne 0 ]] && app_exec="$app_exec_default"
+
+	GIMP_APP_EXEC="${GIMP_APP}/Contents/MacOS/${app_exec}"
+
+	[ $_DEBUG ] && echo "GIMP.app found as: $GIMP_APP" 1>&2
+	[ $_DEBUG ] && echo "Command line arguments: $@"  1>&2
+	if [ $# -eq 1 ]; then
+		[ $_DEBUG ] && echo "open -a $GIMP_APP $@" 1>&2
+		open -a "$GIMP_APP" "$@"
+	else
+		[ $_DEBUG ] && echo "exec $GIMP_APP_EXEC $@" 1>&2
+		exec "$GIMP_APP_EXEC" "$@"
+	fi
+
+else    # --- test for gimp installed in PATH
+	
+	# remove CWD from path (we don't want to recursively call this script)
+	[ $_DEBUG ] && echo "orig  PATH: $PATH" 1>&2
+	PATH_cleaned="$(echo $PATH | sed 's|'"$(cd "$(dirname "$0")" && pwd)"':||g')" || exit 1
+	[ $_DEBUG ] && echo "clean PATH: $PATH_cleaned" 1>&2
+	export PATH="$PATH_local:$PATH_cleaned"
+	[ $_DEBUG ] && echo "final PATH: $PATH" 1>&2
+
+	type -p "$gimp_name"
+
+	if [ $? -eq 0 ]; then
+		[ $_DEBUG ] && echo "gimp found in \$PATH: $PATH" 1>&2
+		[ $_DEBUG ] && echo "Command line arguments: $@" 1>&2
+		exec "$gimp_name" -n "$@"
+	else
+		echo "Giving up - couldn't find GIMP.app nor gimp." 1>&2
+	fi
+
+fi
+
+# eof
 
=== added file 'packaging/macosx/Resources/bin/inkscape'
--- packaging/macosx/Resources/bin/inkscape	1970-01-01 00:00:00 +0000
+++ packaging/macosx/Resources/bin/inkscape	2014-10-14 03:02:11 +0000
@@ -0,0 +1,166 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <[e-mail]>
+# Inkscape Modifications:
+#	Michael Wybrow <[e-mail]>
+#	Jean-Olivier Irisson <[e-mail]>
+#	~suv <[e-mail]>
+#
+
+[ -n "$INK_DEBUG_LAUNCHER" ] && set -x
+
+CWD="$(cd "$(dirname "$0")" && pwd)"
+# e.g. /Applications/Inkscape.app/Contents/Resources/bin
+TOP="$(dirname "$CWD")"
+# e.g. /Applications/Inkscape.app/Contents/Resources
+BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')"
+# e.g. /Applications/Inkscape.app
+
+# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative 
+# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
+# of working directory is required:
+#
+# Due to changes after 0.48, we have change working directory in the script named 'inkscape':
+# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
+# fail (for python-based extensions, inkscape changes the working directory to the 
+# script's directory, and inkscape launched by python script thus can't find resources
+# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory).
+cd "$BASE" || exit 1
+
+# don't prepend to $PATH in recursive calls:
+if [ -z "$INK_PATH_ORIG" ]; then
+
+	# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. 
+	# the 'classic' PATH additions:
+	#	/usr/local/bin which, though standard, doesn't seem to be in the PATH
+	#	Fink
+	#	MacPorts (former DarwinPorts)
+	#	LaTeX distribution for Mac OS X
+	PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
+
+	# 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.
+	PATH_PYTHON="/usr/bin"
+
+	# Put $TOP/bin at beginning of path so we make sure that recursive calls
+	# to inkscape don't pull in other inkscape binaries with different setup.
+	# Also allows to override system python with custom wrapper script, and
+	# e.g. to support GIMP.app or gimp for external editing and GIMP XCF export.
+	PATH_pkgbin="$TOP/bin"
+
+	# save orig, new PATH
+	export INK_PATH_ORIG="$PATH"
+	export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG"
+fi
+
+# Setup PYTHONPATH to use python modules shipped with Inkscape
+OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)"
+build_arch=__build_arch__
+if [ $OSXMINORNO -gt "5" ]; then
+	if [ $OSXMINORNO -eq "6" ]; then
+		export VERSIONER_PYTHON_VERSION=2.6
+	else # if [ $OSXMINORNO -ge "7" ]; then
+		export VERSIONER_PYTHON_VERSION=2.7
+	fi
+	if [ $build_arch = "i386" ]; then
+		export VERSIONER_PYTHON_PREFER_32_BIT=yes
+	else # build & runtime arch x86_64
+		export VERSIONER_PYTHON_PREFER_32_BIT=no
+	fi
+fi
+PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)"
+export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/"
+
+export FONTCONFIG_PATH="$TOP/etc/fonts"
+export PANGO_RC_FILE="$TOP/etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$TOP/etc"
+export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache"
+export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache"
+export GTK_DATA_PREFIX="$TOP"
+export GTK_EXE_PREFIX="$TOP"
+export GTK_PATH="$TOP"
+export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
+export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
+export GIO_USE_VFS="local"
+export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
+export GVFS_DISABLE_FUSE=1
+export XDG_DATA_DIRS="$TOP/share"
+export ASPELL_CONF="prefix $TOP;"
+export POPPLER_DATADIR="$TOP/share/poppler"
+
+# no DBUS for now
+unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
+unset DBUS_SESSION_BUS_ADDRESS
+
+# Note: This requires the path with the exact ImageMagic version number.
+#       The actual version is inserted by the packaging script.
+export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config"
+export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
+export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
+
+export INKSCAPE_SHAREDIR="$TOP/share/inkscape"
+export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
+export INKSCAPE_LOCALEDIR="$TOP/share/locale"
+
+# Handle the case where the directory storing Inkscape has special characters
+# ('#', '&', '|') in the name.  These need to be escaped to work properly for 
+# various configuration files.
+ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
+
+# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
+if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
+	export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc"
+fi
+
+# If the AppleCollationOrder preference doesn't exist, we fall back to using
+# the AppleLocale preference.
+LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
+if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
+then
+    LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
+            sed 's/_.*//'`
+	[ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
+else
+	[ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
+fi
+
+# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
+#       to crash on startup in locale_from_utf8().
+if [ "x$LANGSTR" == "x" ]
+then 
+	# override broken script
+	[ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2
+	export LANG="en_US.UTF-8"
+else
+	tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
+		tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
+	if [ "x$tmpLANG" == "x" ]
+	then
+		# override broken script
+		[ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
+		export LANG="en_US.UTF-8"
+	else
+		[ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
+		export LANG="$tmpLANG.UTF-8"
+	fi
+fi
+[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2
+export LC_ALL="$LANG"
+
+case "$INK_DEBUG" in
+	gdb)
+		EXEC="gdb --args" ;;
+	lldb)
+		EXEC="lldb -- " ;;
+	dtruss)
+		EXEC="dtruss" ;;
+	*)
+		EXEC="exec" ;;
+esac
+unset INK_DEBUG # ignore for recursive calls
+
+if [ "x$INK_DEBUG_SHELL" != "x" ]; then
+	exec bash
+else
+	$EXEC "$CWD/inkscape-bin" "$@"
+fi
 
=== removed file 'packaging/macosx/Resources/bin/inkscape'
--- packaging/macosx/Resources/bin/inkscape	2014-03-27 01:33:44 +0000
+++ packaging/macosx/Resources/bin/inkscape	1970-01-01 00:00:00 +0000
@@ -1,158 +0,0 @@
-#!/bin/sh
-#
-# Author: Aaron Voisine <[e-mail]>
-# Inkscape Modifications:
-#	Michael Wybrow <[e-mail]>
-#	Jean-Olivier Irisson <[e-mail]>
-#
-
-CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`"
-# e.g. /Applications/Inkscape.app/Contents/Resources/bin
-TOP="`dirname \"$CWD\"`"
-# e.g. /Applications/Inkscape.app/Contents/Resources
-
-
-# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. 
-# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple:
-#	http://developer.apple.com/qa/qa2001/qa1067.html
-# but since no one does, we correct this by making the 'classic' PATH additions here:
-#	/usr/local/bin which, though standard, doesn't seem to be in the PATH
-# 	newer python as recommended by MacPython http://www.python.org/download/mac/
-#	Fink
-#	MacPorts (former DarwinPorts)
-#	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_VERSION=2.6
-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`
-export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS"
-# NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest
-
-# No longer required if path rewriting has been conducted.
-# export DYLD_LIBRARY_PATH="$TOP/lib"
-
-mkdir -p "${HOME}/.inkscape-etc"
-
-export FONTCONFIG_PATH="$TOP/etc/fonts"
-export PANGO_RC_FILE="$HOME/.inkscape-etc/pangorc"
-export GTK_IM_MODULE_FILE="$HOME/.inkscape-etc/gtk.immodules"
-export GDK_PIXBUF_MODULE_FILE="$HOME/.inkscape-etc/gdk-pixbuf.loaders"
-export GTK_DATA_PREFIX="$TOP"
-export GTK_EXE_PREFIX="$TOP"
-export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
-export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
-export XDG_DATA_DIRS="$TOP/share"
-export ASPELL_CONF="prefix $TOP;"
-
-# Note: This requires the path with the exact ImageMagic version number.
-#        Also, that ImageMagick will only work if it does not find a 
-#        version installed into the same PREFIX as it was originally 
-#        installed.  Luckily, this is very unlikely given the extra long 
-#        and strangely named install prefix we use.
-#        The actual version is inserted by the packaging script.
-export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER/config"
-export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
-export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
-
-export INKSCAPE_SHAREDIR="$TOP"
-# TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle
-export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
-export INKSCAPE_LOCALEDIR="$TOP/locale"
-
-# Handle the case where the directory storing Inkscape has special characters
-# ('#', '&', '|') in the name.  These need to be escaped to work properly for 
-# various configuration files.
-ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
-
-# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
-if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
-	# Appearance setting
-	aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant 2>/dev/null`
-	# 1 for aqua, 6 for graphite, inexistant if the default color was never changed
-	if [[ "$aquaStyle" == "" ]]; then
-		aquaStyle=1		# set aqua as default
-	fi
-
-	# Highlight Color setting
-	hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor 2>/dev/null`
-	# a RGB value, with components between 0 and 1, also inexistant if it was not changed
-	if [[ "$hiliColor" == "" ]]; then
-		hiliColor="0.709800 0.835300 1.000000"	# set blue as default
-	fi
-
-	# Menu items color
-	if [[ aquaStyle -eq 1 ]]; then
-		menuColor="#4a76cd"	# blue
-	else
-		menuColor="#7c8da4"	# graphite
-	fi
-	# Format highlight color as a GTK rgb value
-	hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'`
-
-	# echo $menuColor
-	# echo $hiliColorFormated
-
-	# Modify the gtkrc
-	#	- with the correct colors
-	#	- to point to the correct scrollbars folder
-	sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$INKSCAPE_SHAREDIR/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc" | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' | sed 's|${THEMEDIR}|'"$ESCAPEDTOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0|g" > "${HOME}/.inkscape-etc/gtkrc"
-
-	export GTK2_RC_FILES="$HOME/.inkscape-etc/gtkrc"
-fi
-
-# If the AppleCollationOrder preference doesn't exist, we fall back to using
-# the AppleLocale preference.
-LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
-if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
-then
-    echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2
-    LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
-            sed 's/_.*//'`
-	echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
-else
-	echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
-fi
-
-# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
-#       to crash on startup in locale_from_utf8().
-if [ "x$LANGSTR" == "x" ]
-then 
-	# override broken script
-	echo "Overriding empty LANGSTR" 1>&2
-	export LANG="en_US.UTF-8"
-else
-	tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
-		tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
-	if [ "x$tmpLANG" == "x" ]
-	then
-		# override broken script
-		echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
-		export LANG="en_US.UTF-8"
-	else
-		echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
-		export LANG="$tmpLANG.UTF-8"
-	fi
-fi
-echo "Setting Language: $LANG" 1>&2
-
-sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc"
-sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \
-    > "${HOME}/.inkscape-etc/pango.modules"
-cp -f "$TOP/etc/pango/pangox.aliases" "${HOME}/.inkscape-etc/"
-sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \
-    > "${HOME}/.inkscape-etc/gtk.immodules"
-sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \
-    > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders"
-
-exec "$CWD/inkscape-bin" "$@"
 
=== added file 'packaging/macosx/Resources/bin/python-wrapper.sh'
--- packaging/macosx/Resources/bin/python-wrapper.sh	1970-01-01 00:00:00 +0000
+++ packaging/macosx/Resources/bin/python-wrapper.sh	2014-10-14 03:02:11 +0000
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+
+# ---------------------------------------------------------------------
+# a) to use PyGTK (for Sozi or inksmoto) from MacPorts
+# ---------------------------------------------------------------------
+
+# export PYTHONPATH="$INKSCAPE_SHAREDIR"/extensions
+# 
+# # unset other environment variables used in Inkscape.app
+# unset DYLD_LIBRARY_PATH
+# unset XDG_CONFIG_DIRS XDG_DATA_DIRS
+# unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE
+# unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR
+# unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR
+# unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS
+# unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH
+# unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR
+# unset ASPELL_CONF
+# unset POPPLER_DATADIR
+# unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT
+# unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH
+# unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS
+# 
+# # set locale (language) explicitly
+# # (not needed with 0.48.5 package)
+# #export LANG="en_US.UTF-8"
+# 
+# # set MacPorts prefix
+# LIBPREFIX="/opt/local"
+# 
+# exec "$LIBPREFIX/bin/python" "$@"
+
+
+# ---------------------------------------------------------------------
+# b) to test different 32bit or 64bit system-provided Python versions 
+#    (available on Mac OS X 10.6 Snow Leopard and later versions)
+# ---------------------------------------------------------------------
+
+# # Python 2.5 (system) - Lion: 2.5.6 
+# #exec /usr/bin/python2.5 "$@"
+# export VERSIONER_PYTHON_VERSION=2.5
+# export VERSIONER_PYTHON_PREFER_32_BIT=yes
+# exec /usr/bin/python "$@"
+
+# # Python 2.6 (system) - Lion: 2.6.7
+# #exec arch -i386 /usr/bin/python2.6 "$@"
+# export VERSIONER_PYTHON_VERSION=2.6
+# export VERSIONER_PYTHON_PREFER_32_BIT=yes
+# #export VERSIONER_PYTHON_PREFER_32_BIT=no
+# exec /usr/bin/python "$@"
+
+# # Python 2.7 (system) - Lion: 2.7.1
+# #exec arch -i386 /usr/bin/python2.7 "$@"
+# export VERSIONER_PYTHON_VERSION=2.7
+# export VERSIONER_PYTHON_PREFER_32_BIT=yes
+# #export VERSIONER_PYTHON_PREFER_32_BIT=no
+# exec /usr/bin/python "$@"
+
+
+# ---------------------------------------------------------------------
+# c) to test different 32bit or 64bit MacPorts-provided Python versions 
+#    (define $LIBPREFIX locally)
+# ---------------------------------------------------------------------
+
+# LIBPREFIX="/opt/local-x11"
+# exec "$LIBPREFIX/bin/python2.5" "$@"
+# #exec "$LIBPREFIX/bin/python2.6" "$@"
+# #exec "$LIBPREFIX/bin/python2.7" "$@"
+
+
+# ---------------------------------------------------------------------
+# d) ... otherwise run default python
+# ---------------------------------------------------------------------
+
+exec /usr/bin/python "$@"
+
+# eof
 
=== modified file 'packaging/macosx/Resources/etc/fonts/fonts.conf'
--- packaging/macosx/Resources/etc/fonts/fonts.conf	2009-07-19 10:45:26 +0000
+++ packaging/macosx/Resources/etc/fonts/fonts.conf	2014-10-14 03:02:11 +0000
@@ -24,12 +24,14 @@
 <!-- Font directory list -->
 
 	<dir>/usr/share/fonts</dir>
-	<dir>/usr/X11R6/lib/X11/fonts</dir>
+	<dir>/usr/X11/lib/X11/fonts</dir>
 	<dir>/opt/local/share/fonts</dir>
-	<!-- <dir>/System/Library/Fonts</dir> -->
+	<dir>/System/Library/Fonts</dir>
 	<dir>/Network/Library/Fonts</dir>
 	<dir>/Library/Fonts</dir>
 	<dir>~/Library/Fonts</dir>
+	<dir prefix="xdg">fonts</dir>
+	<!-- the following element will be removed in the future -->
 	<dir>~/.fonts</dir>
 
 <!--
@@ -39,7 +41,7 @@
 		<test qual="any" name="family">
 			<string>mono</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>monospace</string>
 		</edit>
 	</match>
@@ -51,7 +53,7 @@
 		<test qual="any" name="family">
 			<string>sans serif</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>sans-serif</string>
 		</edit>
 	</match>
@@ -63,7 +65,7 @@
 		<test qual="any" name="family">
 			<string>sans</string>
 		</test>
-		<edit name="family" mode="assign">
+		<edit name="family" mode="assign" binding="same">
 			<string>sans-serif</string>
 		</edit>
 	</match>
@@ -75,6 +77,8 @@
 
 <!-- Font cache directory list -->
 
+	<cachedir prefix="xdg">fontconfig</cachedir>
+	<!-- the following element will be removed in the future -->
 	<cachedir>~/.fontconfig</cachedir>
 
 	<config>
 
=== added directory 'packaging/macosx/Resources/etc/gtk-2.0'
=== added file 'packaging/macosx/Resources/etc/gtk-2.0/gtkrc'
--- packaging/macosx/Resources/etc/gtk-2.0/gtkrc	1970-01-01 00:00:00 +0000
+++ packaging/macosx/Resources/etc/gtk-2.0/gtkrc	2014-10-14 03:02:11 +0000
@@ -0,0 +1,20 @@
+#
+# gtkrc file for Inkscape.app (X11)
+#
+
+gtk-theme-name = "Adwaita"
+gtk-font-name = "Lucida Grande 9"
+
+gtk-icon-theme-name = "GtkStock"
+gtk-icon-sizes = "gtk-dialog=32,32:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12"
+
+gtk-button-images = 0
+gtk-menu-images = 0
+gtk-toolbar-style = 0
+#gtk-toolbar-icon-size = 2
+
+# fix Adwaita theme for Inkscape's GimpSpinScale widgets
+style "spinbutton" {}
+widget_class "*GimpSpinScale*" style "spinbutton"
+
+# eof
 
=== modified file 'packaging/macosx/Resources/openDoc' (properties changed: +x to -x)
--- packaging/macosx/Resources/openDoc	2008-03-12 23:37:45 +0000
+++ packaging/macosx/Resources/openDoc	2014-10-14 03:02:11 +0000
@@ -1,17 +1,11 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Author: Aaron Voisine <[e-mail]>
 # Inkscape Modifications: Michael Wybrow <[e-mail]>
-
-CWD="`dirname \"$0\"`"
-
-# System version: 3 for Panther, 4 for Tiger, 5 for Leopard
-export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
-
-if [[ $VERSION -le 4 ]]; then
-	export "DISPLAY=`cat /tmp/display.$UID`"
-fi
-
-BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//'`"
-cd "$BASE"
+# Inkscape Modifications: ~suv <[e-mail]>
+
+CWD="$(cd "$(dirname "$0")" && pwd)"
+
+source "${CWD}/xdg_setup.sh"
+
 exec "$CWD/bin/inkscape" "$@"
 
=== modified file 'packaging/macosx/Resources/script'
--- packaging/macosx/Resources/script	2009-09-23 21:02:27 +0000
+++ packaging/macosx/Resources/script	2014-10-14 03:02:11 +0000
@@ -1,54 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Author: Aaron Voisine <[e-mail]>
 # Inkscape Modifications: Michael Wybrow <[e-mail]>
-
-CWD=`dirname "$0"`
-
-# System version: 3 for Panther, 4 for Tiger, 5 for Leopard
-export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
-
-# On Leopard, X11.app is installed by default, and will be started
-# automatically via launchd.  On older systems, we need to start 
-# X11 ourself.
-
-# For Panther and Tiger, start X11
-if [[ $VERSION -le 4 ]]; then
-	# FIXME apparently this removes the xterm that starts with X 
-	# from xinitrc but when is it really used? Should we modify 
-	# the .xinitrc of the user without warning?
-	ps -wx -ocommand | grep -e '[X]11' > /dev/null
-	if [ "$?" != "0" -a ! -f "${HOME}/.xinitrc" ]; then
-	    echo "rm -f \"\${HOME}/.xinitrc\"" > "${HOME}/.xinitrc"
-	    sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> "${HOME}/.xinitrc"
-	fi
-
-	# Start X11 and get DISPLAY
-	# FIXME: Insecure tmp file usage.  Why do we have to copy this to /tmp anyway?
-	cp -f "$CWD/bin/getdisplay.sh" /tmp/
-	rm -f /tmp/display.$UID
-	open-x11 /tmp/getdisplay.sh || \
-	open -a XDarwin /tmp/getdisplay.sh || \
-	echo ":0" > /tmp/display.$UID
-
-	while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do
-	    sleep 1
-	done
-	export DISPLAY=`cat /tmp/display.$UID`
-
-	ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
-fi
-	
-# Warn the user about time-consuming generation of fontconfig caches.
-test -f "${HOME}/.inkscape-etc/.fccache-new" || exit 12
-
-
-
-BASE=`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`
-cd "$BASE"
-exec "$CWD/bin/inkscape" "$@"
+# Inkscape Modifications: ~suv <[e-mail]>
+
+#export _DEBUG=true
+
+CWD="$(cd "$(dirname "$0")" && pwd)"
+
+source "${CWD}/xdg_setup.sh"
+source "${CWD}/alert_fccache.sh"
+
 # TODO examine whether it would be wisest to move the code from inkscape shell
 # script and getdisplay.sh to here and only keep the real binary in bin. This
 # may make things easier on Leopard and may also help using Inkscape on the
 # command line.
+#
+# See related FIXME in bin/inkscape for requirements to merge the two scripts.
 
+exec "$CWD/bin/inkscape" "$@"
 
=== removed directory 'packaging/macosx/Resources/themes'
=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX'
=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0'
=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars'
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1'
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh'
--- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh	2007-09-05 16:57:37 +0000
+++ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cp -f slider-vert.png slider-vert-prelight.png
-cp -f slider-vert.png slider-horiz-prelight.png
-cp -f slider-vert.png slider-horiz.png
-convert -rotate 90 slider-horiz.png slider-horiz.png
-convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png
 \ No newline at end of file
 
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6'
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh'
--- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh	2007-09-05 16:57:37 +0000
+++ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh	1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-cp -f slider-vert.png slider-vert-prelight.png
-cp -f slider-vert.png slider-horiz-prelight.png
-cp -f slider-vert.png slider-horiz.png
-convert -rotate 90 slider-horiz.png slider-horiz.png
-convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png
 \ No newline at end of file
 
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png'
 Binary files packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png	2009-06-12 21:58:30 +0000 and packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc'
--- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc	2014-03-27 01:33:44 +0000
+++ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc	1970-01-01 00:00:00 +0000
@@ -1,547 +0,0 @@
-#
-# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger
-# 
-# Heavily based on Clearlooks-Quicksilver
-# Scrollbars from OSX-theme by Lauri Taimila ([e-mail])
-# 
-# (c) 2007 JiHO <[e-mail]>. 
-# GNU General Public License http://www.gnu.org/copyleft/gpl.html
-#
-
-pixmap_path "${THEMEDIR}"
-
-style "clearlooks-default"
-{
-	GtkButton		::default_border	 = { 0, 0, 0, 0 }
-	GtkRange		::trough_border 	 = 0
-	GtkPaned		::handle_size		 = 6
-	GtkRange		::slider_width		 = 15
-	GtkRange		::stepper_size		 = 15
-	GtkScale		::slider-length		 = 23
-	GtkScale		::trough-side-details	 = 1
-	GtkScrollbar		::min_slider_length	 = 30
-	GtkCheckButton		::indicator_size	 = 12
-	GtkMenuBar		::internal-padding	 = 0
-	GtkTreeView		::expander_size		 = 14
-	GtkExpander		::expander_size		 = 16
-
-	xthickness = 1
-	ythickness = 1
-
-	fg[NORMAL]		= "#000000" # black
-	fg[PRELIGHT]		= "#000000" # black
-	fg[SELECTED]		= "#ffffff" # white 
-	fg[ACTIVE]		= "#000000" # black
-	fg[INSENSITIVE]		= {0.6, 0.6, 0.6} # dark gray
-
-	bg[NORMAL]		= {0.95, 0.95, 0.95} # very light gray
-	bg[PRELIGHT]		= "#ffffff" # white
-	bg[SELECTED]		= OSX_MENU_COLOR_PLACEHOLDER	# menu color
-	bg[INSENSITIVE]		= {0.9, 0.9, 0.9} # light gray
-	bg[ACTIVE]		= {0.85, 0.85, 0.85} # gray
-
-	base[NORMAL]		= "#ffffff" # white 
-	base[PRELIGHT]		= OSX_MENU_COLOR_PLACEHOLDER # menu color
-	base[ACTIVE]		= {0.6, 0.6, 0.6} # dark gray
-	base[SELECTED]		= OSX_HILI_COLOR_PLACEHOLDER # highlight color
-	base[INSENSITIVE] 	= {0.9, 0.9, 0.9} # light gray
-
-	text[NORMAL]		= "#000000" # black
-	text[PRELIGHT]		= "#000000" # black
-	text[ACTIVE]		= "#ffffff" # white
-	text[SELECTED]		= "#ffffff" # white
-	text[INSENSITIVE]	= {0.6, 0.6, 0.6} # dark gray
-
-	engine "clearlooks" 
-	{
-		colorize_scrollbar	 = FALSE	#TRUE
-		reliefstyle		 = 1
-		menubarstyle		 = 0		# 0 = flat, 1 = sunken, 2 = flat gradient
-		toolbarstyle		 = 0		# 0 = flat, 1 = enable effects
-		animation		 = FALSE
-		radius			 = 3.0		# 3.0 = default, 0.0 = sharp corners
-		style			 = GUMMY	# CLASSIC, GUMMY, GLOSSY
-	}
-}
-	
-
-style "clearlooks-wide" = "clearlooks-default"
-{
-	xthickness = 2
-	ythickness = 2
-}
-
-style "clearlooks-button" = "clearlooks-default"
-{
-	xthickness = 3
-	ythickness = 3
-
-	bg[NORMAL] = "#f0f1f2" # a hint of blue...
-
-	engine "clearlooks" {
-		style = CLASSIC
-	}
-}
-
-style "clearlooks-notebook" = "clearlooks-wide"
-{
-	bg[NORMAL] = {0.93, 0.93, 0.93}
-	bg[INSENSITIVE] = {0.93, 0.93, 0.93}
-}
-
-style "clearlooks-tasklist" = "clearlooks-default"
-{
-	xthickness = 5
-	ythickness = 3
-}
-
-style "clearlooks-menu" = "clearlooks-default"
-{
-	xthickness = 2
-	ythickness = 1
-	bg[NORMAL] = "#ffffff"
-}
-
-style "clearlooks-menu-item" = "clearlooks-default"
-{
-	xthickness = 0
-	ythickness = 2
-
-	fg[PRELIGHT] = "#ffffff"
-	text[PRELIGHT] = "#ffffff"
-	# We want PRELIGHT to be white for widgets, but coloured for the menu.
-	bg[PRELIGHT]		= OSX_MENU_COLOR_PLACEHOLDER
-
-	# Radius of the menu items (inside menus)
-	engine "clearlooks" {
-		radius = 0.0
-	}
-}
-
-style "clearlooks-menu-itembar" = "clearlooks-default"
-{
-	xthickness = 3
-	ythickness = 3
-}
-
-style "clearlooks-tree" = "clearlooks-default"
-{
-	xthickness = 2
-	ythickness = 2
-}
-
-style "clearlooks-frame-title" = "clearlooks-default"
-{
-	fg[NORMAL] = "#404040"
-}
-
-style "clearlooks-tooltips" = "clearlooks-default"
-{
-	xthickness = 4
-	ythickness = 4
-	bg[NORMAL] = { 1.0,1.0,0.75 }
-}
-
-style "clearlooks-progressbar" = "clearlooks-default"
-{
-	xthickness = 1
-	ythickness = 1
-
-	fg[PRELIGHT]	= "#ffffff"
-}
-
-style "clearlooks-combo" = "clearlooks-default"
-{
-	xthickness = 2
-	ythickness = 3
-}
-
-# Added pixmaps for scollbars
-style "scrollbar" = "default"
-{
-	# The values I set here have to do with the relative size of three graphic elements
-	# I have used: the slider, the arrow box, and the trough. They all have the same width
-	# of 15 pixels, but gtk wants to put in some spacing between them. It seems like it
-	# places the sliders inside the trough with a default 1 pixel border on either side of the slider,
-	# so that the trough has its width stretched by an additional two pixels(?). Setting the
-	# trough border makes the arrow box sit on top of the trough squarely, by making sure that
-	# the trough stays the same width as the arrowbox(?). I could be totally wrong here.
-	GtkRange::trough_border = 0
-	GtkRange::slider_width = 15
-
-	# This sets the size of the steppers (arrow buttons on the end of the scrollbar). 
-	# The image I am using is 15x15 pixels, and if I dont set this a one pixel line 
-	# gets cut off of the top of the "up" stepper.
-	GtkRange::stepper_size = 15
-
-	# Set a minimum length for the slider. Since I set the border on the slider 
-	# image to 15 pixels on either end of the slider I want the min length to be 
-	# at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller 
-	# than 30 pixels.
-	GtkScrollbar::min_slider_length = 30
-
-	engine "pixmap" 
-	{
-		# Horizontal slider background
-		image 
-		{
-			function		= BOX
-			recolorable		= TRUE
-			detail			= "trough"
-			file			= "Scrollbars/trough-scrollbar-horiz.png"
-			border			= { 30, 30, 0, 0 }
-			stretch			= TRUE
-			orientation		= HORIZONTAL
-		}
-		
-		# Vertical slider background
-		image 
-		{
-			function		= BOX
-			recolorable		= TRUE
-			detail			= "trough"
-			file			= "Scrollbars/trough-scrollbar-vert.png"
-			border			= { 0, 0, 30, 30 }
-			stretch			= TRUE
-			orientation		= VERTICAL
-		}
-
-		# Normal horizontal slider
-		image 
-		{
-			function		= SLIDER
-			recolorable		= TRUE
-			state			= NORMAL
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png"
-			border			= { 15, 15, 6, 6 }
-			stretch			= TRUE
-			orientation		= HORIZONTAL
-		}
-		
-		# Horizontal slider (active)
-		image 
-		{
-			function		= SLIDER
-			recolorable		= TRUE
-			state			= ACTIVE
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png"
-			border			= { 15, 15, 6, 6 }
-			stretch			= TRUE
-			orientation		= HORIZONTAL
-		}
-
-		# Horizontal slider (mouse over)
-		image 
-		{
-			function		= SLIDER 
-			recolorable		= TRUE
-			state			= PRELIGHT
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png"
-			border			= { 15, 15, 6, 6 }
-			stretch			= TRUE
-			orientation		= HORIZONTAL
-		}
-		
-		# Horizontal slider (Insesitive)
-		image 
-		{
-			function		= SLIDER 
-			recolorable		= TRUE
-			state			= INSENSITIVE
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png"
-			border			= { 15, 15, 6, 6 }
-			stretch			= TRUE
-			orientation		= HORIZONTAL
-		}
-
-		# Normal vertical slider
-		image 
-		{
-			function		= SLIDER
-			recolorable		= TRUE
-			state			= NORMAL
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png"
-			border			= { 6, 6, 15, 15 }
-			stretch			= TRUE
-			orientation		= VERTICAL
-		}
-		
-		# Vertical slider (Active)
-		image 
-		{
-			function		= SLIDER
-			recolorable		= TRUE
-			state			= ACTIVE
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png"
-			border			= { 6, 6, 15, 15 }
-			stretch			= TRUE
-			orientation		= VERTICAL
-		}
-
-		# Vertical slider (mouse over)
-		image 
-		{
-			function		= SLIDER 
-			recolorable		= TRUE
-			state			= PRELIGHT
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png"
-			border			= { 6, 6, 15, 15 }
-			stretch			= TRUE
-			orientation		= VERTICAL
-		}
-		
-		# Vertical slider (Insesitive)
-		image 
-		{
-			function		= SLIDER 
-			recolorable		= TRUE
-			state			= INSENSITIVE
-			file			= "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png"
-			border			= { 6, 6, 15, 15 }
-			stretch			= TRUE
-			orientation		= VERTICAL
-		}
-
-################################################################################
-# SCROLLBAR STEPPERS
-################################################################################
-
-	# Up
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= NORMAL
-		file				= "Scrollbars/stepper-up.png"
-		#border			= { 12, 2, 2, 9 }
-		stretch			= TRUE
-		arrow_direction = UP
-	}
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= PRELIGHT
-		file				= "Scrollbars/stepper-up.png"
-		#border			= { 12, 2, 2, 9 }
-		stretch			= TRUE
-		arrow_direction = UP
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= ACTIVE
-		file				= "Scrollbars/stepper-up.png"
-		#border			= { 12, 2, 2, 9 }
-		stretch			= TRUE
-		arrow_direction = UP
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= INSENSITIVE
-		file				= "Scrollbars/stepper-up.png"
-		#border			= { 12, 2, 2, 9 }
-		stretch			= TRUE
-		arrow_direction = UP
-	}
-
- ######### DOWN ############
-
-
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= NORMAL
-		file				= "Scrollbars/stepper-down.png"
-		#border			= { 12, 2, 10, 2 }
-		stretch			= TRUE
-		arrow_direction = DOWN
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= PRELIGHT
-		file				= "Scrollbars/stepper-down.png"
-		#border			= { 12, 2, 10, 2 }
-		stretch			= TRUE
-		arrow_direction = DOWN
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= ACTIVE
-		file				= "Scrollbars/stepper-down.png"
-		#border			= { 12, 2, 10, 2 }
-		stretch			= TRUE
-		arrow_direction = DOWN
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= INSENSITIVE
-		file				= "Scrollbars/stepper-down.png"
-		#border			= { 12, 2, 10, 2 }
-		stretch			= TRUE
-		arrow_direction = DOWN
-	}
-
-############ RIGHT ################
-
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= NORMAL
-		file				= "Scrollbars/stepper-right.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = RIGHT
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= PRELIGHT
-		file				= "Scrollbars/stepper-right.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = RIGHT
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= ACTIVE
-		file				= "Scrollbars/stepper-right.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = RIGHT
-	}
- image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= INSENSITIVE
-		file				= "Scrollbars/stepper-right.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = RIGHT
-	}
-
-############### LEFT ###################
-
-
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= NORMAL
-		file				= "Scrollbars/stepper-left.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = LEFT
-	}
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= PRELIGHT
-		file				= "Scrollbars/stepper-left.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = LEFT
-	}
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= ACTIVE
-		file				= "Scrollbars/stepper-left.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = LEFT
-	}
-	image 
-	{
-		function			= STEPPER
-		recolorable		= TRUE
-		state				= INSENSITIVE
-		file				= "Scrollbars/stepper-left.png"
-		#border			= { 2, 9, 2, 13 }
-		stretch			= TRUE
-		arrow_direction = LEFT
-	}
-	}
-}
-
-# widget styles
-class "GtkWidget" style "clearlooks-default"
-class "GtkButton" style "clearlooks-button"
-class "GtkCombo"	style "clearlooks-button"
-class "GtkRange"	style "clearlooks-wide"
-class "GtkFrame"	style "clearlooks-wide"
-class "GtkMenu"		style "clearlooks-menu"
-class "GtkEntry"	style "clearlooks-button"
-class "GtkMenuItem"		 style "clearlooks-menu-item"
-class "GtkStatusbar"	 style "clearlooks-wide"
-class "GtkNotebook"		 style "clearlooks-notebook"
-class "GtkProgressBar" style "clearlooks-progressbar"
-class "GtkScrollbar"	 style "scrollbar"
-
-widget_class "*MenuItem.*" style "clearlooks-menu-item"
-
-# combobox stuff
-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
-widget_class "*.GtkCombo.GtkButton"		 style "clearlooks-combo"
-
-# tooltips stuff
-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
-widget "gtk-tooltips" style "clearlooks-tooltips"
-
-# treeview stuff
-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-
-# notebook stuff
-widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
-widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
-
-# OS X uses 11 but due to differences in font smoothing, 10 actually integrates better
-gtk-font-name="Lucida Grande 10"
-
-# icon sizes: 48, 32, 24 (tango=22), 16
-#
-# gtk-dialog		main icon in a dialog box: e.g. alert when file is not saved
-# gtk-dnd			icon showed while dragging and dropping (not used on OS X)
-# gtk-button		buttons: OK/Cancel dialogs, usually 22 but 16 is more OS X-ish
-# gtk-large-toolbar	large toolbar: toolbox
-# gtk-small-toolbar	small toolbar: command bar, tools control, snap control
-# gtk-menu			menus in applications: File, Edit
-# panel-menu		general Application/Places menu (not used on OS X)
-#
-# insckape-decoration	layers lock, "affect" icons, etc.
-#
-#gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16"
-gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12"
-
-# use OS X default pdf-viewer for print preview
-gtk-print-preview-command="/usr/bin/open %f"
-
-# Whether images should be shown on buttons.
-# Default value: TRUE
-gtk-button-images = 0
-
-# Whether images should be shown in menus.
-gtk-menu-images = 0
-
-
 
=== added file 'packaging/macosx/Resources/xdg_setup.sh'
--- packaging/macosx/Resources/xdg_setup.sh	1970-01-01 00:00:00 +0000
+++ packaging/macosx/Resources/xdg_setup.sh	2014-10-14 03:02:11 +0000
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_DATA_HOME="${HOME}/.local/share"
+
+mkdir -p "$XDG_CACHE_HOME"
+mkdir -p "$XDG_CONFIG_HOME"
+mkdir -p "$XDG_DATA_HOME"
+
+export INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape"
+mkdir -p "$INK_CACHE_DIR"
+
 
=== removed directory 'packaging/macosx/ScriptExec/ScriptExec.xcode'
=== removed file 'packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj'
--- packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj	2006-01-16 02:36:01 +0000
+++ packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj	1970-01-01 00:00:00 +0000
@@ -1,451 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 39;
-	objects = {
-		0249A66BFF388E3F11CA2CEA = {
-			isa = PBXFileReference;
-			lastKnownFileType = archive.ar;
-			name = "libstdc++.a";
-			path = "/usr/lib/libstdc++.a";
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-//020
-//021
-//022
-//023
-//024
-//080
-//081
-//082
-//083
-//084
-		0867D6AAFE840B52C02AAC07 = {
-			children = (
-				0867D6ABFE840B52C02AAC07,
-			);
-			isa = PBXVariantGroup;
-			name = InfoPlist.strings;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		0867D6ABFE840B52C02AAC07 = {
-			fileEncoding = 10;
-			isa = PBXFileReference;
-			lastKnownFileType = text.plist.strings;
-			name = English;
-			path = English.lproj/InfoPlist.strings;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-//080
-//081
-//082
-//083
-//084
-//190
-//191
-//192
-//193
-//194
-		195DF8CFFE9D517E11CA2CBB = {
-			children = (
-				8D0C4E970486CD37000505A6,
-			);
-			isa = PBXGroup;
-			name = Products;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-//190
-//191
-//192
-//193
-//194
-//200
-//201
-//202
-//203
-//204
-		20286C28FDCF999611CA2CEA = {
-			buildSettings = {
-			};
-			buildStyles = (
-				4A9504C5FFE6A39111CA0CBA,
-				4A9504C6FFE6A39111CA0CBA,
-			);
-			hasScannedForEncodings = 1;
-			isa = PBXProject;
-			mainGroup = 20286C29FDCF999611CA2CEA;
-			projectDirPath = "";
-			targets = (
-				8D0C4E890486CD37000505A6,
-			);
-		};
-		20286C29FDCF999611CA2CEA = {
-			children = (
-				20286C2AFDCF999611CA2CEA,
-				20286C2CFDCF999611CA2CEA,
-				20286C32FDCF999611CA2CEA,
-				195DF8CFFE9D517E11CA2CBB,
-			);
-			isa = PBXGroup;
-			name = ScriptExec;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2AFDCF999611CA2CEA = {
-			children = (
-				32DBCF6D0370B57F00C91783,
-				20286C2BFDCF999611CA2CEA,
-			);
-			isa = PBXGroup;
-			name = Sources;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2BFDCF999611CA2CEA = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = main.c;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2CFDCF999611CA2CEA = {
-			children = (
-				664C29F0060ECDC4006EC560,
-				B8DCE042056DAC3500C390B0,
-				8D0C4E960486CD37000505A6,
-				B8DCE048056DAC5000C390B0,
-				0867D6AAFE840B52C02AAC07,
-			);
-			isa = PBXGroup;
-			name = Resources;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C32FDCF999611CA2CEA = {
-			children = (
-				20286C33FDCF999611CA2CEA,
-				4A9504CAFFE6A41611CA0CBA,
-				4A9504C8FFE6A3BC11CA0CBA,
-				0249A66BFF388E3F11CA2CEA,
-				B8DCE04E056DACAE00C390B0,
-			);
-			isa = PBXGroup;
-			name = "External Frameworks and Libraries";
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C33FDCF999611CA2CEA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
-			lastKnownFileType = wrapper.framework;
-			name = Carbon.framework;
-			path = /System/Library/Frameworks/Carbon.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-//200
-//201
-//202
-//203
-//204
-//320
-//321
-//322
-//323
-//324
-		32DBCF6D0370B57F00C91783 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = ScriptExec_Prefix.pch;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-//320
-//321
-//322
-//323
-//324
-//4A0
-//4A1
-//4A2
-//4A3
-//4A4
-		4A9504C5FFE6A39111CA0CBA = {
-			buildRules = (
-			);
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				DEBUGGING_SYMBOLS = YES;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				ZERO_LINK = YES;
-			};
-			isa = PBXBuildStyle;
-			name = Development;
-		};
-		4A9504C6FFE6A39111CA0CBA = {
-			buildRules = (
-			);
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				GCC_OPTIMIZATION_LEVEL = s;
-				ZERO_LINK = NO;
-			};
-			isa = PBXBuildStyle;
-			name = Deployment;
-		};
-		4A9504C8FFE6A3BC11CA0CBA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
-			lastKnownFileType = wrapper.framework;
-			name = ApplicationServices.framework;
-			path = /System/Library/Frameworks/ApplicationServices.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		4A9504CAFFE6A41611CA0CBA = {
-			fallbackIsa = PBXFileReference;
-			isa = PBXFrameworkReference;
-			lastKnownFileType = wrapper.framework;
-			name = CoreServices.framework;
-			path = /System/Library/Frameworks/CoreServices.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-//4A0
-//4A1
-//4A2
-//4A3
-//4A4
-//660
-//661
-//662
-//663
-//664
-		664C29F0060ECDC4006EC560 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = openDoc;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		664C29F1060ECDC4006EC560 = {
-			fileRef = 664C29F0060ECDC4006EC560;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//660
-//661
-//662
-//663
-//664
-//8D0
-//8D1
-//8D2
-//8D3
-//8D4
-		8D0C4E890486CD37000505A6 = {
-			buildPhases = (
-				8D0C4E8A0486CD37000505A6,
-				8D0C4E8C0486CD37000505A6,
-				8D0C4E8F0486CD37000505A6,
-				8D0C4E910486CD37000505A6,
-				8D0C4E940486CD37000505A6,
-			);
-			buildRules = (
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				GCC_ENABLE_TRIGRAPHS = NO;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ScriptExec_Prefix.pch;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-				GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-				GCC_WARN_UNKNOWN_PRAGMAS = NO;
-				HEADER_SEARCH_PATHS = "";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "$(HOME)/Applications";
-				LIBRARY_SEARCH_PATHS = "";
-				LIBRARY_STYLE = Static;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = ScriptExec;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXNativeTarget;
-			name = ScriptExec;
-			productInstallPath = "$(HOME)/Applications";
-			productName = ScriptExec;
-			productReference = 8D0C4E970486CD37000505A6;
-			productType = "com.apple.product-type.application";
-		};
-		8D0C4E8A0486CD37000505A6 = {
-			buildActionMask = 2147483647;
-			files = (
-				8D0C4E8B0486CD37000505A6,
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8D0C4E8B0486CD37000505A6 = {
-			fileRef = 32DBCF6D0370B57F00C91783;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		8D0C4E8C0486CD37000505A6 = {
-			buildActionMask = 2147483647;
-			files = (
-				8D0C4E8D0486CD37000505A6,
-				B8DCE045056DAC3500C390B0,
-				B8DCE049056DAC5000C390B0,
-				664C29F1060ECDC4006EC560,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8D0C4E8D0486CD37000505A6 = {
-			fileRef = 0867D6AAFE840B52C02AAC07;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		8D0C4E8F0486CD37000505A6 = {
-			buildActionMask = 2147483647;
-			files = (
-				8D0C4E900486CD37000505A6,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8D0C4E900486CD37000505A6 = {
-			fileRef = 20286C2BFDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-				ATTRIBUTES = (
-				);
-			};
-		};
-		8D0C4E910486CD37000505A6 = {
-			buildActionMask = 2147483647;
-			files = (
-				8D0C4E920486CD37000505A6,
-				8D0C4E930486CD37000505A6,
-				B8DCE04F056DACAE00C390B0,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8D0C4E920486CD37000505A6 = {
-			fileRef = 20286C33FDCF999611CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		8D0C4E930486CD37000505A6 = {
-			fileRef = 0249A66BFF388E3F11CA2CEA;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		8D0C4E940486CD37000505A6 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		8D0C4E960486CD37000505A6 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = text.plist;
-			path = Info.plist;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		8D0C4E970486CD37000505A6 = {
-			explicitFileType = wrapper.application;
-			includeInIndex = 0;
-			isa = PBXFileReference;
-			path = ScriptExec.app;
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-//8D0
-//8D1
-//8D2
-//8D3
-//8D4
-//B80
-//B81
-//B82
-//B83
-//B84
-		B8DCE042056DAC3500C390B0 = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.nib;
-			path = MenuBar.nib;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		B8DCE045056DAC3500C390B0 = {
-			fileRef = B8DCE042056DAC3500C390B0;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		B8DCE048056DAC5000C390B0 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = text.script.sh;
-			path = script;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		B8DCE049056DAC5000C390B0 = {
-			fileRef = B8DCE048056DAC5000C390B0;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		B8DCE04E056DACAE00C390B0 = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
-			name = Security.framework;
-			path = /System/Library/Frameworks/Security.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		B8DCE04F056DACAE00C390B0 = {
-			fileRef = B8DCE04E056DACAE00C390B0;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-	};
-	rootObject = 20286C28FDCF999611CA2CEA;
-}
 
=== modified file 'packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj'
--- packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj	2006-06-20 00:17:02 +0000
+++ packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj	2014-10-14 03:02:11 +0000
@@ -12,14 +12,12 @@
 		8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
 		8D0C4E900486CD37000505A6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 20286C2BFDCF999611CA2CEA /* main.c */; settings = {ATTRIBUTES = (); }; };
 		8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
-		8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0249A66BFF388E3F11CA2CEA /* libstdc++.a */; };
 		B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE042056DAC3500C390B0 /* MenuBar.nib */; };
 		B8DCE049056DAC5000C390B0 /* script in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE048056DAC5000C390B0 /* script */; };
 		B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DCE04E056DACAE00C390B0 /* Security.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		0249A66BFF388E3F11CA2CEA /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/libstdc++.a"; sourceTree = "<absolute>"; };
 		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		20286C2BFDCF999611CA2CEA /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
 		20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
@@ -40,7 +38,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */,
-				8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */,
 				B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -94,7 +91,6 @@
 				20286C33FDCF999611CA2CEA /* Carbon.framework */,
 				4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */,
 				4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */,
-				0249A66BFF388E3F11CA2CEA /* libstdc++.a */,
 				B8DCE04E056DACAE00C390B0 /* Security.framework */,
 			);
 			name = "External Frameworks and Libraries";
@@ -140,9 +136,15 @@
 		20286C28FDCF999611CA2CEA /* Project object */ = {
 			isa = PBXProject;
 			buildConfigurationList = 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */;
+			compatibilityVersion = "Xcode 2.4";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 20286C29FDCF999611CA2CEA /* ScriptExec */;
 			projectDirPath = "";
+			projectRoot = "";
 			targets = (
 				8D0C4E890486CD37000505A6 /* ScriptExec */,
 			);
@@ -199,6 +201,8 @@
 		78E9AE170A36A8E3000D76A8 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
@@ -217,7 +221,6 @@
 				INSTALL_PATH = "$(HOME)/Applications";
 				LIBRARY_SEARCH_PATHS = "";
 				LIBRARY_STYLE = Static;
-				OPTIMIZATION_CFLAGS = "-O0";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
@@ -236,6 +239,8 @@
 		78E9AE180A36A8E3000D76A8 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				COPY_PHASE_STRIP = YES;
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -270,6 +275,8 @@
 		78E9AE190A36A8E3000D76A8 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				FRAMEWORK_SEARCH_PATHS = "";
 				GCC_ENABLE_TRIGRAPHS = NO;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
@@ -300,25 +307,18 @@
 		78E9AE1B0A36A8E3000D76A8 /* Development */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Development;
 		};
 		78E9AE1C0A36A8E3000D76A8 /* Deployment */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Deployment;
 		};
 		78E9AE1D0A36A8E3000D76A8 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
 			};
 			name = Default;
 		};
 
=== added file 'packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh'
--- packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh	1970-01-01 00:00:00 +0000
+++ packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh	2014-10-14 03:02:11 +0000
@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Author: Aaron Voisine <[e-mail]>
+# Inkscape Modifications:
+#	Michael Wybrow <[e-mail]>
+#	Jean-Olivier Irisson <[e-mail]>
+#	~suv <[e-mail]>
+#
+
+[ -n "$INK_DEBUG_LAUNCHER" ] && set -x
+
+CWD="$(cd "$(dirname "$0")" && pwd)"
+# e.g. /Applications/Inkscape.app/Contents/MacOS
+TOP="$(dirname "$CWD")/Resources"
+# e.g. /Applications/Inkscape.app/Contents/Resources
+BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')"
+# e.g. /Applications/Inkscape.app
+
+source "${TOP}/xdg_setup.sh"
+source "${TOP}/alert_fccache.sh"
+
+# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative 
+# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
+# of working directory is required:
+#
+# Due to changes after 0.48, we have change working directory in the script named 'inkscape':
+# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
+# fail (for python-based extensions, inkscape changes the working directory to the 
+# script's directory, and inkscape launched by python script thus can't find resources
+# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory).
+cd "$BASE" || exit 1
+
+# don't prepend to $PATH in recursive calls:
+if [ -z "$INK_PATH_ORIG" ]; then
+
+	# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. 
+	# the 'classic' PATH additions:
+	#	/usr/local/bin which, though standard, doesn't seem to be in the PATH
+	#	Fink
+	#	MacPorts (former DarwinPorts)
+	#	LaTeX distribution for Mac OS X
+	PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
+
+	# 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.
+	PATH_PYTHON="/usr/bin"
+
+	# Put $TOP/bin at beginning of path so we make sure that recursive calls
+	# to inkscape don't pull in other inkscape binaries with different setup.
+	# Also allows to override system python with custom wrapper script, and
+	# e.g. to support GIMP.app or gimp for external editing and GIMP XCF export.
+	PATH_pkgbin="$CWD:$TOP/bin"
+
+	# save orig, new PATH
+	export INK_PATH_ORIG="$PATH"
+	export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG"
+fi
+
+# Setup PYTHONPATH to use python modules shipped with Inkscape
+OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)"
+build_arch=__build_arch__
+if [ $OSXMINORNO -gt "5" ]; then
+	if [ $OSXMINORNO -eq "6" ]; then
+		export VERSIONER_PYTHON_VERSION=2.6
+	else # if [ $OSXMINORNO -ge "7" ]; then
+		export VERSIONER_PYTHON_VERSION=2.7
+	fi
+	if [ $build_arch = "i386" ]; then
+		export VERSIONER_PYTHON_PREFER_32_BIT=yes
+	else # build & runtime arch x86_64
+		export VERSIONER_PYTHON_PREFER_32_BIT=no
+	fi
+fi
+PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)"
+export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/"
+
+export FONTCONFIG_PATH="$TOP/etc/fonts"
+export PANGO_RC_FILE="$TOP/etc/pango/pangorc"
+export PANGO_SYSCONFDIR="$TOP/etc"
+export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache"
+export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache"
+export GTK_DATA_PREFIX="$TOP"
+export GTK_EXE_PREFIX="$TOP"
+export GTK_PATH="$TOP"
+export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
+export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
+export GIO_USE_VFS="local"
+export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
+export GVFS_DISABLE_FUSE=1
+export XDG_DATA_DIRS="$TOP/share"
+export ASPELL_CONF="prefix $TOP;"
+export POPPLER_DATADIR="$TOP/share/poppler"
+
+# no DBUS for now
+unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
+unset DBUS_SESSION_BUS_ADDRESS
+
+# Note: This requires the path with the exact ImageMagic version number.
+#       The actual version is inserted by the packaging script.
+export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config"
+export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
+export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
+
+export INKSCAPE_SHAREDIR="$TOP/share/inkscape"
+export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
+export INKSCAPE_LOCALEDIR="$TOP/share/locale"
+
+# Handle the case where the directory storing Inkscape has special characters
+# ('#', '&', '|') in the name.  These need to be escaped to work properly for 
+# various configuration files.
+ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
+
+# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
+if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
+	export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc"
+fi
+
+# If the AppleCollationOrder preference doesn't exist, we fall back to using
+# the AppleLocale preference.
+LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
+if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
+then
+    LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
+            sed 's/_.*//'`
+	[ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
+else
+	[ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
+fi
+
+# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
+#       to crash on startup in locale_from_utf8().
+if [ "x$LANGSTR" == "x" ]
+then 
+	# override broken script
+	[ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2
+	export LANG="en_US.UTF-8"
+else
+	tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
+		tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
+	if [ "x$tmpLANG" == "x" ]
+	then
+		# override broken script
+		[ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
+		export LANG="en_US.UTF-8"
+	else
+		[ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
+		export LANG="$tmpLANG.UTF-8"
+	fi
+fi
+[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2
+export LC_ALL="$LANG"
+
+case "$INK_DEBUG" in
+	gdb)
+		EXEC="gdb --args" ;;
+	lldb)
+		EXEC="lldb -- " ;;
+	dtruss)
+		EXEC="dtruss" ;;
+	*)
+		EXEC="exec" ;;
+esac
+unset INK_DEBUG # ignore for recursive calls
+
+if [ "x$INK_DEBUG_SHELL" != "x" ]; then
+	exec bash
+else
+	$EXEC "$CWD/inkscape-bin" "$@"
+fi
 
=== modified file 'packaging/macosx/ScriptExec/main.c'
--- packaging/macosx/ScriptExec/main.c	2009-09-23 21:02:27 +0000
+++ packaging/macosx/ScriptExec/main.c	2014-10-14 03:02:11 +0000
@@ -6,6 +6,7 @@
     With modifications by Aaron Voisine for gimp.app
     With modifications by Marianne gagnon for Wilber-loves-apple
     With modifications by Michael Wybrow for Inkscape.app
+    With modifications by ~suv for Inkscape.app
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -27,7 +28,7 @@
 
 /*
  * This app laucher basically takes care of:
- * - launching Inkscape and X11 when double-clicked 
+ * - launching Inkscape when double-clicked 
  * - bringing X11 to the top when its icon is clicked in the dock (via a small applescript)
  * - catch file dropped on icon events (and double-clicked gimp documents) and notify gimp.
  * - catch quit events performed outside gimp, e.g. on the dock icon.
@@ -39,7 +40,12 @@
 #pragma mark Includes
 
 // Apple stuff
+
+// Note: including Carbon prevents building the launcher app in x86_64
+//       used for StandardAlert in RequestUserAttention(), 
+//       RedFatalAlert()
 #include <Carbon/Carbon.h>
+
 #include <CoreFoundation/CoreFoundation.h>
 #include <Security/Authorization.h>
 #include <Security/AuthorizationTags.h>
@@ -67,7 +73,6 @@
 #define kEventClassRedFatalAlert 911
 
 // custom carbon event types
-#define kEventKindX11Failed 911
 #define kEventKindFCCacheFailed 912
 
 //maximum arguments the script accepts 
@@ -83,15 +88,14 @@
 static OSErr ExecuteScript(char *script, pid_t *pid);
 
 static void  GetParameters(void);
-static char* GetScript(void);
-static char* GetOpenDoc(void);
+static unsigned char* GetScript(void);
+static unsigned char* GetOpenDoc(void);
 
 OSErr LoadMenuBar(char *appName);
 
-static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize);
+static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize);
 static void RedFatalAlert(Str255 errorString, Str255 expStr);
-static short DoesFileExist(char *path);
-static OSStatus FixFCCache(void);
+static short DoesFileExist(unsigned char *path);
 
 static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent,
                               AppleEvent *reply, long refCon);
@@ -99,8 +103,6 @@
                                  AppleEvent *reply, long refCon);
 static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent,
                                  AppleEvent *reply, long refCon);
-static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall,
-                                 EventRef theEvent, void *userData);
 static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall,
                                  EventRef theEvent, void *userData);
 static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent,
@@ -109,7 +111,7 @@
 static OSStatus CompileAppleScript(const void* text, long textLength,
                                   AEDesc *resultData);
 static OSStatus SimpleCompileAppleScript(const char* theScript);
-static void runScript();
+static OSErr runScript();
 
 ///////////////////////////////////////
 // Globals
@@ -144,7 +146,6 @@
 int main(int argc, char* argv[])
 {
     OSErr err = noErr;
-    EventTypeSpec X11events = { kEventClassRedFatalAlert, kEventKindX11Failed };
     EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed };
 
     InitCursor();
@@ -165,9 +166,6 @@
                                  0, false);
     
     err += InstallEventHandler(GetApplicationEventTarget(),
-                               NewEventHandlerUPP(X11FailedHandler), 1,
-                               &X11events, NULL, NULL);
-    err += InstallEventHandler(GetApplicationEventTarget(),
                                NewEventHandlerUPP(FCCacheFailedHandler), 1,
                                &FCCacheEvents, NULL, NULL);
 
@@ -181,7 +179,7 @@
     GetParameters(); //load data from files containing exec settings
 
     // compile "icon clicked" script so it's ready to execute
-    SimpleCompileAppleScript("tell application \"X11\" to activate");
+    SimpleCompileAppleScript("tell application \"XQuartz\" to activate");
     
     RunApplicationEventLoop(); //Run the event loop
     return 0;
@@ -229,6 +227,7 @@
 
 //////////////////////////////////
 // Handler for when fontconfig caches need to be generated
+// TODO: remove (alert and touch moved to launcher script)
 //////////////////////////////////
 static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, 
                                  EventRef theEvent, void *userData)
@@ -243,8 +242,8 @@
     ShowFirstStartWarningDialog();
 
     // Note that we've seen the warning.
-    system("test -d \"$HOME/.inkscape-etc\" || mkdir -p \"$HOME/.inkscape-etc\"; "
-           "touch \"$HOME/.inkscape-etc/.fccache-new\"");
+    system("test -d \"$HOME/.cache/inkscape\" || mkdir -p \"$HOME/.cache/inkscape\"; "
+           "touch \"$HOME/.cache/inkscape/.fccache-new\"");
     // Rerun now.
     OSErr err = ExecuteScript(scriptPath, &pid);
     ExitToShell();
@@ -253,116 +252,6 @@
 }
 
 
-static size_t safeRead(int d, void *buf, size_t nbytes)
-{
-	ssize_t bytesToRead = nbytes;
-	ssize_t bytesRead = 0;
-	char *offset = (char *) buf;
-
-	while ((bytesToRead > 0))
-	{
-		bytesRead = read(d, offset, bytesToRead);
-		if (bytesRead > 0)
-		{
-			offset += bytesRead;
-			bytesToRead -= bytesRead;
-		}
-		else if (bytesRead == 0)
-		{	
-			// Reached EOF.
-			break;
-		}
-		else if (bytesRead == -1)
-		{
-			if ((errno == EINTR) || (errno == EAGAIN))
-			{
-				// Try again.
-				continue;
-			}
-			return 0;
-		}
-	}
-	return bytesRead;
-}
-
-
-/////////////////////////////////////
-// Code to run fc-cache on first run
-/////////////////////////////////////
-static OSStatus FixFCCache (void)
-{
-	FILE *fileConnToChild = NULL;
-	int fdConnToChild = 0;
-	pid_t childPID = WAIT_ANY;
-	size_t bytesChildPID;
-	size_t bytesRead;
-	int status;
-
-	char commandStr[] = "/usr/X11R6/bin/fc-cache";
-	char *commandArgs[] = { "-f", NULL };
-
-	// Run fc-cache
-	AuthorizationItem authItems[] = 
-	{
-	{
-		kAuthorizationRightExecute,
-		strlen(commandStr),
-		commandStr,
-		0
-	}
-	};
-	AuthorizationItemSet authItemSet =
-	{
-		1,
-		authItems
-	};
-	AuthorizationRef authRef = NULL;
-	OSStatus err = AuthorizationCreate (NULL, &authItemSet,
-			kAuthorizationFlagInteractionAllowed | 
-			kAuthorizationFlagExtendRights, &authRef);
-
-	if (err == errAuthorizationSuccess)
-	{
-		err = AuthorizationExecuteWithPrivileges(authRef, commandStr, 
-				kAuthorizationFlagDefaults, commandArgs,
-				&fileConnToChild);
-
-		if (err == errAuthorizationSuccess)
-		{
-			// Unfortunately, AuthorizationExecuteWithPrivileges
-			// does not return the process ID associated with the
-			// process it runs.  The best solution we have it to
-			// try and get the process ID from the file descriptor.
-			// This is based on example code from Apple's
-			// MoreAuthSample.
-
-			fdConnToChild = fileno(fileConnToChild);
-			
-			// Try an get the process ID of the fc-cache command
-			bytesChildPID = sizeof(childPID);
-			bytesRead = safeRead(fdConnToChild, &childPID,
-					bytesChildPID);
-			if (bytesRead != bytesChildPID)
-			{
-				// If we can't get it the best alternative
-				// is to wait for any child to finish.
-				childPID = WAIT_ANY;
-			}
-
-			if (fileConnToChild != NULL) {
-				fclose(fileConnToChild);
-			}
-
-			// Wait for child process to finish.
-			waitpid(childPID, &status, 0);
-		}
-	}
-	AuthorizationFree(authRef, kAuthorizationFlagDestroyRights);
-
-	return err;
-}
-
-
 ///////////////////////////////////
 // Execution thread starts here
 ///////////////////////////////////
@@ -373,12 +262,7 @@
     taskDone = false;
     
     OSErr err = ExecuteScript(scriptPath, &pid);
-    if (err == (OSErr)11) {
-        CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindX11Failed, 0,
-                    kEventAttributeNone, &event);
-        PostEventToQueue(GetMainEventQueue(), event, kEventPriorityStandard);
-    }
-    else if (err == (OSErr)12) {
+    if (err == (OSErr)12) {
         CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0,
                     kEventAttributeNone, &event);
         PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh);
@@ -448,14 +332,13 @@
 ///////////////////////////////////////
 // Get path to the script in Resources folder
 ///////////////////////////////////////
-static char* GetScript (void)
+static unsigned char* GetScript (void)
 {
     CFStringRef fileName;
     CFBundleRef appBundle;
     CFURLRef scriptFileURL;
     FSRef fileRef;
-    FSSpec fileSpec;
-    char *path;
+    unsigned char *path;
 
     //get CF URL for script
     if (! (appBundle = CFBundleGetMainBundle())) return NULL;
@@ -472,13 +355,9 @@
     CFRelease(scriptFileURL);
     CFRelease(fileName);
     
-    //convert FSRef to FSSpec
-    if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec,
-                         NULL)) return NULL;
-        
     //create path string
     if (! (path = malloc(kMaxPathLength))) return NULL;
-    if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL;
+    if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL;
     if (! DoesFileExist(path)) return NULL;
     
     return path;
@@ -487,14 +366,13 @@
 ///////////////////////////////////////
 // Gets the path to openDoc in Resources folder
 ///////////////////////////////////////
-static char* GetOpenDoc (void)
+static unsigned char* GetOpenDoc (void)
 {
     CFStringRef fileName;
     CFBundleRef appBundle;
     CFURLRef openDocFileURL;
     FSRef fileRef;
-    FSSpec fileSpec;
-    char *path;
+    unsigned char *path;
     
     //get CF URL for openDoc
     if (! (appBundle = CFBundleGetMainBundle())) return NULL;
@@ -511,13 +389,9 @@
     CFRelease(openDocFileURL);
     CFRelease(fileName);
         
-    //convert FSRef to FSSpec
-    if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec,
-                         NULL)) return NULL;
-
     //create path string
     if (! (path = malloc(kMaxPathLength))) return NULL;
-    if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL;
+    if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL;
     if (! DoesFileExist(path)) return NULL;
     
     return path;
@@ -545,14 +419,8 @@
 ///////////////////////////////////////
 // Generate path string from FSSpec record
 ///////////////////////////////////////
-static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize)
+static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize)
 {
-    OSErr err = noErr;
-    FSRef fileRef;
-
-    //create file reference from file spec
-    if (err = FSpMakeFSRef(&file, &fileRef)) return err;
-
     // and then convert the FSRef to a path
     return FSRefMakePath(&fileRef, path, maxPathSize);
 }
@@ -569,9 +437,9 @@
 ///////////////////////////////////////
 // Determines whether file exists at path or not
 ///////////////////////////////////////
-static short DoesFileExist (char *path)
+static short DoesFileExist (unsigned char *path)
 {
-    if (access(path, F_OK) == -1) return false;
+    if (access((char *)path, F_OK) == -1) return false;
     return true;	
 }
 
@@ -590,7 +458,7 @@
     
     if (! taskDone && pid) { //kill the script process brutally
         kill(pid, 9);
-        printf("Platypus App: PID %d killed brutally\n", pid);
+        printf("Inkscape.app: PID %d killed brutally\n", pid);
     }
     
     pthread_cancel(tid);
@@ -610,31 +478,31 @@
     #pragma unused (reply, refCon)
 	
     OSErr err = noErr;
-    AEDescList fileSpecList;
+    AEDescList fileRefList;
     AEKeyword keyword;
     DescType type;
         
     short i;
     long count, actualSize;
         
-    FSSpec fileSpec;
-    char path[kMaxPathLength];
+    FSRef fileRef;
+    unsigned char path[kMaxPathLength];
     
     while (numArgs > 0) free(fileArgs[numArgs--]);
         
     //Read the AppleEvent
     err = AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList,
-                         &fileSpecList);
+                         &fileRefList);
 		
-    err = AECountItems(&fileSpecList, &count); //Count number of files
+    err = AECountItems(&fileRefList, &count); //Count number of files
                 
     for (i = 1; i <= count; i++) { //iteratively process each file
-        //get fsspec from apple event
-        if (! (err = AEGetNthPtr(&fileSpecList, i, typeFSS, &keyword, &type,
-                                 (Ptr)&fileSpec, sizeof(FSSpec), &actualSize)))
+        //get fsref from apple event
+        if (! (err = AEGetNthPtr(&fileRefList, i, typeFSRef, &keyword, &type,
+                                 (Ptr)&fileRef, sizeof(FSRef), &actualSize)))
         {
-            //get path from file spec
-            if ((err = FSMakePath(fileSpec, (unsigned char *)&path,
+            //get path from file ref
+            if ((err = FSMakePath(fileRef, (unsigned char *)&path,
                                   kMaxPathLength))) return err;
                             
             if (numArgs == kMaxArgumentsToScript) break;
@@ -659,7 +527,7 @@
 static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent,
                                  AppleEvent *reply, long refCon)
 {
-    runScript();
+    return runScript();
 }
 
 // if app is being opened
@@ -675,70 +543,6 @@
 }
 
 
-static void OpenURL(Str255 url)
-{
-	// Use Internet Config to hand the URL to the appropriate application, as
-	// set by the user in the Internet Preferences pane.
-	ICInstance icInstance;
-	// Applications creator code:
-	OSType signature = 'Inks';
-	OSStatus error = ICStart( &icInstance, signature );
-	if ( error == noErr )
-	{
-		ConstStr255Param hint = 0x0;
-		const char* data = url;
-		long length = strlen(url);
-		long start =  0;
-		long end = length;
-		// Don't bother testing return value (error); launched application will
-		// report problems.
-		ICLaunchURL( icInstance, hint, data, length, &start, &end );
-		ICStop( icInstance );
-	}
-}
-
-
-//////////////////////////////////
-// Handler for when X11 fails to start
-//////////////////////////////////
-static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, 
-                                 EventRef theEvent, void *userData)
-{
-    #pragma unused(theHanderCall, theEvent, userData)
-
-    pthread_join(tid, NULL);
-    if (odtid) pthread_join(odtid, NULL);
- 
-	SInt16 itemHit;
-	const char *getX11 = "\pGet X11 for Panther";
-
-	AlertStdAlertParamRec params;
-	params.movable = true;
-	params.helpButton = false;
-	params.filterProc = NULL;
-	params.defaultText = (StringPtr) kAlertDefaultOKText;
-	params.cancelText = getX11;
-	params.otherText = NULL;
-	params.defaultButton = kAlertStdAlertOKButton;
-	params.cancelButton = kAlertStdAlertCancelButton;
-	params.position = kWindowDefaultPosition;
-
-	StandardAlert(kAlertStopAlert, "\pFailed to start X11",
-			"\pInkscape.app requires Apple's X11, which is freely downloadable from Apple's website for Panther (10.3.x) users and available as an optional install from the installation DVD for Tiger (10.4.x) users.\n\nPlease install X11 and restart Inkscape.",
-			&params, &itemHit);
-
-	if (itemHit == kAlertStdAlertCancelButton)
-	{
-		OpenURL("http://www.apple.com/downloads/macosx/apple/macosx_updates/x11formacosx.html");
-	}
-
-    ExitToShell();
-
-
-    return noErr;
-}
-
-
 // Compile and run a small AppleScript. The code below does no cleanup and no proper error checks
 // but since it's there until the app is shut down, and since we know the script is okay,
 // there should not be any problems.
@@ -774,7 +578,7 @@
 }
 
 /* runs the compiled applescript */
-static void runScript()
+static OSErr runScript()
 {
     /* run the script */
     err = OSAExecute(theComponent, scriptID, kOSANullScript,
 
=== added file 'packaging/macosx/create-stock-icon-theme.sh'
--- packaging/macosx/create-stock-icon-theme.sh	1970-01-01 00:00:00 +0000
+++ packaging/macosx/create-stock-icon-theme.sh	2014-10-14 03:02:11 +0000
@@ -0,0 +1,165 @@
+#!/usr/bin/env bash
+#
+#
+# Create new icon theme based on GTK+ stock icons
+#
+# Copyright (C) 2014 ~suv
+#
+
+
+# config
+#---------------------------------------------------------
+
+if [ -z $LIBPREFIX ]; then
+    LIBPREFIX="/opt/local-x11"
+fi
+if [ -z $stock_src ]; then
+    stock_src="$(pwd)/stock-icons"
+fi
+
+
+# setup
+#---------------------------------------------------------
+
+map_legacy_icons="$LIBPREFIX/libexec/icon-name-mapping"
+if [ ! -x "$map_legacy_icons" ]; then
+    echo "Install icon-naming-utils" 
+    exit 1
+fi
+
+if [ ! -d "$stock_src" ]; then
+    echo "extra icons not found." 
+    exit 1
+fi
+
+ICONDIR="$1"
+icon_theme_dir="$(dirname "$ICONDIR")"
+if [ ! -d "$icon_theme_dir" ] ; then
+    mkdir -p  "$icon_theme_dir"
+fi
+icon_theme_name="$(basename "$ICONDIR")"
+if [ -z "$icon_theme_name" ]; then
+    echo "Not a valid icon theme name." 
+    exit 1
+fi
+theme_color="$2"
+
+contexts="actions animations apps categories devices emblems emotes mimetypes places status"
+gtk_stock_sizes="16 20 24 32 48"
+
+orig_dir="$(pwd)"
+cd "$icon_theme_dir"
+current_dir="$(pwd)"
+
+index_file="${icon_theme_name}/index.theme"
+
+
+# Remove a previously existing icon theme if necessary
+#---------------------------------------------------------
+
+if [ -d "$icon_theme_name" ]; then
+    echo "Removing previous $icon_theme_name"
+    rm -R "$icon_theme_name"
+fi
+
+
+# create new icon theme structure
+#---------------------------------------------------------
+
+mkdir -p "$icon_theme_name"
+for size in $gtk_stock_sizes; do
+    mkdir "${icon_theme_name}/${size}x${size}"
+done
+
+
+# copy stock icons
+#---------------------------------------------------------
+
+for size in $gtk_stock_sizes; do
+    cp -RP "${stock_src}/$size" "${icon_theme_name}/${size}x${size}/stock"
+done
+
+# workarounds for broken icons (bug #1269698)
+#---------------------------------------------------------
+
+for size in $gtk_stock_sizes; do
+    cd "${icon_theme_name}/${size}x${size}/stock"
+    # directional icons
+    for di in "edit-undo" "edit-redo" "document-revert"; do
+        if [ -f "${di}-ltr.png" ]; then
+            if [ ! -e "${di}.png" ]; then
+                ln -s "${di}-ltr.png" "${di}.png"
+            fi
+        fi 
+    done
+    # misc failed lookups
+    for di in "preferences"; do
+        if [ -f "gtk-${di}.png" ]; then
+            if [ ! -e "${di}-system.png" ]; then
+                ln -s "gtk-${di}.png" "${di}-system.png"
+            fi
+        fi
+    done
+    cd "$current_dir"
+done
+
+# create links (round 1)
+#---------------------------------------------------------
+
+for size in $gtk_stock_sizes; do
+    cd "${icon_theme_name}/${size}x${size}"
+    for ct in $contexts; do
+        echo "size: $size  context: $ct"
+        mv "stock" "$ct"
+        $map_legacy_icons -c "$ct"
+        mv $ct "stock"
+    done
+    cd "$current_dir"
+done
+
+
+# create links (round 2)
+#---------------------------------------------------------
+
+for size in $gtk_stock_sizes; do
+    cd "${icon_theme_name}/${size}x${size}/stock"
+    for icon_file in *.png; do
+        [ -s $icon_file ] && ln -s "$icon_file" "$(basename $icon_file .png)"-symbolic.png
+    done
+    cd "$current_dir"
+done
+
+
+# create new index.theme
+#---------------------------------------------------------
+
+dir_list=
+for size in $gtk_stock_sizes; do
+    dir_list="${dir_list}${size}x${size}/stock,"
+done
+
+cat > "$index_file" <<End-of-message
+[Icon Theme]
+Name=$icon_theme_name
+Inherits=hicolor
+Comment=Gtk Stock Icons for Inkscape.app
+Example=folder
+
+# Directory list
+Directories=$dir_list
+
+End-of-message
+
+for size in $gtk_stock_sizes; do
+    cat >> "$index_file" << End-of-message
+[${size}x${size}/stock]
+Size=${size}
+Context=Stock
+Type=fixed
+
+End-of-message
+done
+
+
+#---------------------------------------------------------
+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
 
=== modified file 'packaging/macosx/dmg_background.png'
 Binary files packaging/macosx/dmg_background.png	2009-06-21 20:16:49 +0000 and packaging/macosx/dmg_background.png	2014-10-14 03:02:11 +0000 differ
=== modified file 'packaging/macosx/dmg_background.svg'
--- packaging/macosx/dmg_background.svg	2009-06-21 20:16:49 +0000
+++ packaging/macosx/dmg_background.svg	2014-10-14 03:02:11 +0000
@@ -10,19 +10,113 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="624.54108"
-   height="350"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46+devel r21585 custom"
-   sodipodi:docname="dmg_background.svg"
-   version="1.0"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="./dmg_background.png">
+   width="1280"
+   height="800"
+   id="svg13532"
+   version="1.1"
+   inkscape:version="0.91pre2 r13554 custom"
+   viewBox="0 0 1280 800"
+   sodipodi:docname="dmg_background.svg">
   <defs
-     id="defs4">
+     id="defs13534">
+    <linearGradient
+       inkscape:collect="always"
+       id="content_bg">
+      <stop
+         style="stop-color:#eeeeee;stop-opacity:1"
+         offset="0"
+         id="stop4699" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4701" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="header_bg">
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1"
+         offset="0"
+         id="stop4685" />
+      <stop
+         id="stop4687"
+         offset="0.13333334"
+         style="stop-color:#e6e6e6;stop-opacity:1" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop4689" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="nav_foot">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         offset="0"
+         id="stop4635" />
+      <stop
+         style="stop-color:#333333;stop-opacity:1"
+         offset="1"
+         id="stop4637" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="nav_top">
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         offset="0"
+         id="stop4469" />
+      <stop
+         style="stop-color:#1a1a1a;stop-opacity:1"
+         offset="1"
+         id="stop4471" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient5785-8-9">
+      <stop
+         offset="0"
+         style="stop-color:#c0cdf9;stop-opacity:1"
+         id="stop5787-7-9" />
+      <stop
+         offset="1"
+         style="stop-color:#07092d;stop-opacity:0.28804347"
+         id="stop5789-3-7" />
+    </linearGradient>
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       id="WhiteTransparent-3-90">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop7606-1-2" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop7608-8-0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient5793-9-3">
+      <stop
+         offset="0"
+         style="stop-color:#eeeeec;stop-opacity:1"
+         id="stop5795-5-7" />
+      <stop
+         offset="1"
+         style="stop-color:#eeeeec;stop-opacity:0"
+         id="stop5797-4-8" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient10981-3-9-0">
+      <stop
+         offset="0"
+         style="stop-color:#729fcf;stop-opacity:1"
+         id="stop10983-2-0-9" />
+      <stop
+         offset="1"
+         style="stop-color:#729fcf;stop-opacity:0"
+         id="stop10985-3-7-7" />
+    </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient5781">
@@ -35,833 +129,96 @@
          offset="1"
          id="stop5785" />
     </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 175 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="624.54108 : 175 : 1"
-       inkscape:persp3d-origin="312.27054 : 116.66667 : 1"
-       id="perspective58" />
-    <linearGradient
-       id="linearGradient841">
-      <stop
-         id="stop842"
-         offset="0"
-         style="stop-color:#62c012;stop-opacity:1;" />
-      <stop
-         id="stop843"
-         offset="1"
-         style="stop-color:white;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient841"
-       id="linearGradient4989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(4.195695,0,0,1.0590609,48.598964,114.17717)"
-       x1="76.911163"
-       y1="25.401896"
-       x2="76.911163"
-       y2="137.02844" />
-    <filter
-       inkscape:collect="always"
-       x="-1.0928679"
-       width="3.1857358"
-       y="-1.212016"
-       height="3.424032"
-       id="filter6362">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.9435145"
-         id="feGaussianBlur6364" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.27738996"
-       width="1.5547799"
-       y="-0.28560414"
-       height="1.5712083"
-       id="filter6366">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.9435145"
-         id="feGaussianBlur6368" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.9599201"
-       width="2.9198402"
-       y="-1.2584231"
-       height="3.5168462"
-       id="filter6370">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.9435145"
-         id="feGaussianBlur6372" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-1.2436028"
-       width="3.4872055"
-       y="-1.2664239"
-       height="3.5328478"
-       id="filter6374">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="6.9435145"
-         id="feGaussianBlur6376" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       x="-0.016262574"
-       width="1.0325251"
-       y="-0.19320738"
-       height="1.3864148"
-       id="filter6402">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.8499877"
-         id="feGaussianBlur6404" />
-    </filter>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath8875">
-      <path
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81105022pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         d="M 251.4419,206.10491 C 247.44915,206.10491 244.22315,209.33092 244.22315,213.32366 L 244.22315,312.47991 C 244.22315,316.47265 247.44915,319.69867 251.4419,319.69866 L 472.16065,319.69866 C 476.1534,319.69866 479.34815,316.47264 479.34815,312.47991 L 479.34815,213.32366 C 479.34815,209.33092 476.1534,206.10491 472.16065,206.10491 L 251.4419,206.10491 z M 321.1294,233.57366 L 321.1294,244.94866 L 321.16065,244.94866 L 440.0669,244.94866 L 440.0669,277.26116 L 321.1919,277.26116 L 321.2544,288.63616 L 282.1294,261.26116 L 321.1294,233.57366 z"
-         id="path8877" />
-    </clipPath>
-    <filter
-       inkscape:collect="always"
-       id="filter9015">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.755523"
-         id="feGaussianBlur9017" />
-    </filter>
-    <linearGradient
-       gradientTransform="translate(-130.16572,-83.352786)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient10981-3-9"
-       id="linearGradient1539"
-       y2="144.5"
-       x2="153.70045"
-       y1="217.5"
-       x1="180.81293" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter10997-7-2">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.7696726"
-         id="feGaussianBlur10999-0-7" />
-    </filter>
-    <linearGradient
-       id="linearGradient10981-3-9">
-      <stop
-         offset="0"
-         style="stop-color:#729fcf;stop-opacity:1"
-         id="stop10983-2-0" />
-      <stop
-         offset="1"
-         style="stop-color:#729fcf;stop-opacity:0"
-         id="stop10985-3-7" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent-3"
-       id="linearGradient5822-7"
-       y2="187.65974"
-       x2="82.754066"
-       y1="180.47572"
-       x1="73.712105" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter5845-5">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.2409356"
-         id="feGaussianBlur5847-5" />
-    </filter>
-    <linearGradient
-       id="linearGradient5805-9">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5807-4" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5809-9" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5805-9"
-       id="radialGradient5811-3"
-       fy="214.55121"
-       fx="181.22731"
-       r="22.466398"
-       cy="214.55121"
-       cx="181.22731" />
-    <linearGradient
-       id="linearGradient5793-9">
-      <stop
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1"
-         id="stop5795-5" />
-      <stop
-         offset="1"
-         style="stop-color:#eeeeec;stop-opacity:0"
-         id="stop5797-4" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5793-9"
-       id="linearGradient5801-2"
-       y2="84.480316"
-       x2="53.63158"
-       y1="76.246338"
-       x1="57.225197" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter5983-8"
-       x="-0.082508981"
-       width="1.165018"
-       y="-0.12233575"
-       height="1.2446715">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.6868363"
-         id="feGaussianBlur5985-3" />
-    </filter>
-    <linearGradient
-       id="linearGradient5899-9">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop5901-9" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop5903-3" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5899-9"
-       id="linearGradient5905-4"
-       y2="223.5"
-       x2="153.5"
-       y1="208.16444"
-       x1="95.5" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter9298-4">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.32610678"
-         id="feGaussianBlur9300-4" />
-    </filter>
-    <linearGradient
-       id="linearGradient9286-3">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop9288-9" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop9290-2" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9286-3"
-       id="radialGradient11553-3"
-       fy="21.225746"
-       fx="68.39994"
-       r="54.783398"
-       cy="21.225746"
-       cx="68.39994" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter9068-2"
-       x="-0.076179281"
-       width="1.1523587"
-       y="-0.1655701"
-       height="1.3311402">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.66458488"
-         id="feGaussianBlur9070-7" />
-    </filter>
-    <linearGradient
-       id="linearGradient9040-4">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop9042-3" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop9044-7" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient9040-4"
-       id="radialGradient9046-1"
-       fy="230.83626"
-       fx="90.28125"
-       r="10.46875"
-       cy="230.83626"
-       cx="90.28125" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0"
-       id="linearGradient9025-1"
-       y2="200.07138"
-       x2="231.37646"
-       y1="195.62132"
-       x1="231.37646" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0"
-       id="linearGradient9023-6"
-       y2="201.5"
-       x2="231.75"
-       y1="195.1875"
-       x1="231.625" />
-    <linearGradient
-       id="linearGradient8998-5">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0.33004925"
-         id="stop9000-9" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop9002-5" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8998-5"
-       id="radialGradient9004-6"
-       fy="187.86935"
-       fx="89.875"
-       r="22.75"
-       cy="187.86935"
-       cx="89.875" />
-    <radialGradient
-       gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8916-4"
-       id="radialGradient8994-0"
-       fy="204.83229"
-       fx="228.21875"
-       r="14.09375"
-       cy="204.83229"
-       cx="228.21875" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0"
-       id="linearGradient8992-2"
-       y2="200.07138"
-       x2="231.37646"
-       y1="195.62132"
-       x1="231.37646" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0"
-       id="linearGradient8990-4"
-       y2="201.5"
-       x2="231.75"
-       y1="195.1875"
-       x1="231.625" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter8980-1"
-       x="-0.069862768"
-       width="1.1397254"
-       y="-0.47285891"
-       height="1.9457178">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.82052366"
-         id="feGaussianBlur8982-9" />
-    </filter>
-    <linearGradient
-       id="linearGradient8916-4">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8918-9" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8920-9" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8916-4"
-       id="radialGradient8922-9"
-       fy="204.83229"
-       fx="228.21875"
-       r="14.09375"
-       cy="204.83229"
-       cx="228.21875" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter8906-3"
-       x="-0.085441329"
-       width="1.1708827"
-       y="-0.27823201"
-       height="1.556464">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.56515877"
-         id="feGaussianBlur8908-7" />
-    </filter>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0"
-       id="linearGradient8910-3"
-       y2="200.07138"
-       x2="231.37646"
-       y1="195.62132"
-       x1="231.37646" />
-    <linearGradient
-       id="linearGradient8866-0">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8868-3" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8870-0" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0"
-       id="linearGradient8912-9"
-       y2="201.5"
-       x2="231.75"
-       y1="195.1875"
-       x1="231.625" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter8764-9"
-       x="-0.074262142"
-       width="1.1485243"
-       y="-0.1754123"
-       height="1.3508246">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.1195652"
-         id="feGaussianBlur8766-2" />
-    </filter>
-    <radialGradient
-       gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8738-4"
-       id="radialGradient8768-6"
-       fy="182.08189"
-       fx="217.5"
-       r="34.25"
-       cy="182.08189"
-       cx="217.5" />
-    <linearGradient
-       id="linearGradient8738-4">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8740-8" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8742-4" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8738-4"
-       id="radialGradient8744-9"
-       fy="168.5"
-       fx="210.25"
-       r="34.25"
-       cy="168.5"
-       cx="210.25" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter8732-3"
-       x="-0.078079157"
-       width="1.1561583"
-       y="-0.11422065"
-       height="1.2284414">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.9579068"
-         id="feGaussianBlur8734-5" />
-    </filter>
-    <radialGradient
-       gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8568-7"
-       id="radialGradient8574-0"
-       fy="251.99396"
-       fx="132.44434"
-       r="30.599579"
-       cy="251.99396"
-       cx="132.44434" />
-    <linearGradient
-       id="linearGradient8568-7">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8570-9" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8572-1" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8568-7"
-       id="radialGradient9177-1"
-       fy="250.89737"
-       fx="116.31038"
-       r="30.599579"
-       cy="250.89737"
-       cx="116.31038" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent-3"
-       id="IcecapTip-0"
-       y2="50"
-       x2="90"
-       y1="20"
-       x1="60" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="WhiteTransparent-3">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop7606-1" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop7608-8" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent-3"
-       id="shinySpecular-0"
-       y2="60"
-       x2="58"
-       y1="35"
-       x1="33" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter8490-0">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.4163949"
-         id="feGaussianBlur8492-5" />
-    </filter>
-    <clipPath
-       id="clipPath9086-1">
-      <use
-         xlink:href="#outline1"
-         height="300"
-         width="400"
-         y="0"
-         x="0"
-         style="opacity:0.25;fill:#ffffff;fill-opacity:1"
-         id="use9088-0"
-         transform="translate(1.0095461e-6,0)" />
-    </clipPath>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5785-8">
-      <stop
-         offset="0"
-         style="stop-color:#c0cdf9;stop-opacity:1"
-         id="stop5787-7" />
-      <stop
-         offset="1"
-         style="stop-color:#07092d;stop-opacity:0.28804347"
-         id="stop5789-3" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5785-8"
-       id="linearGradient9175-3"
-       y2="40"
-       x2="60"
-       y1="20"
-       x1="82.118591" />
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter6031-0">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.4903482"
-         id="feGaussianBlur6033-8" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter6017-3">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.80546496"
-         id="feGaussianBlur6019-9" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter8490">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="2.4163949"
-         id="feGaussianBlur8492" />
-    </filter>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5785">
-      <stop
-         offset="0"
-         style="stop-color:#c0cdf9;stop-opacity:1"
-         id="stop5787" />
-      <stop
-         offset="1"
-         style="stop-color:#07092d;stop-opacity:0.28804347"
-         id="stop5789" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5785"
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient5785-8-9"
        id="linearGradient9175"
        y2="40"
        x2="60"
        y1="20"
        x1="82.118591" />
     <clipPath
-       id="clipoutline1">
+       id="clipoutline1-8">
       <path
-         id="outline1"
+         id="outline1-2"
          d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" />
     </clipPath>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent"
-       id="sideSpecular"
-       y2="40"
-       x2="60"
-       y1="20"
-       x1="80" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent"
-       id="liquidSpecular"
-       y2="76"
-       x2="0"
-       y1="128"
-       x1="0" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="WhiteTransparent">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop7" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop9" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective3208"
-       inkscape:persp3d-origin="64 : 42.666667 : 1"
-       inkscape:vp_z="128 : 64 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 64 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3354"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
     <filter
        color-interpolation-filters="sRGB"
        id="filter6017-3-7">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="0.80546496"
-         id="feGaussianBlur6019-9-6" />
+         id="feGaussianBlur6019-9-28" />
     </filter>
     <filter
        color-interpolation-filters="sRGB"
-       id="filter6031-0-4">
+       id="filter6031-0-56">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="3.4903482"
-         id="feGaussianBlur6033-8-3" />
+         id="feGaussianBlur6033-8-49" />
     </filter>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5785-8-3"
-       id="linearGradient9175-3-0"
-       y2="40"
-       x2="60"
-       y1="20"
-       x1="82.118591" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient5785-8-3">
-      <stop
-         offset="0"
-         style="stop-color:#c0cdf9;stop-opacity:1"
-         id="stop5787-7-0" />
-      <stop
-         offset="1"
-         style="stop-color:#07092d;stop-opacity:0.28804347"
-         id="stop5789-3-9" />
-    </linearGradient>
     <clipPath
-       id="clipPath9086-1-2">
+       id="clipPath9086-1-5">
       <use
-         xlink:href="#outline1"
+         xlink:href="#outline1-2"
          height="300"
          width="400"
          y="0"
          x="0"
          style="opacity:0.25;fill:#ffffff;fill-opacity:1"
-         id="use9088-0-5"
+         id="use9088-0-9"
          transform="translate(1.0095461e-6,0)" />
     </clipPath>
     <filter
        color-interpolation-filters="sRGB"
-       id="filter8490-0-4">
+       id="filter8490-0-0">
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="2.4163949"
          id="feGaussianBlur8492-5-0" />
     </filter>
     <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient5785-8-3"
-       id="linearGradient3370"
-       y2="40"
-       x2="60"
-       y1="20"
-       x1="82.118591" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3372">
-      <stop
-         offset="0"
-         style="stop-color:#c0cdf9;stop-opacity:1"
-         id="stop3374" />
-      <stop
-         offset="1"
-         style="stop-color:#07092d;stop-opacity:0.28804347"
-         id="stop3376" />
-    </linearGradient>
-    <linearGradient
        gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent-3-9"
-       id="shinySpecular-0-5"
+       xlink:href="#WhiteTransparent-3-90"
+       id="shinySpecular-0-4"
        y2="60"
        x2="58"
        y1="35"
        x1="33" />
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       id="WhiteTransparent-3-9">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop7606-1-4" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop7608-8-6" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#WhiteTransparent-3-9"
-       id="IcecapTip-0-9"
+       xlink:href="#WhiteTransparent-3-90"
+       id="IcecapTip-0-3"
        y2="50"
        x2="90"
        y1="20"
        x1="60" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3383">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3385" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3387" />
-    </linearGradient>
     <radialGradient
        gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8568-7-2"
-       id="radialGradient9177-1-2"
+       xlink:href="#WhiteTransparent-3-90"
+       id="radialGradient9177-1-7"
        fy="250.89737"
        fx="116.31038"
        r="30.599579"
        cy="250.89737"
        cx="116.31038" />
-    <linearGradient
-       id="linearGradient8568-7-2">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8570-9-4" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8572-1-7" />
-    </linearGradient>
     <radialGradient
        gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8568-7-2"
-       id="radialGradient8574-0-7"
+       xlink:href="#WhiteTransparent-3-90"
+       id="radialGradient8574-0-1"
        fy="251.99396"
        fx="132.44434"
        r="30.599579"
        cy="251.99396"
        cx="132.44434" />
-    <linearGradient
-       id="linearGradient3394">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3396" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3398" />
-    </linearGradient>
     <filter
        color-interpolation-filters="sRGB"
-       id="filter8732-3-5"
+       id="filter8732-3-8"
        x="-0.078079157"
        width="1.1561583"
        y="-0.11422065"
@@ -869,50 +226,28 @@
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="1.9579068"
-         id="feGaussianBlur8734-5-4" />
+         id="feGaussianBlur8734-5-0" />
     </filter>
     <radialGradient
        gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8738-4-1"
-       id="radialGradient8744-9-8"
+       xlink:href="#WhiteTransparent-3-90"
+       id="radialGradient8744-9-7"
        fy="168.5"
        fx="210.25"
        r="34.25"
        cy="168.5"
        cx="210.25" />
-    <linearGradient
-       id="linearGradient8738-4-1">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8740-8-2" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8742-4-8" />
-    </linearGradient>
     <radialGradient
        gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8738-4-1"
-       id="radialGradient8768-6-9"
+       xlink:href="#WhiteTransparent-3-90"
+       id="radialGradient8768-6-2"
        fy="182.08189"
        fx="217.5"
        r="34.25"
        cy="182.08189"
        cx="217.5" />
-    <linearGradient
-       id="linearGradient3407">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3409" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3411" />
-    </linearGradient>
     <filter
        color-interpolation-filters="sRGB"
        id="filter8764-9-3"
@@ -923,49 +258,27 @@
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="2.1195652"
-         id="feGaussianBlur8766-2-6" />
+         id="feGaussianBlur8766-2-4" />
     </filter>
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0-0"
-       id="linearGradient8912-9-8"
+       xlink:href="#WhiteTransparent-3-90"
+       id="linearGradient8912-9-9"
        y2="201.5"
        x2="231.75"
        y1="195.1875"
        x1="231.625" />
     <linearGradient
-       id="linearGradient8866-0-0">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8868-3-2" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8870-0-1" />
-    </linearGradient>
-    <linearGradient
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0-0"
-       id="linearGradient8910-3-0"
+       xlink:href="#WhiteTransparent-3-90"
+       id="linearGradient8910-3-8"
        y2="200.07138"
        x2="231.37646"
        y1="195.62132"
        x1="231.37646" />
-    <linearGradient
-       id="linearGradient3420">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3422" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3424" />
-    </linearGradient>
     <filter
        color-interpolation-filters="sRGB"
-       id="filter8906-3-5"
+       id="filter8906-3-4"
        x="-0.085441329"
        width="1.1708827"
        y="-0.27823201"
@@ -973,32 +286,21 @@
       <feGaussianBlur
          inkscape:collect="always"
          stdDeviation="0.56515877"
-         id="feGaussianBlur8908-7-1" />
+         id="feGaussianBlur8908-7-88" />
     </filter>
     <radialGradient
        gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8916-4-0"
-       id="radialGradient8922-9-1"
+       xlink:href="#WhiteTransparent-3-90"
+       id="radialGradient8922-9-3"
        fy="204.83229"
        fx="228.21875"
        r="14.09375"
        cy="204.83229"
        cx="228.21875" />
-    <linearGradient
-       id="linearGradient8916-4-0">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop8918-9-8" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop8920-9-5" />
-    </linearGradient>
     <filter
        color-interpolation-filters="sRGB"
-       id="filter8980-1-0"
+       id="filter8980-1-63"
        x="-0.069862768"
        width="1.1397254"
        y="-0.47285891"
@@ -1010,182 +312,69 @@
     </filter>
     <linearGradient
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0-0"
-       id="linearGradient8990-4-4"
+       xlink:href="#WhiteTransparent-3-90"
+       id="linearGradient8990-4-8"
        y2="201.5"
        x2="231.75"
        y1="195.1875"
        x1="231.625" />
     <linearGradient
-       id="linearGradient3435">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3437" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3439" />
-    </linearGradient>
-    <linearGradient
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8866-0-0"
-       id="linearGradient8992-2-6"
+       xlink:href="#WhiteTransparent-3-90"
+       id="linearGradient8992-2-5"
        y2="200.07138"
        x2="231.37646"
        y1="195.62132"
        x1="231.37646" />
-    <linearGradient
-       id="linearGradient3442">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3444" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0"
-         id="stop3446" />
-    </linearGradient>
-    <filter
-       color-interpolation-filters="sRGB"
-       id="filter3448"
-       x="-0.085441329"
-       width="1.1708827"
-       y="-0.27823201"
-       height="1.556464">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.56515877"
-         id="feGaussianBlur3450" />
-    </filter>
     <radialGradient
        gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
        gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient8916-4-0"
-       id="radialGradient8994-0-2"
+       xlink:href="#WhiteTransparent-3-90"
+       id="radialGradient8994-0-8"
        fy="204.83229"
        fx="228.21875"
        r="14.09375"
        cy="204.83229"
        cx="228.21875" />
-    <linearGradient
-       id="linearGradient3453">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3455" />
-      <stop
-         offset="1"