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

Proposed by su_v on 2014-09-09
Status: Merged
Merged at revision: 13620
Proposed branch: lp:~inkscape.dev/inkscape/osx-packaging-update
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 13496 lines (+6695/-4563)
89 files modified
.bzrignore (+5/-0)
Info.plist.in (+7/-3)
Makefile.am (+351/-57)
configure.ac (+1/-4)
packaging/macosx/README.txt (+31/-0)
packaging/macosx/Resources/alert_fccache.sh (+28/-0)
packaging/macosx/Resources/bin/getdisplay.sh (+0/-9)
packaging/macosx/Resources/bin/gimp-wrapper.sh (+96/-0)
packaging/macosx/Resources/bin/inkscape (+0/-158)
packaging/macosx/Resources/bin/python-wrapper.sh (+78/-0)
packaging/macosx/Resources/etc/fonts/fonts.conf (+9/-5)
packaging/macosx/Resources/etc/gtk-2.0/gtkrc (+20/-0)
packaging/macosx/Resources/openDoc (+7/-13)
packaging/macosx/Resources/script (+13/-46)
packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh (+0/-7)
packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh (+0/-7)
packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc (+0/-547)
packaging/macosx/Resources/xdg_setup.sh (+13/-0)
packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj (+0/-451)
packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj (+12/-12)
packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh (+169/-0)
packaging/macosx/ScriptExec/main.c (+39/-235)
packaging/macosx/create-stock-icon-theme.sh (+165/-0)
packaging/macosx/dmg_background.svg (+1020/-2577)
packaging/macosx/osx-app.sh (+523/-240)
packaging/macosx/osx-build.sh (+315/-174)
packaging/macosx/osx-dmg.sh (+1/-1)
packaging/macosx/ports/devel/inkscape-packaging/Portfile (+124/-0)
packaging/macosx/ports/lang/python25/Portfile (+214/-0)
packaging/macosx/ports/lang/python25/files/_localemodule.c.ed (+2/-0)
packaging/macosx/ports/lang/python25/files/locale.py.ed (+2/-0)
packaging/macosx/ports/lang/python25/files/patch-64bit.diff (+1234/-0)
packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff (+11/-0)
packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff (+18/-0)
packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff (+51/-0)
packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff (+49/-0)
packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff (+16/-0)
packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff (+21/-0)
packaging/macosx/ports/lang/python25/files/patch-configure.diff (+45/-0)
packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff (+12/-0)
packaging/macosx/ports/lang/python25/files/patch-libedit.diff (+132/-0)
packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff (+114/-0)
packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff (+13/-0)
packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff (+11/-0)
packaging/macosx/ports/lang/python25/files/patch-setup.py.diff (+80/-0)
packaging/macosx/ports/lang/python25/files/pyconfig.ed (+2/-0)
packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed (+50/-0)
packaging/macosx/ports/lang/python25/files/python25 (+13/-0)
packaging/macosx/ports/lang/python26/Portfile (+158/-0)
packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff (+18/-0)
packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff (+51/-0)
packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff (+11/-0)
packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff (+11/-0)
packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff (+11/-0)
packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff (+11/-0)
packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff (+31/-0)
packaging/macosx/ports/lang/python26/files/patch-setup.py.diff (+16/-0)
packaging/macosx/ports/lang/python26/files/pyconfig.ed (+2/-0)
packaging/macosx/ports/lang/python26/files/python26 (+12/-0)
packaging/macosx/ports/lang/python26/files/version.plist (+16/-0)
packaging/macosx/ports/python/py-Pillow/Portfile (+74/-0)
packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff (+120/-0)
packaging/macosx/ports/python/py-sk1libs/Portfile (+64/-0)
packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff (+16/-0)
packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff (+26/-0)
packaging/macosx/ports/python/py-uniconvertor/Portfile (+46/-0)
packaging/macosx/ports/python/py25-Pillow/Portfile (+77/-0)
packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff (+14/-0)
packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff (+83/-0)
packaging/macosx/ports/python/py25-lxml/Portfile (+51/-0)
packaging/macosx/ports/python/py25-nose/Portfile (+86/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests24 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests25 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests26 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests27 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests31 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests32 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests33 (+1/-0)
packaging/macosx/ports/python/py25-nose/files/nosetests34 (+1/-0)
packaging/macosx/ports/python/py25-numpy/Portfile (+209/-0)
packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff (+29/-0)
packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff (+11/-0)
packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff (+30/-0)
packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff (+10/-0)
packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff (+34/-0)
packaging/macosx/ports/python/py25-numpy/files/wrapper-template (+143/-0)
packaging/macosx/ports/python/py25-setuptools/Portfile (+58/-0)
src/extension/internal/pdfinput/pdf-input.cpp (+24/-0)
src/path-prefix.h (+17/-17)
To merge this branch: bzr merge lp:~inkscape.dev/inkscape/osx-packaging-update
Reviewer Review Type Date Requested Status
Bryce Harrington code 2014-09-09 Approve on 2014-10-16
Review via email: mp+233846@code.launchpad.net

Description of the change

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).

To post a comment you must log in.
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) wrote :
Download full text (4.6 KiB)

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...

Read more...

review: Approve (code)
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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2014-07-23 05:21:25 +0000
3+++ .bzrignore 2014-10-14 03:02:11 +0000
4@@ -219,3 +219,8 @@
5 Inkscape.creator.user
6 Inkscape.files
7 Inkscape.includes
8+# osxapp (X11)
9+build-osxapp
10+inst-osxapp
11+packaging/macosx/ScriptExec/build
12+packaging/macosx/Inkscape.app
13
14=== modified file 'Info.plist.in'
15--- Info.plist.in 2009-06-12 08:06:35 +0000
16+++ Info.plist.in 2014-10-14 03:02:11 +0000
17@@ -328,9 +328,13 @@
18 <string>Inks</string>
19 <key>CFBundleVersion</key>
20 <string>@VERSION@</string>
21+ <key>CGDisableCoalescedUpdates</key>
22+ <false/>
23+ <key>LSApplicationCategoryType</key>
24+ <string>public.app-category.graphics-design</string>
25+ <key>LSMinimumSystemVersion</key>
26+ <string>10.5</string>
27 <key>NSHumanReadableCopyright</key>
28- <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string>
29- <key>LSMinimumSystemVersion</key>
30- <string>10.3</string>
31+ <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string>
32 </dict>
33 </plist>
34
35=== modified file 'Makefile.am'
36--- Makefile.am 2014-06-18 21:40:20 +0000
37+++ Makefile.am 2014-10-14 03:02:11 +0000
38@@ -102,71 +102,365 @@
39 cxxtest/cxxtest/X11Gui.h \
40 cxxtest/cxxtest/YesNoRunner.h \
41 packaging/autopackage/default.apspec.in \
42- packaging/macosx/dmg_background.png \
43- packaging/macosx/inkscape.ds_store \
44- packaging/macosx/osx-app.sh \
45- packaging/macosx/osx-dmg.sh \
46- packaging/macosx/osx-build.sh \
47- packaging/macosx/Resources/MenuBar.nib/classes.nib \
48- packaging/macosx/Resources/MenuBar.nib/info.nib \
49- packaging/macosx/Resources/MenuBar.nib/objects.xib \
50+ packaging/macosx/README.txt \
51+ packaging/macosx/Resources/Inkscape.icns \
52+ packaging/macosx/Resources/MenuBar.nib/classes.nib \
53+ packaging/macosx/Resources/MenuBar.nib/info.nib \
54+ packaging/macosx/Resources/MenuBar.nib/objects.xib \
55+ packaging/macosx/Resources/ProgressWindow.nib/classes.nib \
56+ packaging/macosx/Resources/ProgressWindow.nib/info.nib \
57+ packaging/macosx/Resources/ProgressWindow.nib/objects.xib \
58+ packaging/macosx/Resources/alert_fccache.sh \
59 packaging/macosx/Resources/application-gimp-gradient.icns \
60- packaging/macosx/Resources/application-vnd.ms.xaml.icns \
61- packaging/macosx/Resources/image-vnd.sk1.icns \
62+ packaging/macosx/Resources/application-illustrator-svg.icns \
63 packaging/macosx/Resources/application-illustrator.icns \
64+ packaging/macosx/Resources/application-pdf.icns \
65+ packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \
66+ packaging/macosx/Resources/application-vnd.corel-draw-template.icns \
67 packaging/macosx/Resources/application-vnd.corel-draw.icns \
68- packaging/macosx/Resources/image-x-eps.icns \
69- packaging/macosx/Resources/Inkscape.icns \
70- packaging/macosx/Resources/image-vnd.dxf.icns \
71+ packaging/macosx/Resources/application-vnd.ms.xaml.icns \
72+ packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \
73+ packaging/macosx/Resources/bin/gimp-wrapper.sh \
74+ packaging/macosx/Resources/bin/inkscape \
75+ packaging/macosx/Resources/bin/python-wrapper.sh \
76+ packaging/macosx/Resources/etc/fonts/fonts.conf \
77+ packaging/macosx/Resources/etc/gtk-2.0/gtkrc \
78 packaging/macosx/Resources/image-svg+xml-compressed.icns \
79- packaging/macosx/Resources/application-pdf.icns \
80- packaging/macosx/Resources/application-vnd.corel-draw-template.icns \
81- packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \
82 packaging/macosx/Resources/image-svg+xml.icns \
83+ packaging/macosx/Resources/image-vnd.dxf.icns \
84+ packaging/macosx/Resources/image-vnd.sk1.icns \
85 packaging/macosx/Resources/image-vnd.windows-metafile.icns \
86+ packaging/macosx/Resources/image-x-eps.icns \
87 packaging/macosx/Resources/image-x-ps.icns \
88- packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \
89- packaging/macosx/Resources/application-illustrator-svg.icns \
90- packaging/macosx/Resources/openDoc \
91- packaging/macosx/Resources/script \
92- packaging/macosx/Resources/ProgressWindow.nib/classes.nib \
93- packaging/macosx/Resources/ProgressWindow.nib/info.nib \
94- packaging/macosx/Resources/ProgressWindow.nib/objects.xib \
95- packaging/macosx/Resources/bin/getdisplay.sh \
96- packaging/macosx/Resources/bin/inkscape \
97- packaging/macosx/Resources/etc/fonts/fonts.conf \
98- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \
99- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \
100- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \
101- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \
102- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png \
103- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \
104- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \
105- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh \
106- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png \
107- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png \
108- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png \
109- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png \
110- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh \
111- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png \
112- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png \
113- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png \
114- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png \
115- packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \
116- packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \
117- packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \
118- packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \
119- packaging/macosx/ScriptExec/Info.plist \
120- packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \
121- packaging/macosx/ScriptExec/main.c \
122- packaging/macosx/ScriptExec/openDoc \
123- packaging/macosx/ScriptExec/script \
124- packaging/macosx/ScriptExec/version.plist \
125- packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \
126- packaging/macosx/ScriptExec/MenuBar.nib/info.nib \
127- packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \
128- packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj \
129+ packaging/macosx/Resources/openDoc \
130+ packaging/macosx/Resources/script \
131+ packaging/macosx/Resources/xdg_setup.sh \
132+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png \
133+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png \
134+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png \
135+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png \
136+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png \
137+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png \
138+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png \
139+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png \
140+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png \
141+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png \
142+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png \
143+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png \
144+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png \
145+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png \
146+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png \
147+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png \
148+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png \
149+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png \
150+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png \
151+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png \
152+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png \
153+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png \
154+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png \
155+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png \
156+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png \
157+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png \
158+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png \
159+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png \
160+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png \
161+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png \
162+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png \
163+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png \
164+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png \
165+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png \
166+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png \
167+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png \
168+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png \
169+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png \
170+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png \
171+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png \
172+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png \
173+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png \
174+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png \
175+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png \
176+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png \
177+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png \
178+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png \
179+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png \
180+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png \
181+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png \
182+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png \
183+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png \
184+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png \
185+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png \
186+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png \
187+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png \
188+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png \
189+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png \
190+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png \
191+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png \
192+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png \
193+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png \
194+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png \
195+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png \
196+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png \
197+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png \
198+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png \
199+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png \
200+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png \
201+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png \
202+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png \
203+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png \
204+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png \
205+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png \
206+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png \
207+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png \
208+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png \
209+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png \
210+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png \
211+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png \
212+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png \
213+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png \
214+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png \
215+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png \
216+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png \
217+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png \
218+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png \
219+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png \
220+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png \
221+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png \
222+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png \
223+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png \
224+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png \
225+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png \
226+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png \
227+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png \
228+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png \
229+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png \
230+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png \
231+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png \
232+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png \
233+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png \
234+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png \
235+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png \
236+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png \
237+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png \
238+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png \
239+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png \
240+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png \
241+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png \
242+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png \
243+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png \
244+ packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png \
245+ packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png \
246+ packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png \
247+ packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png \
248+ packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png \
249+ packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png \
250+ packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png \
251+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png \
252+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png \
253+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png \
254+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png \
255+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png \
256+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png \
257+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png \
258+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png \
259+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png \
260+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png \
261+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png \
262+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png \
263+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png \
264+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png \
265+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png \
266+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png \
267+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png \
268+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png \
269+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png \
270+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png \
271+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png \
272+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png \
273+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png \
274+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png \
275+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png \
276+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png \
277+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png \
278+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png \
279+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png \
280+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png \
281+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png \
282+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png \
283+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png \
284+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png \
285+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png \
286+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png \
287+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png \
288+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png \
289+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png \
290+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png \
291+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png \
292+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png \
293+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png \
294+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png \
295+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png \
296+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png \
297+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png \
298+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png \
299+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png \
300+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png \
301+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png \
302+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png \
303+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png \
304+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png \
305+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png \
306+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png \
307+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png \
308+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png \
309+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png \
310+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png \
311+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png \
312+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png \
313+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png \
314+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png \
315+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png \
316+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png \
317+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png \
318+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png \
319+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png \
320+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png \
321+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png \
322+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png \
323+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png \
324+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png \
325+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png \
326+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png \
327+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png \
328+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png \
329+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png \
330+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png \
331+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png \
332+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png \
333+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png \
334+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png \
335+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png \
336+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png \
337+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png \
338+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png \
339+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png \
340+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png \
341+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png \
342+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png \
343+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png \
344+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png \
345+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png \
346+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png \
347+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png \
348+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png \
349+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png \
350+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png \
351+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png \
352+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png \
353+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png \
354+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png \
355+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png \
356+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png \
357+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png \
358+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png \
359+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png \
360+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png \
361+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png \
362+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png \
363+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png \
364+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png \
365+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png \
366+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png \
367+ packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png \
368+ packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png \
369+ packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png \
370+ packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png \
371+ packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png \
372+ packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png \
373+ packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png \
374+ packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png \
375+ packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \
376+ packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \
377+ packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \
378+ packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \
379+ packaging/macosx/ScriptExec/Info.plist \
380+ packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \
381+ packaging/macosx/ScriptExec/MenuBar.nib/info.nib \
382+ packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \
383 packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \
384+ packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \
385+ packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh \
386+ packaging/macosx/ScriptExec/main.c \
387+ packaging/macosx/ScriptExec/openDoc \
388+ packaging/macosx/ScriptExec/script \
389+ packaging/macosx/ScriptExec/version.plist \
390+ packaging/macosx/create-stock-icon-theme.sh \
391+ packaging/macosx/dmg_background.png \
392+ packaging/macosx/dmg_background.svg \
393+ packaging/macosx/dmg_set_style.scpt \
394+ packaging/macosx/inkscape.ds_store \
395+ packaging/macosx/osx-app.sh \
396+ packaging/macosx/osx-build.sh \
397+ packaging/macosx/osx-dmg.sh \
398+ packaging/macosx/ports/devel/inkscape-packaging/Portfile \
399+ packaging/macosx/ports/lang/python25/Portfile \
400+ packaging/macosx/ports/lang/python25/files/_localemodule.c.ed \
401+ packaging/macosx/ports/lang/python25/files/locale.py.ed \
402+ packaging/macosx/ports/lang/python25/files/patch-64bit.diff \
403+ packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff \
404+ packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff \
405+ packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff \
406+ packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff \
407+ packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff \
408+ packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff \
409+ packaging/macosx/ports/lang/python25/files/patch-configure.diff \
410+ packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff \
411+ packaging/macosx/ports/lang/python25/files/patch-libedit.diff \
412+ packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff \
413+ packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff \
414+ packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff \
415+ packaging/macosx/ports/lang/python25/files/patch-setup.py.diff \
416+ packaging/macosx/ports/lang/python25/files/pyconfig.ed \
417+ packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed \
418+ packaging/macosx/ports/lang/python25/files/python25 \
419+ packaging/macosx/ports/lang/python26/Portfile \
420+ packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff \
421+ packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff \
422+ packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff \
423+ packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff \
424+ packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff \
425+ packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff \
426+ packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff \
427+ packaging/macosx/ports/lang/python26/files/patch-setup.py.diff \
428+ packaging/macosx/ports/lang/python26/files/pyconfig.ed \
429+ packaging/macosx/ports/lang/python26/files/python26 \
430+ packaging/macosx/ports/lang/python26/files/version.plist \
431+ packaging/macosx/ports/python/py-Pillow/Portfile \
432+ packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff \
433+ packaging/macosx/ports/python/py-sk1libs/Portfile \
434+ packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff \
435+ packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff \
436+ packaging/macosx/ports/python/py-uniconvertor/Portfile \
437+ packaging/macosx/ports/python/py25-Pillow/Portfile \
438+ packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff \
439+ packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff \
440+ packaging/macosx/ports/python/py25-lxml/Portfile \
441+ packaging/macosx/ports/python/py25-nose/Portfile \
442+ packaging/macosx/ports/python/py25-nose/files/nosetests24 \
443+ packaging/macosx/ports/python/py25-nose/files/nosetests25 \
444+ packaging/macosx/ports/python/py25-nose/files/nosetests26 \
445+ packaging/macosx/ports/python/py25-nose/files/nosetests27 \
446+ packaging/macosx/ports/python/py25-nose/files/nosetests31 \
447+ packaging/macosx/ports/python/py25-nose/files/nosetests32 \
448+ packaging/macosx/ports/python/py25-nose/files/nosetests33 \
449+ packaging/macosx/ports/python/py25-nose/files/nosetests34 \
450+ packaging/macosx/ports/python/py25-numpy/Portfile \
451+ packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff \
452+ packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff \
453+ packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff \
454+ packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff \
455+ packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff \
456+ packaging/macosx/ports/python/py25-numpy/files/wrapper-template \
457+ packaging/macosx/ports/python/py25-setuptools/Portfile \
458 packaging/win32/inkscape.nsi \
459 packaging/win32/inkscape.nsi.uninstall \
460 packaging/win32/languages/Breton.nsh \
461
462=== modified file 'configure.ac'
463--- configure.ac 2014-09-02 04:05:35 +0000
464+++ configure.ac 2014-10-14 03:02:11 +0000
465@@ -391,10 +391,7 @@
466 have_lcms2=no
467 else
468 # Have to test LittleCms presence
469- if test "x${platform_osx}" != "xyes"; then
470- # lcms 2.2 & 2.3 have problems on OSX
471- PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no")
472- fi
473+ PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no")
474
475 if test "x${have_lcms2}" = "xyes"; then
476 LIBS="$LIBS $LCMS2_LIBS"
477
478=== added file 'packaging/macosx/README.txt'
479--- packaging/macosx/README.txt 1970-01-01 00:00:00 +0000
480+++ packaging/macosx/README.txt 2014-10-14 03:02:11 +0000
481@@ -0,0 +1,31 @@
482+Quick instructions:
483+===================
484+
485+1) install MacPorts from source into $MP_PREFIX (e.g. "/opt/local-x11")
486+ <https://www.macports.org/install.php>
487+
488+2) add MacPorts to your PATH environement variable, for example:
489+
490+$ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH"
491+
492+3) add 'ports/' subdirectory as local portfile repository:
493+
494+$ sudo sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macports/sources.conf"
495+
496+4) index the new local portfile repository:
497+
498+$ (cd ports && portindex)
499+
500+5) add default variants for x11-based package to MacPorts' global variants:
501+
502+$ sudo bash -c "echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> \"$MP_PREFIX/etc/macports/variants.conf\""
503+
504+6) install required dependencies:
505+
506+$ sudo port install inkscape-packaging
507+
508+7) compile inkscape, create app bundle and DMG:
509+
510+$ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d
511+
512+8) upload the DMG.
513
514=== added directory 'packaging/macosx/Resources-extras'
515=== added directory 'packaging/macosx/Resources-extras/src'
516=== added directory 'packaging/macosx/Resources-extras/src/icons'
517=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons'
518=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/16'
519=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png'
520Binary 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
521=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png'
522Binary 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
523=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png'
524Binary 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
525=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png'
526Binary 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
527=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png'
528Binary 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
529=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png'
530Binary 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
531=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png'
532Binary 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
533=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png'
534Binary 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
535=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png'
536Binary 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
537=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png'
538Binary 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
539=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png'
540Binary 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
541=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png'
542Binary 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
543=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png'
544Binary 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
545=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png'
546Binary 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
547=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png'
548Binary 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
549=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png'
550Binary 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
551=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png'
552Binary 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
553=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png'
554Binary 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
555=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png'
556Binary 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
557=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png'
558Binary 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
559=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png'
560Binary 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
561=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png'
562Binary 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
563=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png'
564Binary 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
565=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png'
566Binary 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
567=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png'
568Binary 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
569=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png'
570Binary 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
571=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png'
572Binary 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
573=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png'
574Binary 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
575=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png'
576Binary 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
577=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png'
578Binary 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
579=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png'
580Binary 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
581=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png'
582Binary 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
583=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png'
584Binary 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
585=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png'
586Binary 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
587=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png'
588Binary 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
589=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png'
590Binary 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
591=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png'
592Binary 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
593=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png'
594Binary 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
595=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png'
596Binary 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
597=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png'
598Binary 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
599=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png'
600Binary 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
601=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png'
602Binary 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
603=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png'
604Binary 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
605=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png'
606Binary 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
607=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png'
608Binary 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
609=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png'
610Binary 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
611=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png'
612Binary 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
613=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png'
614Binary 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
615=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png'
616Binary 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
617=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png'
618Binary 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
619=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png'
620Binary 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
621=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png'
622Binary 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
623=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png'
624Binary 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
625=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png'
626Binary 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
627=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png'
628Binary 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
629=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png'
630Binary 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
631=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png'
632Binary 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
633=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png'
634Binary 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
635=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png'
636Binary 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
637=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png'
638Binary 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
639=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png'
640Binary 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
641=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png'
642Binary 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
643=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png'
644Binary 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
645=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png'
646Binary 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
647=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png'
648Binary 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
649=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png'
650Binary 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
651=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png'
652Binary 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
653=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png'
654Binary 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
655=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png'
656Binary 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
657=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png'
658Binary 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
659=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png'
660Binary 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
661=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png'
662Binary 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
663=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png'
664Binary 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
665=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png'
666Binary 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
667=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png'
668Binary 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
669=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png'
670Binary 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
671=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png'
672Binary 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
673=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png'
674Binary 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
675=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png'
676Binary 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
677=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png'
678Binary 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
679=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png'
680Binary 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
681=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png'
682Binary 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
683=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png'
684Binary 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
685=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png'
686Binary 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
687=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png'
688Binary 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
689=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png'
690Binary 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
691=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png'
692Binary 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
693=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png'
694Binary 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
695=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png'
696Binary 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
697=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png'
698Binary 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
699=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png'
700Binary 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
701=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png'
702Binary 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
703=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png'
704Binary 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
705=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png'
706Binary 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
707=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png'
708Binary 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
709=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png'
710Binary 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
711=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png'
712Binary 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
713=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png'
714Binary 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
715=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png'
716Binary 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
717=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png'
718Binary 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
719=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png'
720Binary 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
721=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png'
722Binary 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
723=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png'
724Binary 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
725=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png'
726Binary 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
727=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png'
728Binary 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
729=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png'
730Binary 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
731=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png'
732Binary 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
733=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png'
734Binary 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
735=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png'
736Binary 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
737=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png'
738Binary 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
739=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png'
740Binary 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
741=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png'
742Binary 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
743=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png'
744Binary 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
745=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/20'
746=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png'
747Binary 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
748=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png'
749Binary 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
750=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png'
751Binary 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
752=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png'
753Binary 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
754=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png'
755Binary 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
756=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png'
757Binary 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
758=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/24'
759=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png'
760Binary 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
761=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png'
762Binary 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
763=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png'
764Binary 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
765=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png'
766Binary 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
767=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png'
768Binary 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
769=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png'
770Binary 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
771=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png'
772Binary 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
773=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png'
774Binary 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
775=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png'
776Binary 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
777=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png'
778Binary 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
779=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png'
780Binary 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
781=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png'
782Binary 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
783=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png'
784Binary 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
785=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png'
786Binary 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
787=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png'
788Binary 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
789=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png'
790Binary 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
791=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png'
792Binary 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
793=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png'
794Binary 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
795=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png'
796Binary 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
797=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png'
798Binary 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
799=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png'
800Binary 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
801=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png'
802Binary 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
803=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png'
804Binary 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
805=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png'
806Binary 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
807=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png'
808Binary 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
809=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png'
810Binary 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
811=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png'
812Binary 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
813=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png'
814Binary 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
815=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png'
816Binary 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
817=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png'
818Binary 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
819=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png'
820Binary 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
821=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png'
822Binary 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
823=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png'
824Binary 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
825=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png'
826Binary 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
827=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png'
828Binary 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
829=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png'
830Binary 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
831=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png'
832Binary 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
833=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png'
834Binary 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
835=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png'
836Binary 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
837=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png'
838Binary 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
839=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png'
840Binary 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
841=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png'
842Binary 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
843=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png'
844Binary 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
845=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png'
846Binary 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
847=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png'
848Binary 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
849=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png'
850Binary 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
851=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png'
852Binary 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
853=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png'
854Binary 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
855=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png'
856Binary 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
857=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png'
858Binary 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
859=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png'
860Binary 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
861=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png'
862Binary 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
863=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png'
864Binary 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
865=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png'
866Binary 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
867=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png'
868Binary 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
869=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png'
870Binary 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
871=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png'
872Binary 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
873=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png'
874Binary 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
875=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png'
876Binary 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
877=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png'
878Binary 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
879=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png'
880Binary 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
881=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png'
882Binary 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
883=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png'
884Binary 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
885=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png'
886Binary 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
887=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png'
888Binary 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
889=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png'
890Binary 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
891=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png'
892Binary 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
893=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png'
894Binary 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
895=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png'
896Binary 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
897=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png'
898Binary 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
899=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png'
900Binary 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
901=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png'
902Binary 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
903=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png'
904Binary 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
905=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png'
906Binary 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
907=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png'
908Binary 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
909=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png'
910Binary 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
911=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png'
912Binary 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
913=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png'
914Binary 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
915=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png'
916Binary 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
917=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png'
918Binary 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
919=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png'
920Binary 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
921=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png'
922Binary 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
923=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png'
924Binary 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
925=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png'
926Binary 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
927=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png'
928Binary 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
929=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png'
930Binary 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
931=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png'
932Binary 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
933=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png'
934Binary 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
935=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png'
936Binary 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
937=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png'
938Binary 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
939=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png'
940Binary 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
941=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png'
942Binary 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
943=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png'
944Binary 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
945=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png'
946Binary 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
947=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png'
948Binary 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
949=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png'
950Binary 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
951=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png'
952Binary 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
953=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png'
954Binary 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
955=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png'
956Binary 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
957=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png'
958Binary 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
959=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png'
960Binary 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
961=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png'
962Binary 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
963=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png'
964Binary 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
965=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png'
966Binary 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
967=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png'
968Binary 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
969=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png'
970Binary 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
971=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png'
972Binary 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
973=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png'
974Binary 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
975=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png'
976Binary 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
977=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png'
978Binary 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
979=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png'
980Binary 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
981=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png'
982Binary 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
983=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png'
984Binary 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
985=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png'
986Binary 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
987=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png'
988Binary 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
989=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png'
990Binary 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
991=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png'
992Binary 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
993=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/32'
994=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png'
995Binary 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
996=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png'
997Binary 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
998=== added directory 'packaging/macosx/Resources-extras/src/icons/stock-icons/48'
999=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png'
1000Binary 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
1001=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png'
1002Binary 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
1003=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png'
1004Binary 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
1005=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png'
1006Binary 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
1007=== added file 'packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png'
1008Binary 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
1009=== added file 'packaging/macosx/Resources/alert_fccache.sh'
1010--- packaging/macosx/Resources/alert_fccache.sh 1970-01-01 00:00:00 +0000
1011+++ packaging/macosx/Resources/alert_fccache.sh 2014-10-14 03:02:11 +0000
1012@@ -0,0 +1,28 @@
1013+#!/bin/bash
1014+
1015+ALERT_SCRIPT="$(cat << EOM
1016+try
1017+ set parent_path to "$CWD"
1018+ set icon_path to POSIX path of (parent_path & "/Inkscape.icns")
1019+ set front_app to ((path to frontmost application) as text)
1020+ tell application front_app
1021+ display dialog "While Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application.
1022+
1023+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
1024+ activate
1025+ end tell
1026+end try
1027+EOM)"
1028+
1029+if [ -z "$INK_CACHE_DIR" ]; then
1030+ export INK_CACHE_DIR="${HOME}/.cache/inkscape"
1031+ mkdir -p "$INK_CACHE_DIR"
1032+ [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR"
1033+fi
1034+
1035+# Warn the user about time-consuming generation of fontconfig caches.
1036+if [ ! -f "${INK_CACHE_DIR}/.fccache-new" ]; then
1037+ alert_result=$(osascript -e "$ALERT_SCRIPT")
1038+ mkdir -p "$INK_CACHE_DIR"
1039+ touch "${INK_CACHE_DIR}/.fccache-new"
1040+fi
1041
1042=== removed file 'packaging/macosx/Resources/bin/getdisplay.sh'
1043--- packaging/macosx/Resources/bin/getdisplay.sh 2006-01-16 02:36:01 +0000
1044+++ packaging/macosx/Resources/bin/getdisplay.sh 1970-01-01 00:00:00 +0000
1045@@ -1,9 +0,0 @@
1046-#!/bin/sh
1047-#
1048-# Author: Aaron Voisine <aaron@voisine.org>
1049-
1050-if [ "$DISPLAY"x == "x" ]; then
1051- echo :0 > /tmp/display.$UID
1052-else
1053- echo $DISPLAY > /tmp/display.$UID
1054-fi
1055
1056=== added file 'packaging/macosx/Resources/bin/gimp-wrapper.sh'
1057--- packaging/macosx/Resources/bin/gimp-wrapper.sh 1970-01-01 00:00:00 +0000
1058+++ packaging/macosx/Resources/bin/gimp-wrapper.sh 2014-10-14 03:02:11 +0000
1059@@ -0,0 +1,96 @@
1060+#!/bin/bash
1061+#
1062+# simple gimp wrapper script for Inkscape.app
1063+#
1064+
1065+#_DEBUG=true
1066+
1067+# --- defaults for GIMP.app
1068+
1069+app_id="org.gnome.gimp"
1070+app_exec_default="GIMP"
1071+
1072+
1073+# --- defaults for gimp in $PATH
1074+
1075+# path for local gimp install
1076+PATH_local="/opt/local/bin"
1077+# launch a specific gimp version? (e.g. gimp-2.9)
1078+gimp_name="gimp"
1079+
1080+
1081+# --- unset environment inherited from Inkscape.app
1082+
1083+unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME
1084+unset XDG_CONFIG_DIRS XDG_DATA_DIRS
1085+unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE GTK2_RC_FILES
1086+unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR
1087+unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR
1088+unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS
1089+unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH
1090+unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR
1091+unset ASPELL_CONF
1092+unset POPPLER_DATADIR
1093+unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH
1094+unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH
1095+unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS
1096+
1097+
1098+# --- detect installed GIMP.app
1099+
1100+unset GIMP_APP
1101+
1102+APPLESCRIPT1="$(cat << EOM
1103+try
1104+ tell application "Finder"
1105+ set theApp to application file id "$app_id" as string
1106+ set theApp_path to POSIX path of theApp as string
1107+ return theApp_path
1108+ end tell
1109+end try
1110+EOM)"
1111+
1112+GIMP_APP="$(osascript -e "$APPLESCRIPT1")"
1113+
1114+
1115+# --- pass command line arguments to GIMP.app or gimp or exit
1116+
1117+if [ ! -z "$GIMP_APP" ]; then
1118+
1119+ app_exec="$(defaults read "${GIMP_APP}/Contents/Info.plist" CFBundleExecutable)"
1120+ [[ $? -ne 0 ]] && app_exec="$app_exec_default"
1121+
1122+ GIMP_APP_EXEC="${GIMP_APP}/Contents/MacOS/${app_exec}"
1123+
1124+ [ $_DEBUG ] && echo "GIMP.app found as: $GIMP_APP" 1>&2
1125+ [ $_DEBUG ] && echo "Command line arguments: $@" 1>&2
1126+ if [ $# -eq 1 ]; then
1127+ [ $_DEBUG ] && echo "open -a $GIMP_APP $@" 1>&2
1128+ open -a "$GIMP_APP" "$@"
1129+ else
1130+ [ $_DEBUG ] && echo "exec $GIMP_APP_EXEC $@" 1>&2
1131+ exec "$GIMP_APP_EXEC" "$@"
1132+ fi
1133+
1134+else # --- test for gimp installed in PATH
1135+
1136+ # remove CWD from path (we don't want to recursively call this script)
1137+ [ $_DEBUG ] && echo "orig PATH: $PATH" 1>&2
1138+ PATH_cleaned="$(echo $PATH | sed 's|'"$(cd "$(dirname "$0")" && pwd)"':||g')" || exit 1
1139+ [ $_DEBUG ] && echo "clean PATH: $PATH_cleaned" 1>&2
1140+ export PATH="$PATH_local:$PATH_cleaned"
1141+ [ $_DEBUG ] && echo "final PATH: $PATH" 1>&2
1142+
1143+ type -p "$gimp_name"
1144+
1145+ if [ $? -eq 0 ]; then
1146+ [ $_DEBUG ] && echo "gimp found in \$PATH: $PATH" 1>&2
1147+ [ $_DEBUG ] && echo "Command line arguments: $@" 1>&2
1148+ exec "$gimp_name" -n "$@"
1149+ else
1150+ echo "Giving up - couldn't find GIMP.app nor gimp." 1>&2
1151+ fi
1152+
1153+fi
1154+
1155+# eof
1156
1157=== added file 'packaging/macosx/Resources/bin/inkscape'
1158--- packaging/macosx/Resources/bin/inkscape 1970-01-01 00:00:00 +0000
1159+++ packaging/macosx/Resources/bin/inkscape 2014-10-14 03:02:11 +0000
1160@@ -0,0 +1,166 @@
1161+#!/bin/sh
1162+#
1163+# Author: Aaron Voisine <aaron@voisine.org>
1164+# Inkscape Modifications:
1165+# Michael Wybrow <mjwybrow@users.sourceforge.net>
1166+# Jean-Olivier Irisson <jo.irisson@gmail.com>
1167+# ~suv <suv-sf@users.sourceforge.net>
1168+#
1169+
1170+[ -n "$INK_DEBUG_LAUNCHER" ] && set -x
1171+
1172+CWD="$(cd "$(dirname "$0")" && pwd)"
1173+# e.g. /Applications/Inkscape.app/Contents/Resources/bin
1174+TOP="$(dirname "$CWD")"
1175+# e.g. /Applications/Inkscape.app/Contents/Resources
1176+BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')"
1177+# e.g. /Applications/Inkscape.app
1178+
1179+# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative
1180+# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
1181+# of working directory is required:
1182+#
1183+# Due to changes after 0.48, we have change working directory in the script named 'inkscape':
1184+# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
1185+# fail (for python-based extensions, inkscape changes the working directory to the
1186+# script's directory, and inkscape launched by python script thus can't find resources
1187+# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory).
1188+cd "$BASE" || exit 1
1189+
1190+# don't prepend to $PATH in recursive calls:
1191+if [ -z "$INK_PATH_ORIG" ]; then
1192+
1193+ # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway.
1194+ # the 'classic' PATH additions:
1195+ # /usr/local/bin which, though standard, doesn't seem to be in the PATH
1196+ # Fink
1197+ # MacPorts (former DarwinPorts)
1198+ # LaTeX distribution for Mac OS X
1199+ PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
1200+
1201+ # Put /usr/bin at beginning of path so we make sure we use Apple's python
1202+ # over one that may be installed be Macports, Fink or some other means.
1203+ PATH_PYTHON="/usr/bin"
1204+
1205+ # Put $TOP/bin at beginning of path so we make sure that recursive calls
1206+ # to inkscape don't pull in other inkscape binaries with different setup.
1207+ # Also allows to override system python with custom wrapper script, and
1208+ # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export.
1209+ PATH_pkgbin="$TOP/bin"
1210+
1211+ # save orig, new PATH
1212+ export INK_PATH_ORIG="$PATH"
1213+ export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG"
1214+fi
1215+
1216+# Setup PYTHONPATH to use python modules shipped with Inkscape
1217+OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)"
1218+build_arch=__build_arch__
1219+if [ $OSXMINORNO -gt "5" ]; then
1220+ if [ $OSXMINORNO -eq "6" ]; then
1221+ export VERSIONER_PYTHON_VERSION=2.6
1222+ else # if [ $OSXMINORNO -ge "7" ]; then
1223+ export VERSIONER_PYTHON_VERSION=2.7
1224+ fi
1225+ if [ $build_arch = "i386" ]; then
1226+ export VERSIONER_PYTHON_PREFER_32_BIT=yes
1227+ else # build & runtime arch x86_64
1228+ export VERSIONER_PYTHON_PREFER_32_BIT=no
1229+ fi
1230+fi
1231+PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)"
1232+export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/"
1233+
1234+export FONTCONFIG_PATH="$TOP/etc/fonts"
1235+export PANGO_RC_FILE="$TOP/etc/pango/pangorc"
1236+export PANGO_SYSCONFDIR="$TOP/etc"
1237+export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache"
1238+export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache"
1239+export GTK_DATA_PREFIX="$TOP"
1240+export GTK_EXE_PREFIX="$TOP"
1241+export GTK_PATH="$TOP"
1242+export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
1243+export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
1244+export GIO_USE_VFS="local"
1245+export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
1246+export GVFS_DISABLE_FUSE=1
1247+export XDG_DATA_DIRS="$TOP/share"
1248+export ASPELL_CONF="prefix $TOP;"
1249+export POPPLER_DATADIR="$TOP/share/poppler"
1250+
1251+# no DBUS for now
1252+unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
1253+unset DBUS_SESSION_BUS_ADDRESS
1254+
1255+# Note: This requires the path with the exact ImageMagic version number.
1256+# The actual version is inserted by the packaging script.
1257+export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config"
1258+export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
1259+export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
1260+
1261+export INKSCAPE_SHAREDIR="$TOP/share/inkscape"
1262+export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
1263+export INKSCAPE_LOCALEDIR="$TOP/share/locale"
1264+
1265+# Handle the case where the directory storing Inkscape has special characters
1266+# ('#', '&', '|') in the name. These need to be escaped to work properly for
1267+# various configuration files.
1268+ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
1269+
1270+# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
1271+if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
1272+ export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc"
1273+fi
1274+
1275+# If the AppleCollationOrder preference doesn't exist, we fall back to using
1276+# the AppleLocale preference.
1277+LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
1278+if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
1279+then
1280+ LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
1281+ sed 's/_.*//'`
1282+ [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
1283+else
1284+ [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
1285+fi
1286+
1287+# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
1288+# to crash on startup in locale_from_utf8().
1289+if [ "x$LANGSTR" == "x" ]
1290+then
1291+ # override broken script
1292+ [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2
1293+ export LANG="en_US.UTF-8"
1294+else
1295+ tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
1296+ tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
1297+ if [ "x$tmpLANG" == "x" ]
1298+ then
1299+ # override broken script
1300+ [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
1301+ export LANG="en_US.UTF-8"
1302+ else
1303+ [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
1304+ export LANG="$tmpLANG.UTF-8"
1305+ fi
1306+fi
1307+[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2
1308+export LC_ALL="$LANG"
1309+
1310+case "$INK_DEBUG" in
1311+ gdb)
1312+ EXEC="gdb --args" ;;
1313+ lldb)
1314+ EXEC="lldb -- " ;;
1315+ dtruss)
1316+ EXEC="dtruss" ;;
1317+ *)
1318+ EXEC="exec" ;;
1319+esac
1320+unset INK_DEBUG # ignore for recursive calls
1321+
1322+if [ "x$INK_DEBUG_SHELL" != "x" ]; then
1323+ exec bash
1324+else
1325+ $EXEC "$CWD/inkscape-bin" "$@"
1326+fi
1327
1328=== removed file 'packaging/macosx/Resources/bin/inkscape'
1329--- packaging/macosx/Resources/bin/inkscape 2014-03-27 01:33:44 +0000
1330+++ packaging/macosx/Resources/bin/inkscape 1970-01-01 00:00:00 +0000
1331@@ -1,158 +0,0 @@
1332-#!/bin/sh
1333-#
1334-# Author: Aaron Voisine <aaron@voisine.org>
1335-# Inkscape Modifications:
1336-# Michael Wybrow <mjwybrow@users.sourceforge.net>
1337-# Jean-Olivier Irisson <jo.irisson@gmail.com>
1338-#
1339-
1340-CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`"
1341-# e.g. /Applications/Inkscape.app/Contents/Resources/bin
1342-TOP="`dirname \"$CWD\"`"
1343-# e.g. /Applications/Inkscape.app/Contents/Resources
1344-
1345-
1346-# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway.
1347-# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple:
1348-# http://developer.apple.com/qa/qa2001/qa1067.html
1349-# but since no one does, we correct this by making the 'classic' PATH additions here:
1350-# /usr/local/bin which, though standard, doesn't seem to be in the PATH
1351-# newer python as recommended by MacPython http://www.python.org/download/mac/
1352-# Fink
1353-# MacPorts (former DarwinPorts)
1354-# LaTeX distribution for Mac OS X
1355-export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH"
1356-
1357-# Put /usr/bin at beginning of path so we make sure we use Apple's python
1358-# over one that may be installed be Macports, Fink or some other means.
1359-export PATH="/usr/bin:$PATH"
1360-
1361-# On Snow Leopard, use the 32-bit version of python from Universal build.
1362-# This is because our bundled i386 python libraries are 32-bit only.
1363-export VERSIONER_PYTHON_VERSION=2.6
1364-export VERSIONER_PYTHON_PREFER_32_BIT=yes
1365-
1366-
1367-# Setup PYTHONPATH to use python modules shipped with Inkscape
1368-ARCH=`arch`
1369-PYTHON_VERS=`python -V 2>&1 | cut -c 8-10`
1370-export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS"
1371-# 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
1372-
1373-# No longer required if path rewriting has been conducted.
1374-# export DYLD_LIBRARY_PATH="$TOP/lib"
1375-
1376-mkdir -p "${HOME}/.inkscape-etc"
1377-
1378-export FONTCONFIG_PATH="$TOP/etc/fonts"
1379-export PANGO_RC_FILE="$HOME/.inkscape-etc/pangorc"
1380-export GTK_IM_MODULE_FILE="$HOME/.inkscape-etc/gtk.immodules"
1381-export GDK_PIXBUF_MODULE_FILE="$HOME/.inkscape-etc/gdk-pixbuf.loaders"
1382-export GTK_DATA_PREFIX="$TOP"
1383-export GTK_EXE_PREFIX="$TOP"
1384-export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
1385-export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
1386-export XDG_DATA_DIRS="$TOP/share"
1387-export ASPELL_CONF="prefix $TOP;"
1388-
1389-# Note: This requires the path with the exact ImageMagic version number.
1390-# Also, that ImageMagick will only work if it does not find a
1391-# version installed into the same PREFIX as it was originally
1392-# installed. Luckily, this is very unlikely given the extra long
1393-# and strangely named install prefix we use.
1394-# The actual version is inserted by the packaging script.
1395-export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER/config"
1396-export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
1397-export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
1398-
1399-export INKSCAPE_SHAREDIR="$TOP"
1400-# TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle
1401-export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
1402-export INKSCAPE_LOCALEDIR="$TOP/locale"
1403-
1404-# Handle the case where the directory storing Inkscape has special characters
1405-# ('#', '&', '|') in the name. These need to be escaped to work properly for
1406-# various configuration files.
1407-ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
1408-
1409-# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
1410-if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
1411- # Appearance setting
1412- aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant 2>/dev/null`
1413- # 1 for aqua, 6 for graphite, inexistant if the default color was never changed
1414- if [[ "$aquaStyle" == "" ]]; then
1415- aquaStyle=1 # set aqua as default
1416- fi
1417-
1418- # Highlight Color setting
1419- hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor 2>/dev/null`
1420- # a RGB value, with components between 0 and 1, also inexistant if it was not changed
1421- if [[ "$hiliColor" == "" ]]; then
1422- hiliColor="0.709800 0.835300 1.000000" # set blue as default
1423- fi
1424-
1425- # Menu items color
1426- if [[ aquaStyle -eq 1 ]]; then
1427- menuColor="#4a76cd" # blue
1428- else
1429- menuColor="#7c8da4" # graphite
1430- fi
1431- # Format highlight color as a GTK rgb value
1432- hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'`
1433-
1434- # echo $menuColor
1435- # echo $hiliColorFormated
1436-
1437- # Modify the gtkrc
1438- # - with the correct colors
1439- # - to point to the correct scrollbars folder
1440- 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"
1441-
1442- export GTK2_RC_FILES="$HOME/.inkscape-etc/gtkrc"
1443-fi
1444-
1445-# If the AppleCollationOrder preference doesn't exist, we fall back to using
1446-# the AppleLocale preference.
1447-LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
1448-if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
1449-then
1450- echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2
1451- LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
1452- sed 's/_.*//'`
1453- echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
1454-else
1455- echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
1456-fi
1457-
1458-# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
1459-# to crash on startup in locale_from_utf8().
1460-if [ "x$LANGSTR" == "x" ]
1461-then
1462- # override broken script
1463- echo "Overriding empty LANGSTR" 1>&2
1464- export LANG="en_US.UTF-8"
1465-else
1466- tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
1467- tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
1468- if [ "x$tmpLANG" == "x" ]
1469- then
1470- # override broken script
1471- echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
1472- export LANG="en_US.UTF-8"
1473- else
1474- echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
1475- export LANG="$tmpLANG.UTF-8"
1476- fi
1477-fi
1478-echo "Setting Language: $LANG" 1>&2
1479-
1480-sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc"
1481-sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \
1482- > "${HOME}/.inkscape-etc/pango.modules"
1483-cp -f "$TOP/etc/pango/pangox.aliases" "${HOME}/.inkscape-etc/"
1484-sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \
1485- > "${HOME}/.inkscape-etc/gtk.immodules"
1486-sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \
1487- > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders"
1488-
1489-exec "$CWD/inkscape-bin" "$@"
1490
1491=== added file 'packaging/macosx/Resources/bin/python-wrapper.sh'
1492--- packaging/macosx/Resources/bin/python-wrapper.sh 1970-01-01 00:00:00 +0000
1493+++ packaging/macosx/Resources/bin/python-wrapper.sh 2014-10-14 03:02:11 +0000
1494@@ -0,0 +1,78 @@
1495+#!/bin/sh
1496+
1497+
1498+# ---------------------------------------------------------------------
1499+# a) to use PyGTK (for Sozi or inksmoto) from MacPorts
1500+# ---------------------------------------------------------------------
1501+
1502+# export PYTHONPATH="$INKSCAPE_SHAREDIR"/extensions
1503+#
1504+# # unset other environment variables used in Inkscape.app
1505+# unset DYLD_LIBRARY_PATH
1506+# unset XDG_CONFIG_DIRS XDG_DATA_DIRS
1507+# unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE
1508+# unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR
1509+# unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR
1510+# unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS
1511+# unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH
1512+# unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR
1513+# unset ASPELL_CONF
1514+# unset POPPLER_DATADIR
1515+# unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT
1516+# unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH
1517+# unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS
1518+#
1519+# # set locale (language) explicitly
1520+# # (not needed with 0.48.5 package)
1521+# #export LANG="en_US.UTF-8"
1522+#
1523+# # set MacPorts prefix
1524+# LIBPREFIX="/opt/local"
1525+#
1526+# exec "$LIBPREFIX/bin/python" "$@"
1527+
1528+
1529+# ---------------------------------------------------------------------
1530+# b) to test different 32bit or 64bit system-provided Python versions
1531+# (available on Mac OS X 10.6 Snow Leopard and later versions)
1532+# ---------------------------------------------------------------------
1533+
1534+# # Python 2.5 (system) - Lion: 2.5.6
1535+# #exec /usr/bin/python2.5 "$@"
1536+# export VERSIONER_PYTHON_VERSION=2.5
1537+# export VERSIONER_PYTHON_PREFER_32_BIT=yes
1538+# exec /usr/bin/python "$@"
1539+
1540+# # Python 2.6 (system) - Lion: 2.6.7
1541+# #exec arch -i386 /usr/bin/python2.6 "$@"
1542+# export VERSIONER_PYTHON_VERSION=2.6
1543+# export VERSIONER_PYTHON_PREFER_32_BIT=yes
1544+# #export VERSIONER_PYTHON_PREFER_32_BIT=no
1545+# exec /usr/bin/python "$@"
1546+
1547+# # Python 2.7 (system) - Lion: 2.7.1
1548+# #exec arch -i386 /usr/bin/python2.7 "$@"
1549+# export VERSIONER_PYTHON_VERSION=2.7
1550+# export VERSIONER_PYTHON_PREFER_32_BIT=yes
1551+# #export VERSIONER_PYTHON_PREFER_32_BIT=no
1552+# exec /usr/bin/python "$@"
1553+
1554+
1555+# ---------------------------------------------------------------------
1556+# c) to test different 32bit or 64bit MacPorts-provided Python versions
1557+# (define $LIBPREFIX locally)
1558+# ---------------------------------------------------------------------
1559+
1560+# LIBPREFIX="/opt/local-x11"
1561+# exec "$LIBPREFIX/bin/python2.5" "$@"
1562+# #exec "$LIBPREFIX/bin/python2.6" "$@"
1563+# #exec "$LIBPREFIX/bin/python2.7" "$@"
1564+
1565+
1566+# ---------------------------------------------------------------------
1567+# d) ... otherwise run default python
1568+# ---------------------------------------------------------------------
1569+
1570+exec /usr/bin/python "$@"
1571+
1572+# eof
1573
1574=== modified file 'packaging/macosx/Resources/etc/fonts/fonts.conf'
1575--- packaging/macosx/Resources/etc/fonts/fonts.conf 2009-07-19 10:45:26 +0000
1576+++ packaging/macosx/Resources/etc/fonts/fonts.conf 2014-10-14 03:02:11 +0000
1577@@ -24,12 +24,14 @@
1578 <!-- Font directory list -->
1579
1580 <dir>/usr/share/fonts</dir>
1581- <dir>/usr/X11R6/lib/X11/fonts</dir>
1582+ <dir>/usr/X11/lib/X11/fonts</dir>
1583 <dir>/opt/local/share/fonts</dir>
1584- <!-- <dir>/System/Library/Fonts</dir> -->
1585+ <dir>/System/Library/Fonts</dir>
1586 <dir>/Network/Library/Fonts</dir>
1587 <dir>/Library/Fonts</dir>
1588 <dir>~/Library/Fonts</dir>
1589+ <dir prefix="xdg">fonts</dir>
1590+ <!-- the following element will be removed in the future -->
1591 <dir>~/.fonts</dir>
1592
1593 <!--
1594@@ -39,7 +41,7 @@
1595 <test qual="any" name="family">
1596 <string>mono</string>
1597 </test>
1598- <edit name="family" mode="assign">
1599+ <edit name="family" mode="assign" binding="same">
1600 <string>monospace</string>
1601 </edit>
1602 </match>
1603@@ -51,7 +53,7 @@
1604 <test qual="any" name="family">
1605 <string>sans serif</string>
1606 </test>
1607- <edit name="family" mode="assign">
1608+ <edit name="family" mode="assign" binding="same">
1609 <string>sans-serif</string>
1610 </edit>
1611 </match>
1612@@ -63,7 +65,7 @@
1613 <test qual="any" name="family">
1614 <string>sans</string>
1615 </test>
1616- <edit name="family" mode="assign">
1617+ <edit name="family" mode="assign" binding="same">
1618 <string>sans-serif</string>
1619 </edit>
1620 </match>
1621@@ -75,6 +77,8 @@
1622
1623 <!-- Font cache directory list -->
1624
1625+ <cachedir prefix="xdg">fontconfig</cachedir>
1626+ <!-- the following element will be removed in the future -->
1627 <cachedir>~/.fontconfig</cachedir>
1628
1629 <config>
1630
1631=== added directory 'packaging/macosx/Resources/etc/gtk-2.0'
1632=== added file 'packaging/macosx/Resources/etc/gtk-2.0/gtkrc'
1633--- packaging/macosx/Resources/etc/gtk-2.0/gtkrc 1970-01-01 00:00:00 +0000
1634+++ packaging/macosx/Resources/etc/gtk-2.0/gtkrc 2014-10-14 03:02:11 +0000
1635@@ -0,0 +1,20 @@
1636+#
1637+# gtkrc file for Inkscape.app (X11)
1638+#
1639+
1640+gtk-theme-name = "Adwaita"
1641+gtk-font-name = "Lucida Grande 9"
1642+
1643+gtk-icon-theme-name = "GtkStock"
1644+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"
1645+
1646+gtk-button-images = 0
1647+gtk-menu-images = 0
1648+gtk-toolbar-style = 0
1649+#gtk-toolbar-icon-size = 2
1650+
1651+# fix Adwaita theme for Inkscape's GimpSpinScale widgets
1652+style "spinbutton" {}
1653+widget_class "*GimpSpinScale*" style "spinbutton"
1654+
1655+# eof
1656
1657=== modified file 'packaging/macosx/Resources/openDoc' (properties changed: +x to -x)
1658--- packaging/macosx/Resources/openDoc 2008-03-12 23:37:45 +0000
1659+++ packaging/macosx/Resources/openDoc 2014-10-14 03:02:11 +0000
1660@@ -1,17 +1,11 @@
1661-#!/bin/sh
1662+#!/bin/bash
1663 #
1664 # Author: Aaron Voisine <aaron@voisine.org>
1665 # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net>
1666-
1667-CWD="`dirname \"$0\"`"
1668-
1669-# System version: 3 for Panther, 4 for Tiger, 5 for Leopard
1670-export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
1671-
1672-if [[ $VERSION -le 4 ]]; then
1673- export "DISPLAY=`cat /tmp/display.$UID`"
1674-fi
1675-
1676-BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//'`"
1677-cd "$BASE"
1678+# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net>
1679+
1680+CWD="$(cd "$(dirname "$0")" && pwd)"
1681+
1682+source "${CWD}/xdg_setup.sh"
1683+
1684 exec "$CWD/bin/inkscape" "$@"
1685
1686=== modified file 'packaging/macosx/Resources/script'
1687--- packaging/macosx/Resources/script 2009-09-23 21:02:27 +0000
1688+++ packaging/macosx/Resources/script 2014-10-14 03:02:11 +0000
1689@@ -1,54 +1,21 @@
1690-#!/bin/sh
1691+#!/bin/bash
1692 #
1693 # Author: Aaron Voisine <aaron@voisine.org>
1694 # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net>
1695-
1696-CWD=`dirname "$0"`
1697-
1698-# System version: 3 for Panther, 4 for Tiger, 5 for Leopard
1699-export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'`
1700-
1701-# On Leopard, X11.app is installed by default, and will be started
1702-# automatically via launchd. On older systems, we need to start
1703-# X11 ourself.
1704-
1705-# For Panther and Tiger, start X11
1706-if [[ $VERSION -le 4 ]]; then
1707- # FIXME apparently this removes the xterm that starts with X
1708- # from xinitrc but when is it really used? Should we modify
1709- # the .xinitrc of the user without warning?
1710- ps -wx -ocommand | grep -e '[X]11' > /dev/null
1711- if [ "$?" != "0" -a ! -f "${HOME}/.xinitrc" ]; then
1712- echo "rm -f \"\${HOME}/.xinitrc\"" > "${HOME}/.xinitrc"
1713- sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> "${HOME}/.xinitrc"
1714- fi
1715-
1716- # Start X11 and get DISPLAY
1717- # FIXME: Insecure tmp file usage. Why do we have to copy this to /tmp anyway?
1718- cp -f "$CWD/bin/getdisplay.sh" /tmp/
1719- rm -f /tmp/display.$UID
1720- open-x11 /tmp/getdisplay.sh || \
1721- open -a XDarwin /tmp/getdisplay.sh || \
1722- echo ":0" > /tmp/display.$UID
1723-
1724- while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do
1725- sleep 1
1726- done
1727- export DISPLAY=`cat /tmp/display.$UID`
1728-
1729- ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11
1730-fi
1731-
1732-# Warn the user about time-consuming generation of fontconfig caches.
1733-test -f "${HOME}/.inkscape-etc/.fccache-new" || exit 12
1734-
1735-
1736-
1737-BASE=`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'`
1738-cd "$BASE"
1739-exec "$CWD/bin/inkscape" "$@"
1740+# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net>
1741+
1742+#export _DEBUG=true
1743+
1744+CWD="$(cd "$(dirname "$0")" && pwd)"
1745+
1746+source "${CWD}/xdg_setup.sh"
1747+source "${CWD}/alert_fccache.sh"
1748+
1749 # TODO examine whether it would be wisest to move the code from inkscape shell
1750 # script and getdisplay.sh to here and only keep the real binary in bin. This
1751 # may make things easier on Leopard and may also help using Inkscape on the
1752 # command line.
1753+#
1754+# See related FIXME in bin/inkscape for requirements to merge the two scripts.
1755
1756+exec "$CWD/bin/inkscape" "$@"
1757
1758=== removed directory 'packaging/macosx/Resources/themes'
1759=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX'
1760=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0'
1761=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars'
1762=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png'
1763Binary 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
1764=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png'
1765Binary 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
1766=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png'
1767Binary 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
1768=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png'
1769Binary 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
1770=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png'
1771Binary 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
1772=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png'
1773Binary 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
1774=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1'
1775=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh'
1776--- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh 2007-09-05 16:57:37 +0000
1777+++ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh 1970-01-01 00:00:00 +0000
1778@@ -1,7 +0,0 @@
1779-#!/bin/bash
1780-
1781-cp -f slider-vert.png slider-vert-prelight.png
1782-cp -f slider-vert.png slider-horiz-prelight.png
1783-cp -f slider-vert.png slider-horiz.png
1784-convert -rotate 90 slider-horiz.png slider-horiz.png
1785-convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png
1786\ No newline at end of file
1787
1788=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png'
1789Binary 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
1790=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png'
1791Binary 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
1792=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png'
1793Binary 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
1794=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png'
1795Binary 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
1796=== removed directory 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6'
1797=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh'
1798--- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh 2007-09-05 16:57:37 +0000
1799+++ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh 1970-01-01 00:00:00 +0000
1800@@ -1,7 +0,0 @@
1801-#!/bin/bash
1802-
1803-cp -f slider-vert.png slider-vert-prelight.png
1804-cp -f slider-vert.png slider-horiz-prelight.png
1805-cp -f slider-vert.png slider-horiz.png
1806-convert -rotate 90 slider-horiz.png slider-horiz.png
1807-convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png
1808\ No newline at end of file
1809
1810=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png'
1811Binary 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
1812=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png'
1813Binary 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
1814=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png'
1815Binary 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
1816=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png'
1817Binary 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
1818=== removed file 'packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc'
1819--- packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc 2014-03-27 01:33:44 +0000
1820+++ packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc 1970-01-01 00:00:00 +0000
1821@@ -1,547 +0,0 @@
1822-#
1823-# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger
1824-#
1825-# Heavily based on Clearlooks-Quicksilver
1826-# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com)
1827-#
1828-# (c) 2007 JiHO <jo.irisson@gmail.com>.
1829-# GNU General Public License http://www.gnu.org/copyleft/gpl.html
1830-#
1831-
1832-pixmap_path "${THEMEDIR}"
1833-
1834-style "clearlooks-default"
1835-{
1836- GtkButton ::default_border = { 0, 0, 0, 0 }
1837- GtkRange ::trough_border = 0
1838- GtkPaned ::handle_size = 6
1839- GtkRange ::slider_width = 15
1840- GtkRange ::stepper_size = 15
1841- GtkScale ::slider-length = 23
1842- GtkScale ::trough-side-details = 1
1843- GtkScrollbar ::min_slider_length = 30
1844- GtkCheckButton ::indicator_size = 12
1845- GtkMenuBar ::internal-padding = 0
1846- GtkTreeView ::expander_size = 14
1847- GtkExpander ::expander_size = 16
1848-
1849- xthickness = 1
1850- ythickness = 1
1851-
1852- fg[NORMAL] = "#000000" # black
1853- fg[PRELIGHT] = "#000000" # black
1854- fg[SELECTED] = "#ffffff" # white
1855- fg[ACTIVE] = "#000000" # black
1856- fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray
1857-
1858- bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray
1859- bg[PRELIGHT] = "#ffffff" # white
1860- bg[SELECTED] = OSX_MENU_COLOR_PLACEHOLDER # menu color
1861- bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray
1862- bg[ACTIVE] = {0.85, 0.85, 0.85} # gray
1863-
1864- base[NORMAL] = "#ffffff" # white
1865- base[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER # menu color
1866- base[ACTIVE] = {0.6, 0.6, 0.6} # dark gray
1867- base[SELECTED] = OSX_HILI_COLOR_PLACEHOLDER # highlight color
1868- base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray
1869-
1870- text[NORMAL] = "#000000" # black
1871- text[PRELIGHT] = "#000000" # black
1872- text[ACTIVE] = "#ffffff" # white
1873- text[SELECTED] = "#ffffff" # white
1874- text[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray
1875-
1876- engine "clearlooks"
1877- {
1878- colorize_scrollbar = FALSE #TRUE
1879- reliefstyle = 1
1880- menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient
1881- toolbarstyle = 0 # 0 = flat, 1 = enable effects
1882- animation = FALSE
1883- radius = 3.0 # 3.0 = default, 0.0 = sharp corners
1884- style = GUMMY # CLASSIC, GUMMY, GLOSSY
1885- }
1886-}
1887-
1888-
1889-style "clearlooks-wide" = "clearlooks-default"
1890-{
1891- xthickness = 2
1892- ythickness = 2
1893-}
1894-
1895-style "clearlooks-button" = "clearlooks-default"
1896-{
1897- xthickness = 3
1898- ythickness = 3
1899-
1900- bg[NORMAL] = "#f0f1f2" # a hint of blue...
1901-
1902- engine "clearlooks" {
1903- style = CLASSIC
1904- }
1905-}
1906-
1907-style "clearlooks-notebook" = "clearlooks-wide"
1908-{
1909- bg[NORMAL] = {0.93, 0.93, 0.93}
1910- bg[INSENSITIVE] = {0.93, 0.93, 0.93}
1911-}
1912-
1913-style "clearlooks-tasklist" = "clearlooks-default"
1914-{
1915- xthickness = 5
1916- ythickness = 3
1917-}
1918-
1919-style "clearlooks-menu" = "clearlooks-default"
1920-{
1921- xthickness = 2
1922- ythickness = 1
1923- bg[NORMAL] = "#ffffff"
1924-}
1925-
1926-style "clearlooks-menu-item" = "clearlooks-default"
1927-{
1928- xthickness = 0
1929- ythickness = 2
1930-
1931- fg[PRELIGHT] = "#ffffff"
1932- text[PRELIGHT] = "#ffffff"
1933- # We want PRELIGHT to be white for widgets, but coloured for the menu.
1934- bg[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER
1935-
1936- # Radius of the menu items (inside menus)
1937- engine "clearlooks" {
1938- radius = 0.0
1939- }
1940-}
1941-
1942-style "clearlooks-menu-itembar" = "clearlooks-default"
1943-{
1944- xthickness = 3
1945- ythickness = 3
1946-}
1947-
1948-style "clearlooks-tree" = "clearlooks-default"
1949-{
1950- xthickness = 2
1951- ythickness = 2
1952-}
1953-
1954-style "clearlooks-frame-title" = "clearlooks-default"
1955-{
1956- fg[NORMAL] = "#404040"
1957-}
1958-
1959-style "clearlooks-tooltips" = "clearlooks-default"
1960-{
1961- xthickness = 4
1962- ythickness = 4
1963- bg[NORMAL] = { 1.0,1.0,0.75 }
1964-}
1965-
1966-style "clearlooks-progressbar" = "clearlooks-default"
1967-{
1968- xthickness = 1
1969- ythickness = 1
1970-
1971- fg[PRELIGHT] = "#ffffff"
1972-}
1973-
1974-style "clearlooks-combo" = "clearlooks-default"
1975-{
1976- xthickness = 2
1977- ythickness = 3
1978-}
1979-
1980-# Added pixmaps for scollbars
1981-style "scrollbar" = "default"
1982-{
1983- # The values I set here have to do with the relative size of three graphic elements
1984- # I have used: the slider, the arrow box, and the trough. They all have the same width
1985- # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it
1986- # places the sliders inside the trough with a default 1 pixel border on either side of the slider,
1987- # so that the trough has its width stretched by an additional two pixels(?). Setting the
1988- # trough border makes the arrow box sit on top of the trough squarely, by making sure that
1989- # the trough stays the same width as the arrowbox(?). I could be totally wrong here.
1990- GtkRange::trough_border = 0
1991- GtkRange::slider_width = 15
1992-
1993- # This sets the size of the steppers (arrow buttons on the end of the scrollbar).
1994- # The image I am using is 15x15 pixels, and if I dont set this a one pixel line
1995- # gets cut off of the top of the "up" stepper.
1996- GtkRange::stepper_size = 15
1997-
1998- # Set a minimum length for the slider. Since I set the border on the slider
1999- # image to 15 pixels on either end of the slider I want the min length to be
2000- # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller
2001- # than 30 pixels.
2002- GtkScrollbar::min_slider_length = 30
2003-
2004- engine "pixmap"
2005- {
2006- # Horizontal slider background
2007- image
2008- {
2009- function = BOX
2010- recolorable = TRUE
2011- detail = "trough"
2012- file = "Scrollbars/trough-scrollbar-horiz.png"
2013- border = { 30, 30, 0, 0 }
2014- stretch = TRUE
2015- orientation = HORIZONTAL
2016- }
2017-
2018- # Vertical slider background
2019- image
2020- {
2021- function = BOX
2022- recolorable = TRUE
2023- detail = "trough"
2024- file = "Scrollbars/trough-scrollbar-vert.png"
2025- border = { 0, 0, 30, 30 }
2026- stretch = TRUE
2027- orientation = VERTICAL
2028- }
2029-
2030- # Normal horizontal slider
2031- image
2032- {
2033- function = SLIDER
2034- recolorable = TRUE
2035- state = NORMAL
2036- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png"
2037- border = { 15, 15, 6, 6 }
2038- stretch = TRUE
2039- orientation = HORIZONTAL
2040- }
2041-
2042- # Horizontal slider (active)
2043- image
2044- {
2045- function = SLIDER
2046- recolorable = TRUE
2047- state = ACTIVE
2048- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png"
2049- border = { 15, 15, 6, 6 }
2050- stretch = TRUE
2051- orientation = HORIZONTAL
2052- }
2053-
2054- # Horizontal slider (mouse over)
2055- image
2056- {
2057- function = SLIDER
2058- recolorable = TRUE
2059- state = PRELIGHT
2060- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png"
2061- border = { 15, 15, 6, 6 }
2062- stretch = TRUE
2063- orientation = HORIZONTAL
2064- }
2065-
2066- # Horizontal slider (Insesitive)
2067- image
2068- {
2069- function = SLIDER
2070- recolorable = TRUE
2071- state = INSENSITIVE
2072- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png"
2073- border = { 15, 15, 6, 6 }
2074- stretch = TRUE
2075- orientation = HORIZONTAL
2076- }
2077-
2078- # Normal vertical slider
2079- image
2080- {
2081- function = SLIDER
2082- recolorable = TRUE
2083- state = NORMAL
2084- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png"
2085- border = { 6, 6, 15, 15 }
2086- stretch = TRUE
2087- orientation = VERTICAL
2088- }
2089-
2090- # Vertical slider (Active)
2091- image
2092- {
2093- function = SLIDER
2094- recolorable = TRUE
2095- state = ACTIVE
2096- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png"
2097- border = { 6, 6, 15, 15 }
2098- stretch = TRUE
2099- orientation = VERTICAL
2100- }
2101-
2102- # Vertical slider (mouse over)
2103- image
2104- {
2105- function = SLIDER
2106- recolorable = TRUE
2107- state = PRELIGHT
2108- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png"
2109- border = { 6, 6, 15, 15 }
2110- stretch = TRUE
2111- orientation = VERTICAL
2112- }
2113-
2114- # Vertical slider (Insesitive)
2115- image
2116- {
2117- function = SLIDER
2118- recolorable = TRUE
2119- state = INSENSITIVE
2120- file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png"
2121- border = { 6, 6, 15, 15 }
2122- stretch = TRUE
2123- orientation = VERTICAL
2124- }
2125-
2126-################################################################################
2127-# SCROLLBAR STEPPERS
2128-################################################################################
2129-
2130- # Up
2131- image
2132- {
2133- function = STEPPER
2134- recolorable = TRUE
2135- state = NORMAL
2136- file = "Scrollbars/stepper-up.png"
2137- #border = { 12, 2, 2, 9 }
2138- stretch = TRUE
2139- arrow_direction = UP
2140- }
2141- image
2142- {
2143- function = STEPPER
2144- recolorable = TRUE
2145- state = PRELIGHT
2146- file = "Scrollbars/stepper-up.png"
2147- #border = { 12, 2, 2, 9 }
2148- stretch = TRUE
2149- arrow_direction = UP
2150- }
2151- image
2152- {
2153- function = STEPPER
2154- recolorable = TRUE
2155- state = ACTIVE
2156- file = "Scrollbars/stepper-up.png"
2157- #border = { 12, 2, 2, 9 }
2158- stretch = TRUE
2159- arrow_direction = UP
2160- }
2161- image
2162- {
2163- function = STEPPER
2164- recolorable = TRUE
2165- state = INSENSITIVE
2166- file = "Scrollbars/stepper-up.png"
2167- #border = { 12, 2, 2, 9 }
2168- stretch = TRUE
2169- arrow_direction = UP
2170- }
2171-
2172- ######### DOWN ############
2173-
2174-
2175- image
2176- {
2177- function = STEPPER
2178- recolorable = TRUE
2179- state = NORMAL
2180- file = "Scrollbars/stepper-down.png"
2181- #border = { 12, 2, 10, 2 }
2182- stretch = TRUE
2183- arrow_direction = DOWN
2184- }
2185- image
2186- {
2187- function = STEPPER
2188- recolorable = TRUE
2189- state = PRELIGHT
2190- file = "Scrollbars/stepper-down.png"
2191- #border = { 12, 2, 10, 2 }
2192- stretch = TRUE
2193- arrow_direction = DOWN
2194- }
2195- image
2196- {
2197- function = STEPPER
2198- recolorable = TRUE
2199- state = ACTIVE
2200- file = "Scrollbars/stepper-down.png"
2201- #border = { 12, 2, 10, 2 }
2202- stretch = TRUE
2203- arrow_direction = DOWN
2204- }
2205- image
2206- {
2207- function = STEPPER
2208- recolorable = TRUE
2209- state = INSENSITIVE
2210- file = "Scrollbars/stepper-down.png"
2211- #border = { 12, 2, 10, 2 }
2212- stretch = TRUE
2213- arrow_direction = DOWN
2214- }
2215-
2216-############ RIGHT ################
2217-
2218- image
2219- {
2220- function = STEPPER
2221- recolorable = TRUE
2222- state = NORMAL
2223- file = "Scrollbars/stepper-right.png"
2224- #border = { 2, 9, 2, 13 }
2225- stretch = TRUE
2226- arrow_direction = RIGHT
2227- }
2228- image
2229- {
2230- function = STEPPER
2231- recolorable = TRUE
2232- state = PRELIGHT
2233- file = "Scrollbars/stepper-right.png"
2234- #border = { 2, 9, 2, 13 }
2235- stretch = TRUE
2236- arrow_direction = RIGHT
2237- }
2238- image
2239- {
2240- function = STEPPER
2241- recolorable = TRUE
2242- state = ACTIVE
2243- file = "Scrollbars/stepper-right.png"
2244- #border = { 2, 9, 2, 13 }
2245- stretch = TRUE
2246- arrow_direction = RIGHT
2247- }
2248- image
2249- {
2250- function = STEPPER
2251- recolorable = TRUE
2252- state = INSENSITIVE
2253- file = "Scrollbars/stepper-right.png"
2254- #border = { 2, 9, 2, 13 }
2255- stretch = TRUE
2256- arrow_direction = RIGHT
2257- }
2258-
2259-############### LEFT ###################
2260-
2261-
2262- image
2263- {
2264- function = STEPPER
2265- recolorable = TRUE
2266- state = NORMAL
2267- file = "Scrollbars/stepper-left.png"
2268- #border = { 2, 9, 2, 13 }
2269- stretch = TRUE
2270- arrow_direction = LEFT
2271- }
2272- image
2273- {
2274- function = STEPPER
2275- recolorable = TRUE
2276- state = PRELIGHT
2277- file = "Scrollbars/stepper-left.png"
2278- #border = { 2, 9, 2, 13 }
2279- stretch = TRUE
2280- arrow_direction = LEFT
2281- }
2282- image
2283- {
2284- function = STEPPER
2285- recolorable = TRUE
2286- state = ACTIVE
2287- file = "Scrollbars/stepper-left.png"
2288- #border = { 2, 9, 2, 13 }
2289- stretch = TRUE
2290- arrow_direction = LEFT
2291- }
2292- image
2293- {
2294- function = STEPPER
2295- recolorable = TRUE
2296- state = INSENSITIVE
2297- file = "Scrollbars/stepper-left.png"
2298- #border = { 2, 9, 2, 13 }
2299- stretch = TRUE
2300- arrow_direction = LEFT
2301- }
2302- }
2303-}
2304-
2305-# widget styles
2306-class "GtkWidget" style "clearlooks-default"
2307-class "GtkButton" style "clearlooks-button"
2308-class "GtkCombo" style "clearlooks-button"
2309-class "GtkRange" style "clearlooks-wide"
2310-class "GtkFrame" style "clearlooks-wide"
2311-class "GtkMenu" style "clearlooks-menu"
2312-class "GtkEntry" style "clearlooks-button"
2313-class "GtkMenuItem" style "clearlooks-menu-item"
2314-class "GtkStatusbar" style "clearlooks-wide"
2315-class "GtkNotebook" style "clearlooks-notebook"
2316-class "GtkProgressBar" style "clearlooks-progressbar"
2317-class "GtkScrollbar" style "scrollbar"
2318-
2319-widget_class "*MenuItem.*" style "clearlooks-menu-item"
2320-
2321-# combobox stuff
2322-widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo"
2323-widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo"
2324-
2325-# tooltips stuff
2326-widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist"
2327-widget "gtk-tooltips" style "clearlooks-tooltips"
2328-
2329-# treeview stuff
2330-widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree"
2331-widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree"
2332-widget_class "*.GtkList.GtkButton" style "clearlooks-tree"
2333-widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
2334-widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
2335-
2336-# notebook stuff
2337-widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
2338-widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
2339-
2340-# OS X uses 11 but due to differences in font smoothing, 10 actually integrates better
2341-gtk-font-name="Lucida Grande 10"
2342-
2343-# icon sizes: 48, 32, 24 (tango=22), 16
2344-#
2345-# gtk-dialog main icon in a dialog box: e.g. alert when file is not saved
2346-# gtk-dnd icon showed while dragging and dropping (not used on OS X)
2347-# gtk-button buttons: OK/Cancel dialogs, usually 22 but 16 is more OS X-ish
2348-# gtk-large-toolbar large toolbar: toolbox
2349-# gtk-small-toolbar small toolbar: command bar, tools control, snap control
2350-# gtk-menu menus in applications: File, Edit
2351-# panel-menu general Application/Places menu (not used on OS X)
2352-#
2353-# insckape-decoration layers lock, "affect" icons, etc.
2354-#
2355-#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"
2356-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"
2357-
2358-# use OS X default pdf-viewer for print preview
2359-gtk-print-preview-command="/usr/bin/open %f"
2360-
2361-# Whether images should be shown on buttons.
2362-# Default value: TRUE
2363-gtk-button-images = 0
2364-
2365-# Whether images should be shown in menus.
2366-gtk-menu-images = 0
2367-
2368-
2369
2370=== added file 'packaging/macosx/Resources/xdg_setup.sh'
2371--- packaging/macosx/Resources/xdg_setup.sh 1970-01-01 00:00:00 +0000
2372+++ packaging/macosx/Resources/xdg_setup.sh 2014-10-14 03:02:11 +0000
2373@@ -0,0 +1,13 @@
2374+#!/bin/bash
2375+
2376+export XDG_CACHE_HOME="${HOME}/.cache"
2377+export XDG_CONFIG_HOME="${HOME}/.config"
2378+export XDG_DATA_HOME="${HOME}/.local/share"
2379+
2380+mkdir -p "$XDG_CACHE_HOME"
2381+mkdir -p "$XDG_CONFIG_HOME"
2382+mkdir -p "$XDG_DATA_HOME"
2383+
2384+export INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape"
2385+mkdir -p "$INK_CACHE_DIR"
2386+
2387
2388=== removed directory 'packaging/macosx/ScriptExec/ScriptExec.xcode'
2389=== removed file 'packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj'
2390--- packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj 2006-01-16 02:36:01 +0000
2391+++ packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj 1970-01-01 00:00:00 +0000
2392@@ -1,451 +0,0 @@
2393-// !$*UTF8*$!
2394-{
2395- archiveVersion = 1;
2396- classes = {
2397- };
2398- objectVersion = 39;
2399- objects = {
2400- 0249A66BFF388E3F11CA2CEA = {
2401- isa = PBXFileReference;
2402- lastKnownFileType = archive.ar;
2403- name = "libstdc++.a";
2404- path = "/usr/lib/libstdc++.a";
2405- refType = 0;
2406- sourceTree = "<absolute>";
2407- };
2408-//020
2409-//021
2410-//022
2411-//023
2412-//024
2413-//080
2414-//081
2415-//082
2416-//083
2417-//084
2418- 0867D6AAFE840B52C02AAC07 = {
2419- children = (
2420- 0867D6ABFE840B52C02AAC07,
2421- );
2422- isa = PBXVariantGroup;
2423- name = InfoPlist.strings;
2424- refType = 4;
2425- sourceTree = "<group>";
2426- };
2427- 0867D6ABFE840B52C02AAC07 = {
2428- fileEncoding = 10;
2429- isa = PBXFileReference;
2430- lastKnownFileType = text.plist.strings;
2431- name = English;
2432- path = English.lproj/InfoPlist.strings;
2433- refType = 4;
2434- sourceTree = "<group>";
2435- };
2436-//080
2437-//081
2438-//082
2439-//083
2440-//084
2441-//190
2442-//191
2443-//192
2444-//193
2445-//194
2446- 195DF8CFFE9D517E11CA2CBB = {
2447- children = (
2448- 8D0C4E970486CD37000505A6,
2449- );
2450- isa = PBXGroup;
2451- name = Products;
2452- refType = 4;
2453- sourceTree = "<group>";
2454- };
2455-//190
2456-//191
2457-//192
2458-//193
2459-//194
2460-//200
2461-//201
2462-//202
2463-//203
2464-//204
2465- 20286C28FDCF999611CA2CEA = {
2466- buildSettings = {
2467- };
2468- buildStyles = (
2469- 4A9504C5FFE6A39111CA0CBA,
2470- 4A9504C6FFE6A39111CA0CBA,
2471- );
2472- hasScannedForEncodings = 1;
2473- isa = PBXProject;
2474- mainGroup = 20286C29FDCF999611CA2CEA;
2475- projectDirPath = "";
2476- targets = (
2477- 8D0C4E890486CD37000505A6,
2478- );
2479- };
2480- 20286C29FDCF999611CA2CEA = {
2481- children = (
2482- 20286C2AFDCF999611CA2CEA,
2483- 20286C2CFDCF999611CA2CEA,
2484- 20286C32FDCF999611CA2CEA,
2485- 195DF8CFFE9D517E11CA2CBB,
2486- );
2487- isa = PBXGroup;
2488- name = ScriptExec;
2489- path = "";
2490- refType = 4;
2491- sourceTree = "<group>";
2492- };
2493- 20286C2AFDCF999611CA2CEA = {
2494- children = (
2495- 32DBCF6D0370B57F00C91783,
2496- 20286C2BFDCF999611CA2CEA,
2497- );
2498- isa = PBXGroup;
2499- name = Sources;
2500- path = "";
2501- refType = 4;
2502- sourceTree = "<group>";
2503- };
2504- 20286C2BFDCF999611CA2CEA = {
2505- fileEncoding = 30;
2506- isa = PBXFileReference;
2507- lastKnownFileType = sourcecode.c.c;
2508- path = main.c;
2509- refType = 4;
2510- sourceTree = "<group>";
2511- };
2512- 20286C2CFDCF999611CA2CEA = {
2513- children = (
2514- 664C29F0060ECDC4006EC560,
2515- B8DCE042056DAC3500C390B0,
2516- 8D0C4E960486CD37000505A6,
2517- B8DCE048056DAC5000C390B0,
2518- 0867D6AAFE840B52C02AAC07,
2519- );
2520- isa = PBXGroup;
2521- name = Resources;
2522- path = "";
2523- refType = 4;
2524- sourceTree = "<group>";
2525- };
2526- 20286C32FDCF999611CA2CEA = {
2527- children = (
2528- 20286C33FDCF999611CA2CEA,
2529- 4A9504CAFFE6A41611CA0CBA,
2530- 4A9504C8FFE6A3BC11CA0CBA,
2531- 0249A66BFF388E3F11CA2CEA,
2532- B8DCE04E056DACAE00C390B0,
2533- );
2534- isa = PBXGroup;
2535- name = "External Frameworks and Libraries";
2536- path = "";
2537- refType = 4;
2538- sourceTree = "<group>";
2539- };
2540- 20286C33FDCF999611CA2CEA = {
2541- fallbackIsa = PBXFileReference;
2542- isa = PBXFrameworkReference;
2543- lastKnownFileType = wrapper.framework;
2544- name = Carbon.framework;
2545- path = /System/Library/Frameworks/Carbon.framework;
2546- refType = 0;
2547- sourceTree = "<absolute>";
2548- };
2549-//200
2550-//201
2551-//202
2552-//203
2553-//204
2554-//320
2555-//321
2556-//322
2557-//323
2558-//324
2559- 32DBCF6D0370B57F00C91783 = {
2560- fileEncoding = 4;
2561- isa = PBXFileReference;
2562- lastKnownFileType = sourcecode.c.h;
2563- path = ScriptExec_Prefix.pch;
2564- refType = 4;
2565- sourceTree = "<group>";
2566- };
2567-//320
2568-//321
2569-//322
2570-//323
2571-//324
2572-//4A0
2573-//4A1
2574-//4A2
2575-//4A3
2576-//4A4
2577- 4A9504C5FFE6A39111CA0CBA = {
2578- buildRules = (
2579- );
2580- buildSettings = {
2581- COPY_PHASE_STRIP = NO;
2582- DEBUGGING_SYMBOLS = YES;
2583- GCC_DYNAMIC_NO_PIC = NO;
2584- GCC_ENABLE_FIX_AND_CONTINUE = YES;
2585- GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
2586- GCC_OPTIMIZATION_LEVEL = 0;
2587- OPTIMIZATION_CFLAGS = "-O0";
2588- ZERO_LINK = YES;
2589- };
2590- isa = PBXBuildStyle;
2591- name = Development;
2592- };
2593- 4A9504C6FFE6A39111CA0CBA = {
2594- buildRules = (
2595- );
2596- buildSettings = {
2597- COPY_PHASE_STRIP = YES;
2598- GCC_ENABLE_FIX_AND_CONTINUE = NO;
2599- GCC_OPTIMIZATION_LEVEL = s;
2600- ZERO_LINK = NO;
2601- };
2602- isa = PBXBuildStyle;
2603- name = Deployment;
2604- };
2605- 4A9504C8FFE6A3BC11CA0CBA = {
2606- fallbackIsa = PBXFileReference;
2607- isa = PBXFrameworkReference;
2608- lastKnownFileType = wrapper.framework;
2609- name = ApplicationServices.framework;
2610- path = /System/Library/Frameworks/ApplicationServices.framework;
2611- refType = 0;
2612- sourceTree = "<absolute>";
2613- };
2614- 4A9504CAFFE6A41611CA0CBA = {
2615- fallbackIsa = PBXFileReference;
2616- isa = PBXFrameworkReference;
2617- lastKnownFileType = wrapper.framework;
2618- name = CoreServices.framework;
2619- path = /System/Library/Frameworks/CoreServices.framework;
2620- refType = 0;
2621- sourceTree = "<absolute>";
2622- };
2623-//4A0
2624-//4A1
2625-//4A2
2626-//4A3
2627-//4A4
2628-//660
2629-//661
2630-//662
2631-//663
2632-//664
2633- 664C29F0060ECDC4006EC560 = {
2634- fileEncoding = 30;
2635- isa = PBXFileReference;
2636- lastKnownFileType = text.script.sh;
2637- path = openDoc;
2638- refType = 4;
2639- sourceTree = "<group>";
2640- };
2641- 664C29F1060ECDC4006EC560 = {
2642- fileRef = 664C29F0060ECDC4006EC560;
2643- isa = PBXBuildFile;
2644- settings = {
2645- };
2646- };
2647-//660
2648-//661
2649-//662
2650-//663
2651-//664
2652-//8D0
2653-//8D1
2654-//8D2
2655-//8D3
2656-//8D4
2657- 8D0C4E890486CD37000505A6 = {
2658- buildPhases = (
2659- 8D0C4E8A0486CD37000505A6,
2660- 8D0C4E8C0486CD37000505A6,
2661- 8D0C4E8F0486CD37000505A6,
2662- 8D0C4E910486CD37000505A6,
2663- 8D0C4E940486CD37000505A6,
2664- );
2665- buildRules = (
2666- );
2667- buildSettings = {
2668- FRAMEWORK_SEARCH_PATHS = "";
2669- GCC_ENABLE_TRIGRAPHS = NO;
2670- GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
2671- GCC_PRECOMPILE_PREFIX_HEADER = YES;
2672- GCC_PREFIX_HEADER = ScriptExec_Prefix.pch;
2673- GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
2674- GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
2675- GCC_WARN_UNKNOWN_PRAGMAS = NO;
2676- HEADER_SEARCH_PATHS = "";
2677- INFOPLIST_FILE = Info.plist;
2678- INSTALL_PATH = "$(HOME)/Applications";
2679- LIBRARY_SEARCH_PATHS = "";
2680- LIBRARY_STYLE = Static;
2681- OTHER_CFLAGS = "";
2682- OTHER_LDFLAGS = "";
2683- OTHER_REZFLAGS = "";
2684- PRODUCT_NAME = ScriptExec;
2685- SECTORDER_FLAGS = "";
2686- WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
2687- WRAPPER_EXTENSION = app;
2688- };
2689- dependencies = (
2690- );
2691- isa = PBXNativeTarget;
2692- name = ScriptExec;
2693- productInstallPath = "$(HOME)/Applications";
2694- productName = ScriptExec;
2695- productReference = 8D0C4E970486CD37000505A6;
2696- productType = "com.apple.product-type.application";
2697- };
2698- 8D0C4E8A0486CD37000505A6 = {
2699- buildActionMask = 2147483647;
2700- files = (
2701- 8D0C4E8B0486CD37000505A6,
2702- );
2703- isa = PBXHeadersBuildPhase;
2704- runOnlyForDeploymentPostprocessing = 0;
2705- };
2706- 8D0C4E8B0486CD37000505A6 = {
2707- fileRef = 32DBCF6D0370B57F00C91783;
2708- isa = PBXBuildFile;
2709- settings = {
2710- };
2711- };
2712- 8D0C4E8C0486CD37000505A6 = {
2713- buildActionMask = 2147483647;
2714- files = (
2715- 8D0C4E8D0486CD37000505A6,
2716- B8DCE045056DAC3500C390B0,
2717- B8DCE049056DAC5000C390B0,
2718- 664C29F1060ECDC4006EC560,
2719- );
2720- isa = PBXResourcesBuildPhase;
2721- runOnlyForDeploymentPostprocessing = 0;
2722- };
2723- 8D0C4E8D0486CD37000505A6 = {
2724- fileRef = 0867D6AAFE840B52C02AAC07;
2725- isa = PBXBuildFile;
2726- settings = {
2727- };
2728- };
2729- 8D0C4E8F0486CD37000505A6 = {
2730- buildActionMask = 2147483647;
2731- files = (
2732- 8D0C4E900486CD37000505A6,
2733- );
2734- isa = PBXSourcesBuildPhase;
2735- runOnlyForDeploymentPostprocessing = 0;
2736- };
2737- 8D0C4E900486CD37000505A6 = {
2738- fileRef = 20286C2BFDCF999611CA2CEA;
2739- isa = PBXBuildFile;
2740- settings = {
2741- ATTRIBUTES = (
2742- );
2743- };
2744- };
2745- 8D0C4E910486CD37000505A6 = {
2746- buildActionMask = 2147483647;
2747- files = (
2748- 8D0C4E920486CD37000505A6,
2749- 8D0C4E930486CD37000505A6,
2750- B8DCE04F056DACAE00C390B0,
2751- );
2752- isa = PBXFrameworksBuildPhase;
2753- runOnlyForDeploymentPostprocessing = 0;
2754- };
2755- 8D0C4E920486CD37000505A6 = {
2756- fileRef = 20286C33FDCF999611CA2CEA;
2757- isa = PBXBuildFile;
2758- settings = {
2759- };
2760- };
2761- 8D0C4E930486CD37000505A6 = {
2762- fileRef = 0249A66BFF388E3F11CA2CEA;
2763- isa = PBXBuildFile;
2764- settings = {
2765- };
2766- };
2767- 8D0C4E940486CD37000505A6 = {
2768- buildActionMask = 2147483647;
2769- files = (
2770- );
2771- isa = PBXRezBuildPhase;
2772- runOnlyForDeploymentPostprocessing = 0;
2773- };
2774- 8D0C4E960486CD37000505A6 = {
2775- fileEncoding = 4;
2776- isa = PBXFileReference;
2777- lastKnownFileType = text.plist;
2778- path = Info.plist;
2779- refType = 4;
2780- sourceTree = "<group>";
2781- };
2782- 8D0C4E970486CD37000505A6 = {
2783- explicitFileType = wrapper.application;
2784- includeInIndex = 0;
2785- isa = PBXFileReference;
2786- path = ScriptExec.app;
2787- refType = 3;
2788- sourceTree = BUILT_PRODUCTS_DIR;
2789- };
2790-//8D0
2791-//8D1
2792-//8D2
2793-//8D3
2794-//8D4
2795-//B80
2796-//B81
2797-//B82
2798-//B83
2799-//B84
2800- B8DCE042056DAC3500C390B0 = {
2801- isa = PBXFileReference;
2802- lastKnownFileType = wrapper.nib;
2803- path = MenuBar.nib;
2804- refType = 4;
2805- sourceTree = "<group>";
2806- };
2807- B8DCE045056DAC3500C390B0 = {
2808- fileRef = B8DCE042056DAC3500C390B0;
2809- isa = PBXBuildFile;
2810- settings = {
2811- };
2812- };
2813- B8DCE048056DAC5000C390B0 = {
2814- fileEncoding = 30;
2815- isa = PBXFileReference;
2816- lastKnownFileType = text.script.sh;
2817- path = script;
2818- refType = 4;
2819- sourceTree = "<group>";
2820- };
2821- B8DCE049056DAC5000C390B0 = {
2822- fileRef = B8DCE048056DAC5000C390B0;
2823- isa = PBXBuildFile;
2824- settings = {
2825- };
2826- };
2827- B8DCE04E056DACAE00C390B0 = {
2828- isa = PBXFileReference;
2829- lastKnownFileType = wrapper.framework;
2830- name = Security.framework;
2831- path = /System/Library/Frameworks/Security.framework;
2832- refType = 0;
2833- sourceTree = "<absolute>";
2834- };
2835- B8DCE04F056DACAE00C390B0 = {
2836- fileRef = B8DCE04E056DACAE00C390B0;
2837- isa = PBXBuildFile;
2838- settings = {
2839- };
2840- };
2841- };
2842- rootObject = 20286C28FDCF999611CA2CEA;
2843-}
2844
2845=== modified file 'packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj'
2846--- packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj 2006-06-20 00:17:02 +0000
2847+++ packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj 2014-10-14 03:02:11 +0000
2848@@ -12,14 +12,12 @@
2849 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
2850 8D0C4E900486CD37000505A6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 20286C2BFDCF999611CA2CEA /* main.c */; settings = {ATTRIBUTES = (); }; };
2851 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
2852- 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0249A66BFF388E3F11CA2CEA /* libstdc++.a */; };
2853 B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE042056DAC3500C390B0 /* MenuBar.nib */; };
2854 B8DCE049056DAC5000C390B0 /* script in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE048056DAC5000C390B0 /* script */; };
2855 B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DCE04E056DACAE00C390B0 /* Security.framework */; };
2856 /* End PBXBuildFile section */
2857
2858 /* Begin PBXFileReference section */
2859- 0249A66BFF388E3F11CA2CEA /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/libstdc++.a"; sourceTree = "<absolute>"; };
2860 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
2861 20286C2BFDCF999611CA2CEA /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
2862 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
2863@@ -40,7 +38,6 @@
2864 buildActionMask = 2147483647;
2865 files = (
2866 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */,
2867- 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */,
2868 B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */,
2869 );
2870 runOnlyForDeploymentPostprocessing = 0;
2871@@ -94,7 +91,6 @@
2872 20286C33FDCF999611CA2CEA /* Carbon.framework */,
2873 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */,
2874 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */,
2875- 0249A66BFF388E3F11CA2CEA /* libstdc++.a */,
2876 B8DCE04E056DACAE00C390B0 /* Security.framework */,
2877 );
2878 name = "External Frameworks and Libraries";
2879@@ -140,9 +136,15 @@
2880 20286C28FDCF999611CA2CEA /* Project object */ = {
2881 isa = PBXProject;
2882 buildConfigurationList = 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */;
2883+ compatibilityVersion = "Xcode 2.4";
2884+ developmentRegion = English;
2885 hasScannedForEncodings = 1;
2886+ knownRegions = (
2887+ en,
2888+ );
2889 mainGroup = 20286C29FDCF999611CA2CEA /* ScriptExec */;
2890 projectDirPath = "";
2891+ projectRoot = "";
2892 targets = (
2893 8D0C4E890486CD37000505A6 /* ScriptExec */,
2894 );
2895@@ -199,6 +201,8 @@
2896 78E9AE170A36A8E3000D76A8 /* Development */ = {
2897 isa = XCBuildConfiguration;
2898 buildSettings = {
2899+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
2900+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
2901 COPY_PHASE_STRIP = NO;
2902 DEBUGGING_SYMBOLS = YES;
2903 FRAMEWORK_SEARCH_PATHS = "";
2904@@ -217,7 +221,6 @@
2905 INSTALL_PATH = "$(HOME)/Applications";
2906 LIBRARY_SEARCH_PATHS = "";
2907 LIBRARY_STYLE = Static;
2908- OPTIMIZATION_CFLAGS = "-O0";
2909 OTHER_CFLAGS = "";
2910 OTHER_LDFLAGS = "";
2911 OTHER_REZFLAGS = "";
2912@@ -236,6 +239,8 @@
2913 78E9AE180A36A8E3000D76A8 /* Deployment */ = {
2914 isa = XCBuildConfiguration;
2915 buildSettings = {
2916+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
2917+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
2918 COPY_PHASE_STRIP = YES;
2919 FRAMEWORK_SEARCH_PATHS = "";
2920 GCC_ENABLE_FIX_AND_CONTINUE = NO;
2921@@ -270,6 +275,8 @@
2922 78E9AE190A36A8E3000D76A8 /* Default */ = {
2923 isa = XCBuildConfiguration;
2924 buildSettings = {
2925+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
2926+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
2927 FRAMEWORK_SEARCH_PATHS = "";
2928 GCC_ENABLE_TRIGRAPHS = NO;
2929 GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
2930@@ -300,25 +307,18 @@
2931 78E9AE1B0A36A8E3000D76A8 /* Development */ = {
2932 isa = XCBuildConfiguration;
2933 buildSettings = {
2934- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
2935 };
2936 name = Development;
2937 };
2938 78E9AE1C0A36A8E3000D76A8 /* Deployment */ = {
2939 isa = XCBuildConfiguration;
2940 buildSettings = {
2941- ARCHS = (
2942- ppc,
2943- i386,
2944- );
2945- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
2946 };
2947 name = Deployment;
2948 };
2949 78E9AE1D0A36A8E3000D76A8 /* Default */ = {
2950 isa = XCBuildConfiguration;
2951 buildSettings = {
2952- SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
2953 };
2954 name = Default;
2955 };
2956
2957=== added file 'packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh'
2958--- packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh 1970-01-01 00:00:00 +0000
2959+++ packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh 2014-10-14 03:02:11 +0000
2960@@ -0,0 +1,169 @@
2961+#!/bin/sh
2962+#
2963+# Author: Aaron Voisine <aaron@voisine.org>
2964+# Inkscape Modifications:
2965+# Michael Wybrow <mjwybrow@users.sourceforge.net>
2966+# Jean-Olivier Irisson <jo.irisson@gmail.com>
2967+# ~suv <suv-sf@users.sourceforge.net>
2968+#
2969+
2970+[ -n "$INK_DEBUG_LAUNCHER" ] && set -x
2971+
2972+CWD="$(cd "$(dirname "$0")" && pwd)"
2973+# e.g. /Applications/Inkscape.app/Contents/MacOS
2974+TOP="$(dirname "$CWD")/Resources"
2975+# e.g. /Applications/Inkscape.app/Contents/Resources
2976+BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')"
2977+# e.g. /Applications/Inkscape.app
2978+
2979+source "${TOP}/xdg_setup.sh"
2980+source "${TOP}/alert_fccache.sh"
2981+
2982+# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative
2983+# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change
2984+# of working directory is required:
2985+#
2986+# Due to changes after 0.48, we have change working directory in the script named 'inkscape':
2987+# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or
2988+# fail (for python-based extensions, inkscape changes the working directory to the
2989+# script's directory, and inkscape launched by python script thus can't find resources
2990+# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory).
2991+cd "$BASE" || exit 1
2992+
2993+# don't prepend to $PATH in recursive calls:
2994+if [ -z "$INK_PATH_ORIG" ]; then
2995+
2996+ # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway.
2997+ # the 'classic' PATH additions:
2998+ # /usr/local/bin which, though standard, doesn't seem to be in the PATH
2999+ # Fink
3000+ # MacPorts (former DarwinPorts)
3001+ # LaTeX distribution for Mac OS X
3002+ PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin"
3003+
3004+ # Put /usr/bin at beginning of path so we make sure we use Apple's python
3005+ # over one that may be installed be Macports, Fink or some other means.
3006+ PATH_PYTHON="/usr/bin"
3007+
3008+ # Put $TOP/bin at beginning of path so we make sure that recursive calls
3009+ # to inkscape don't pull in other inkscape binaries with different setup.
3010+ # Also allows to override system python with custom wrapper script, and
3011+ # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export.
3012+ PATH_pkgbin="$CWD:$TOP/bin"
3013+
3014+ # save orig, new PATH
3015+ export INK_PATH_ORIG="$PATH"
3016+ export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG"
3017+fi
3018+
3019+# Setup PYTHONPATH to use python modules shipped with Inkscape
3020+OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)"
3021+build_arch=__build_arch__
3022+if [ $OSXMINORNO -gt "5" ]; then
3023+ if [ $OSXMINORNO -eq "6" ]; then
3024+ export VERSIONER_PYTHON_VERSION=2.6
3025+ else # if [ $OSXMINORNO -ge "7" ]; then
3026+ export VERSIONER_PYTHON_VERSION=2.7
3027+ fi
3028+ if [ $build_arch = "i386" ]; then
3029+ export VERSIONER_PYTHON_PREFER_32_BIT=yes
3030+ else # build & runtime arch x86_64
3031+ export VERSIONER_PYTHON_PREFER_32_BIT=no
3032+ fi
3033+fi
3034+PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)"
3035+export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/"
3036+
3037+export FONTCONFIG_PATH="$TOP/etc/fonts"
3038+export PANGO_RC_FILE="$TOP/etc/pango/pangorc"
3039+export PANGO_SYSCONFDIR="$TOP/etc"
3040+export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache"
3041+export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache"
3042+export GTK_DATA_PREFIX="$TOP"
3043+export GTK_EXE_PREFIX="$TOP"
3044+export GTK_PATH="$TOP"
3045+export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules"
3046+export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules"
3047+export GIO_USE_VFS="local"
3048+export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1
3049+export GVFS_DISABLE_FUSE=1
3050+export XDG_DATA_DIRS="$TOP/share"
3051+export ASPELL_CONF="prefix $TOP;"
3052+export POPPLER_DATADIR="$TOP/share/poppler"
3053+
3054+# no DBUS for now
3055+unset DBUS_LAUNCHD_SESSION_BUS_SOCKET
3056+unset DBUS_SESSION_BUS_ADDRESS
3057+
3058+# Note: This requires the path with the exact ImageMagic version number.
3059+# The actual version is inserted by the packaging script.
3060+export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config"
3061+export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters"
3062+export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders"
3063+
3064+export INKSCAPE_SHAREDIR="$TOP/share/inkscape"
3065+export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape"
3066+export INKSCAPE_LOCALEDIR="$TOP/share/locale"
3067+
3068+# Handle the case where the directory storing Inkscape has special characters
3069+# ('#', '&', '|') in the name. These need to be escaped to work properly for
3070+# various configuration files.
3071+ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'`
3072+
3073+# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home)
3074+if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then
3075+ export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc"
3076+fi
3077+
3078+# If the AppleCollationOrder preference doesn't exist, we fall back to using
3079+# the AppleLocale preference.
3080+LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null`
3081+if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ]
3082+then
3083+ LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \
3084+ sed 's/_.*//'`
3085+ [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2
3086+else
3087+ [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2
3088+fi
3089+
3090+# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape
3091+# to crash on startup in locale_from_utf8().
3092+if [ "x$LANGSTR" == "x" ]
3093+then
3094+ # override broken script
3095+ [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2
3096+ export LANG="en_US.UTF-8"
3097+else
3098+ tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \
3099+ tail -n1 | sed 's/\./ /' | awk '{print $2}'`"
3100+ if [ "x$tmpLANG" == "x" ]
3101+ then
3102+ # override broken script
3103+ [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2
3104+ export LANG="en_US.UTF-8"
3105+ else
3106+ [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2
3107+ export LANG="$tmpLANG.UTF-8"
3108+ fi
3109+fi
3110+[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2
3111+export LC_ALL="$LANG"
3112+
3113+case "$INK_DEBUG" in
3114+ gdb)
3115+ EXEC="gdb --args" ;;
3116+ lldb)
3117+ EXEC="lldb -- " ;;
3118+ dtruss)
3119+ EXEC="dtruss" ;;
3120+ *)
3121+ EXEC="exec" ;;
3122+esac
3123+unset INK_DEBUG # ignore for recursive calls
3124+
3125+if [ "x$INK_DEBUG_SHELL" != "x" ]; then
3126+ exec bash
3127+else
3128+ $EXEC "$CWD/inkscape-bin" "$@"
3129+fi
3130
3131=== modified file 'packaging/macosx/ScriptExec/main.c'
3132--- packaging/macosx/ScriptExec/main.c 2009-09-23 21:02:27 +0000
3133+++ packaging/macosx/ScriptExec/main.c 2014-10-14 03:02:11 +0000
3134@@ -6,6 +6,7 @@
3135 With modifications by Aaron Voisine for gimp.app
3136 With modifications by Marianne gagnon for Wilber-loves-apple
3137 With modifications by Michael Wybrow for Inkscape.app
3138+ With modifications by ~suv for Inkscape.app
3139
3140 This program is free software; you can redistribute it and/or modify
3141 it under the terms of the GNU General Public License as published by
3142@@ -27,7 +28,7 @@
3143
3144 /*
3145 * This app laucher basically takes care of:
3146- * - launching Inkscape and X11 when double-clicked
3147+ * - launching Inkscape when double-clicked
3148 * - bringing X11 to the top when its icon is clicked in the dock (via a small applescript)
3149 * - catch file dropped on icon events (and double-clicked gimp documents) and notify gimp.
3150 * - catch quit events performed outside gimp, e.g. on the dock icon.
3151@@ -39,7 +40,12 @@
3152 #pragma mark Includes
3153
3154 // Apple stuff
3155+
3156+// Note: including Carbon prevents building the launcher app in x86_64
3157+// used for StandardAlert in RequestUserAttention(),
3158+// RedFatalAlert()
3159 #include <Carbon/Carbon.h>
3160+
3161 #include <CoreFoundation/CoreFoundation.h>
3162 #include <Security/Authorization.h>
3163 #include <Security/AuthorizationTags.h>
3164@@ -67,7 +73,6 @@
3165 #define kEventClassRedFatalAlert 911
3166
3167 // custom carbon event types
3168-#define kEventKindX11Failed 911
3169 #define kEventKindFCCacheFailed 912
3170
3171 //maximum arguments the script accepts
3172@@ -83,15 +88,14 @@
3173 static OSErr ExecuteScript(char *script, pid_t *pid);
3174
3175 static void GetParameters(void);
3176-static char* GetScript(void);
3177-static char* GetOpenDoc(void);
3178+static unsigned char* GetScript(void);
3179+static unsigned char* GetOpenDoc(void);
3180
3181 OSErr LoadMenuBar(char *appName);
3182
3183-static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize);
3184+static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize);
3185 static void RedFatalAlert(Str255 errorString, Str255 expStr);
3186-static short DoesFileExist(char *path);
3187-static OSStatus FixFCCache(void);
3188+static short DoesFileExist(unsigned char *path);
3189
3190 static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent,
3191 AppleEvent *reply, long refCon);
3192@@ -99,8 +103,6 @@
3193 AppleEvent *reply, long refCon);
3194 static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent,
3195 AppleEvent *reply, long refCon);
3196-static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall,
3197- EventRef theEvent, void *userData);
3198 static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall,
3199 EventRef theEvent, void *userData);
3200 static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent,
3201@@ -109,7 +111,7 @@
3202 static OSStatus CompileAppleScript(const void* text, long textLength,
3203 AEDesc *resultData);
3204 static OSStatus SimpleCompileAppleScript(const char* theScript);
3205-static void runScript();
3206+static OSErr runScript();
3207
3208 ///////////////////////////////////////
3209 // Globals
3210@@ -144,7 +146,6 @@
3211 int main(int argc, char* argv[])
3212 {
3213 OSErr err = noErr;
3214- EventTypeSpec X11events = { kEventClassRedFatalAlert, kEventKindX11Failed };
3215 EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed };
3216
3217 InitCursor();
3218@@ -165,9 +166,6 @@
3219 0, false);
3220
3221 err += InstallEventHandler(GetApplicationEventTarget(),
3222- NewEventHandlerUPP(X11FailedHandler), 1,
3223- &X11events, NULL, NULL);
3224- err += InstallEventHandler(GetApplicationEventTarget(),
3225 NewEventHandlerUPP(FCCacheFailedHandler), 1,
3226 &FCCacheEvents, NULL, NULL);
3227
3228@@ -181,7 +179,7 @@
3229 GetParameters(); //load data from files containing exec settings
3230
3231 // compile "icon clicked" script so it's ready to execute
3232- SimpleCompileAppleScript("tell application \"X11\" to activate");
3233+ SimpleCompileAppleScript("tell application \"XQuartz\" to activate");
3234
3235 RunApplicationEventLoop(); //Run the event loop
3236 return 0;
3237@@ -229,6 +227,7 @@
3238
3239 //////////////////////////////////
3240 // Handler for when fontconfig caches need to be generated
3241+// TODO: remove (alert and touch moved to launcher script)
3242 //////////////////////////////////
3243 static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall,
3244 EventRef theEvent, void *userData)
3245@@ -243,8 +242,8 @@
3246 ShowFirstStartWarningDialog();
3247
3248 // Note that we've seen the warning.
3249- system("test -d \"$HOME/.inkscape-etc\" || mkdir -p \"$HOME/.inkscape-etc\"; "
3250- "touch \"$HOME/.inkscape-etc/.fccache-new\"");
3251+ system("test -d \"$HOME/.cache/inkscape\" || mkdir -p \"$HOME/.cache/inkscape\"; "
3252+ "touch \"$HOME/.cache/inkscape/.fccache-new\"");
3253 // Rerun now.
3254 OSErr err = ExecuteScript(scriptPath, &pid);
3255 ExitToShell();
3256@@ -253,116 +252,6 @@
3257 }
3258
3259
3260-static size_t safeRead(int d, void *buf, size_t nbytes)
3261-{
3262- ssize_t bytesToRead = nbytes;
3263- ssize_t bytesRead = 0;
3264- char *offset = (char *) buf;
3265-
3266- while ((bytesToRead > 0))
3267- {
3268- bytesRead = read(d, offset, bytesToRead);
3269- if (bytesRead > 0)
3270- {
3271- offset += bytesRead;
3272- bytesToRead -= bytesRead;
3273- }
3274- else if (bytesRead == 0)
3275- {
3276- // Reached EOF.
3277- break;
3278- }
3279- else if (bytesRead == -1)
3280- {
3281- if ((errno == EINTR) || (errno == EAGAIN))
3282- {
3283- // Try again.
3284- continue;
3285- }
3286- return 0;
3287- }
3288- }
3289- return bytesRead;
3290-}
3291-
3292-
3293-/////////////////////////////////////
3294-// Code to run fc-cache on first run
3295-/////////////////////////////////////
3296-static OSStatus FixFCCache (void)
3297-{
3298- FILE *fileConnToChild = NULL;
3299- int fdConnToChild = 0;
3300- pid_t childPID = WAIT_ANY;
3301- size_t bytesChildPID;
3302- size_t bytesRead;
3303- int status;
3304-
3305- char commandStr[] = "/usr/X11R6/bin/fc-cache";
3306- char *commandArgs[] = { "-f", NULL };
3307-
3308- // Run fc-cache
3309- AuthorizationItem authItems[] =
3310- {
3311- {
3312- kAuthorizationRightExecute,
3313- strlen(commandStr),
3314- commandStr,
3315- 0
3316- }
3317- };
3318- AuthorizationItemSet authItemSet =
3319- {
3320- 1,
3321- authItems
3322- };
3323- AuthorizationRef authRef = NULL;
3324- OSStatus err = AuthorizationCreate (NULL, &authItemSet,
3325- kAuthorizationFlagInteractionAllowed |
3326- kAuthorizationFlagExtendRights, &authRef);
3327-
3328- if (err == errAuthorizationSuccess)
3329- {
3330- err = AuthorizationExecuteWithPrivileges(authRef, commandStr,
3331- kAuthorizationFlagDefaults, commandArgs,
3332- &fileConnToChild);
3333-
3334- if (err == errAuthorizationSuccess)
3335- {
3336- // Unfortunately, AuthorizationExecuteWithPrivileges
3337- // does not return the process ID associated with the
3338- // process it runs. The best solution we have it to
3339- // try and get the process ID from the file descriptor.
3340- // This is based on example code from Apple's
3341- // MoreAuthSample.
3342-
3343- fdConnToChild = fileno(fileConnToChild);
3344-
3345- // Try an get the process ID of the fc-cache command
3346- bytesChildPID = sizeof(childPID);
3347- bytesRead = safeRead(fdConnToChild, &childPID,
3348- bytesChildPID);
3349- if (bytesRead != bytesChildPID)
3350- {
3351- // If we can't get it the best alternative
3352- // is to wait for any child to finish.
3353- childPID = WAIT_ANY;
3354- }
3355-
3356- if (fileConnToChild != NULL) {
3357- fclose(fileConnToChild);
3358- }
3359-
3360- // Wait for child process to finish.
3361- waitpid(childPID, &status, 0);
3362- }
3363- }
3364- AuthorizationFree(authRef, kAuthorizationFlagDestroyRights);
3365-
3366- return err;
3367-}
3368-
3369-
3370 ///////////////////////////////////
3371 // Execution thread starts here
3372 ///////////////////////////////////
3373@@ -373,12 +262,7 @@
3374 taskDone = false;
3375
3376 OSErr err = ExecuteScript(scriptPath, &pid);
3377- if (err == (OSErr)11) {
3378- CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindX11Failed, 0,
3379- kEventAttributeNone, &event);
3380- PostEventToQueue(GetMainEventQueue(), event, kEventPriorityStandard);
3381- }
3382- else if (err == (OSErr)12) {
3383+ if (err == (OSErr)12) {
3384 CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0,
3385 kEventAttributeNone, &event);
3386 PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh);
3387@@ -448,14 +332,13 @@
3388 ///////////////////////////////////////
3389 // Get path to the script in Resources folder
3390 ///////////////////////////////////////
3391-static char* GetScript (void)
3392+static unsigned char* GetScript (void)
3393 {
3394 CFStringRef fileName;
3395 CFBundleRef appBundle;
3396 CFURLRef scriptFileURL;
3397 FSRef fileRef;
3398- FSSpec fileSpec;
3399- char *path;
3400+ unsigned char *path;
3401
3402 //get CF URL for script
3403 if (! (appBundle = CFBundleGetMainBundle())) return NULL;
3404@@ -472,13 +355,9 @@
3405 CFRelease(scriptFileURL);
3406 CFRelease(fileName);
3407
3408- //convert FSRef to FSSpec
3409- if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec,
3410- NULL)) return NULL;
3411-
3412 //create path string
3413 if (! (path = malloc(kMaxPathLength))) return NULL;
3414- if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL;
3415+ if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL;
3416 if (! DoesFileExist(path)) return NULL;
3417
3418 return path;
3419@@ -487,14 +366,13 @@
3420 ///////////////////////////////////////
3421 // Gets the path to openDoc in Resources folder
3422 ///////////////////////////////////////
3423-static char* GetOpenDoc (void)
3424+static unsigned char* GetOpenDoc (void)
3425 {
3426 CFStringRef fileName;
3427 CFBundleRef appBundle;
3428 CFURLRef openDocFileURL;
3429 FSRef fileRef;
3430- FSSpec fileSpec;
3431- char *path;
3432+ unsigned char *path;
3433
3434 //get CF URL for openDoc
3435 if (! (appBundle = CFBundleGetMainBundle())) return NULL;
3436@@ -511,13 +389,9 @@
3437 CFRelease(openDocFileURL);
3438 CFRelease(fileName);
3439
3440- //convert FSRef to FSSpec
3441- if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec,
3442- NULL)) return NULL;
3443-
3444 //create path string
3445 if (! (path = malloc(kMaxPathLength))) return NULL;
3446- if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL;
3447+ if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL;
3448 if (! DoesFileExist(path)) return NULL;
3449
3450 return path;
3451@@ -545,14 +419,8 @@
3452 ///////////////////////////////////////
3453 // Generate path string from FSSpec record
3454 ///////////////////////////////////////
3455-static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize)
3456+static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize)
3457 {
3458- OSErr err = noErr;
3459- FSRef fileRef;
3460-
3461- //create file reference from file spec
3462- if (err = FSpMakeFSRef(&file, &fileRef)) return err;
3463-
3464 // and then convert the FSRef to a path
3465 return FSRefMakePath(&fileRef, path, maxPathSize);
3466 }
3467@@ -569,9 +437,9 @@
3468 ///////////////////////////////////////
3469 // Determines whether file exists at path or not
3470 ///////////////////////////////////////
3471-static short DoesFileExist (char *path)
3472+static short DoesFileExist (unsigned char *path)
3473 {
3474- if (access(path, F_OK) == -1) return false;
3475+ if (access((char *)path, F_OK) == -1) return false;
3476 return true;
3477 }
3478
3479@@ -590,7 +458,7 @@
3480
3481 if (! taskDone && pid) { //kill the script process brutally
3482 kill(pid, 9);
3483- printf("Platypus App: PID %d killed brutally\n", pid);
3484+ printf("Inkscape.app: PID %d killed brutally\n", pid);
3485 }
3486
3487 pthread_cancel(tid);
3488@@ -610,31 +478,31 @@
3489 #pragma unused (reply, refCon)
3490
3491 OSErr err = noErr;
3492- AEDescList fileSpecList;
3493+ AEDescList fileRefList;
3494 AEKeyword keyword;
3495 DescType type;
3496
3497 short i;
3498 long count, actualSize;
3499
3500- FSSpec fileSpec;
3501- char path[kMaxPathLength];
3502+ FSRef fileRef;
3503+ unsigned char path[kMaxPathLength];
3504
3505 while (numArgs > 0) free(fileArgs[numArgs--]);
3506
3507 //Read the AppleEvent
3508 err = AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList,
3509- &fileSpecList);
3510+ &fileRefList);
3511
3512- err = AECountItems(&fileSpecList, &count); //Count number of files
3513+ err = AECountItems(&fileRefList, &count); //Count number of files
3514
3515 for (i = 1; i <= count; i++) { //iteratively process each file
3516- //get fsspec from apple event
3517- if (! (err = AEGetNthPtr(&fileSpecList, i, typeFSS, &keyword, &type,
3518- (Ptr)&fileSpec, sizeof(FSSpec), &actualSize)))
3519+ //get fsref from apple event
3520+ if (! (err = AEGetNthPtr(&fileRefList, i, typeFSRef, &keyword, &type,
3521+ (Ptr)&fileRef, sizeof(FSRef), &actualSize)))
3522 {
3523- //get path from file spec
3524- if ((err = FSMakePath(fileSpec, (unsigned char *)&path,
3525+ //get path from file ref
3526+ if ((err = FSMakePath(fileRef, (unsigned char *)&path,
3527 kMaxPathLength))) return err;
3528
3529 if (numArgs == kMaxArgumentsToScript) break;
3530@@ -659,7 +527,7 @@
3531 static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent,
3532 AppleEvent *reply, long refCon)
3533 {
3534- runScript();
3535+ return runScript();
3536 }
3537
3538 // if app is being opened
3539@@ -675,70 +543,6 @@
3540 }
3541
3542
3543-static void OpenURL(Str255 url)
3544-{
3545- // Use Internet Config to hand the URL to the appropriate application, as
3546- // set by the user in the Internet Preferences pane.
3547- ICInstance icInstance;
3548- // Applications creator code:
3549- OSType signature = 'Inks';
3550- OSStatus error = ICStart( &icInstance, signature );
3551- if ( error == noErr )
3552- {
3553- ConstStr255Param hint = 0x0;
3554- const char* data = url;
3555- long length = strlen(url);
3556- long start = 0;
3557- long end = length;
3558- // Don't bother testing return value (error); launched application will
3559- // report problems.
3560- ICLaunchURL( icInstance, hint, data, length, &start, &end );
3561- ICStop( icInstance );
3562- }
3563-}
3564-
3565-
3566-//////////////////////////////////
3567-// Handler for when X11 fails to start
3568-//////////////////////////////////
3569-static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall,
3570- EventRef theEvent, void *userData)
3571-{
3572- #pragma unused(theHanderCall, theEvent, userData)
3573-
3574- pthread_join(tid, NULL);
3575- if (odtid) pthread_join(odtid, NULL);
3576-
3577- SInt16 itemHit;
3578- const char *getX11 = "\pGet X11 for Panther";
3579-
3580- AlertStdAlertParamRec params;
3581- params.movable = true;
3582- params.helpButton = false;
3583- params.filterProc = NULL;
3584- params.defaultText = (StringPtr) kAlertDefaultOKText;
3585- params.cancelText = getX11;
3586- params.otherText = NULL;
3587- params.defaultButton = kAlertStdAlertOKButton;
3588- params.cancelButton = kAlertStdAlertCancelButton;
3589- params.position = kWindowDefaultPosition;
3590-
3591- StandardAlert(kAlertStopAlert, "\pFailed to start X11",
3592- "\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.",
3593- &params, &itemHit);
3594-
3595- if (itemHit == kAlertStdAlertCancelButton)
3596- {
3597- OpenURL("http://www.apple.com/downloads/macosx/apple/macosx_updates/x11formacosx.html");
3598- }
3599-
3600- ExitToShell();
3601-
3602-
3603- return noErr;
3604-}
3605-
3606-
3607 // Compile and run a small AppleScript. The code below does no cleanup and no proper error checks
3608 // but since it's there until the app is shut down, and since we know the script is okay,
3609 // there should not be any problems.
3610@@ -774,7 +578,7 @@
3611 }
3612
3613 /* runs the compiled applescript */
3614-static void runScript()
3615+static OSErr runScript()
3616 {
3617 /* run the script */
3618 err = OSAExecute(theComponent, scriptID, kOSANullScript,
3619
3620=== added file 'packaging/macosx/create-stock-icon-theme.sh'
3621--- packaging/macosx/create-stock-icon-theme.sh 1970-01-01 00:00:00 +0000
3622+++ packaging/macosx/create-stock-icon-theme.sh 2014-10-14 03:02:11 +0000
3623@@ -0,0 +1,165 @@
3624+#!/usr/bin/env bash
3625+#
3626+#
3627+# Create new icon theme based on GTK+ stock icons
3628+#
3629+# Copyright (C) 2014 ~suv
3630+#
3631+
3632+
3633+# config
3634+#---------------------------------------------------------
3635+
3636+if [ -z $LIBPREFIX ]; then
3637+ LIBPREFIX="/opt/local-x11"
3638+fi
3639+if [ -z $stock_src ]; then
3640+ stock_src="$(pwd)/stock-icons"
3641+fi
3642+
3643+
3644+# setup
3645+#---------------------------------------------------------
3646+
3647+map_legacy_icons="$LIBPREFIX/libexec/icon-name-mapping"
3648+if [ ! -x "$map_legacy_icons" ]; then
3649+ echo "Install icon-naming-utils"
3650+ exit 1
3651+fi
3652+
3653+if [ ! -d "$stock_src" ]; then
3654+ echo "extra icons not found."
3655+ exit 1
3656+fi
3657+
3658+ICONDIR="$1"
3659+icon_theme_dir="$(dirname "$ICONDIR")"
3660+if [ ! -d "$icon_theme_dir" ] ; then
3661+ mkdir -p "$icon_theme_dir"
3662+fi
3663+icon_theme_name="$(basename "$ICONDIR")"
3664+if [ -z "$icon_theme_name" ]; then
3665+ echo "Not a valid icon theme name."
3666+ exit 1
3667+fi
3668+theme_color="$2"
3669+
3670+contexts="actions animations apps categories devices emblems emotes mimetypes places status"
3671+gtk_stock_sizes="16 20 24 32 48"
3672+
3673+orig_dir="$(pwd)"
3674+cd "$icon_theme_dir"
3675+current_dir="$(pwd)"
3676+
3677+index_file="${icon_theme_name}/index.theme"
3678+
3679+
3680+# Remove a previously existing icon theme if necessary
3681+#---------------------------------------------------------
3682+
3683+if [ -d "$icon_theme_name" ]; then
3684+ echo "Removing previous $icon_theme_name"
3685+ rm -R "$icon_theme_name"
3686+fi
3687+
3688+
3689+# create new icon theme structure
3690+#---------------------------------------------------------
3691+
3692+mkdir -p "$icon_theme_name"
3693+for size in $gtk_stock_sizes; do
3694+ mkdir "${icon_theme_name}/${size}x${size}"
3695+done
3696+
3697+
3698+# copy stock icons
3699+#---------------------------------------------------------
3700+
3701+for size in $gtk_stock_sizes; do
3702+ cp -RP "${stock_src}/$size" "${icon_theme_name}/${size}x${size}/stock"
3703+done
3704+
3705+# workarounds for broken icons (bug #1269698)
3706+#---------------------------------------------------------
3707+
3708+for size in $gtk_stock_sizes; do
3709+ cd "${icon_theme_name}/${size}x${size}/stock"
3710+ # directional icons
3711+ for di in "edit-undo" "edit-redo" "document-revert"; do
3712+ if [ -f "${di}-ltr.png" ]; then
3713+ if [ ! -e "${di}.png" ]; then
3714+ ln -s "${di}-ltr.png" "${di}.png"
3715+ fi
3716+ fi
3717+ done
3718+ # misc failed lookups
3719+ for di in "preferences"; do
3720+ if [ -f "gtk-${di}.png" ]; then
3721+ if [ ! -e "${di}-system.png" ]; then
3722+ ln -s "gtk-${di}.png" "${di}-system.png"
3723+ fi
3724+ fi
3725+ done
3726+ cd "$current_dir"
3727+done
3728+
3729+# create links (round 1)
3730+#---------------------------------------------------------
3731+
3732+for size in $gtk_stock_sizes; do
3733+ cd "${icon_theme_name}/${size}x${size}"
3734+ for ct in $contexts; do
3735+ echo "size: $size context: $ct"
3736+ mv "stock" "$ct"
3737+ $map_legacy_icons -c "$ct"
3738+ mv $ct "stock"
3739+ done
3740+ cd "$current_dir"
3741+done
3742+
3743+
3744+# create links (round 2)
3745+#---------------------------------------------------------
3746+
3747+for size in $gtk_stock_sizes; do
3748+ cd "${icon_theme_name}/${size}x${size}/stock"
3749+ for icon_file in *.png; do
3750+ [ -s $icon_file ] && ln -s "$icon_file" "$(basename $icon_file .png)"-symbolic.png
3751+ done
3752+ cd "$current_dir"
3753+done
3754+
3755+
3756+# create new index.theme
3757+#---------------------------------------------------------
3758+
3759+dir_list=
3760+for size in $gtk_stock_sizes; do
3761+ dir_list="${dir_list}${size}x${size}/stock,"
3762+done
3763+
3764+cat > "$index_file" <<End-of-message
3765+[Icon Theme]
3766+Name=$icon_theme_name
3767+Inherits=hicolor
3768+Comment=Gtk Stock Icons for Inkscape.app
3769+Example=folder
3770+
3771+# Directory list
3772+Directories=$dir_list
3773+
3774+End-of-message
3775+
3776+for size in $gtk_stock_sizes; do
3777+ cat >> "$index_file" << End-of-message
3778+[${size}x${size}/stock]
3779+Size=${size}
3780+Context=Stock
3781+Type=fixed
3782+
3783+End-of-message
3784+done
3785+
3786+
3787+#---------------------------------------------------------
3788+# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99
3789
3790=== modified file 'packaging/macosx/dmg_background.png'
3791Binary 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
3792=== modified file 'packaging/macosx/dmg_background.svg'
3793--- packaging/macosx/dmg_background.svg 2009-06-21 20:16:49 +0000
3794+++ packaging/macosx/dmg_background.svg 2014-10-14 03:02:11 +0000
3795@@ -10,19 +10,113 @@
3796 xmlns:xlink="http://www.w3.org/1999/xlink"
3797 xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
3798 xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
3799- width="624.54108"
3800- height="350"
3801- id="svg2"
3802- sodipodi:version="0.32"
3803- inkscape:version="0.46+devel r21585 custom"
3804- sodipodi:docname="dmg_background.svg"
3805- version="1.0"
3806- inkscape:export-xdpi="90"
3807- inkscape:export-ydpi="90"
3808- inkscape:output_extension="org.inkscape.output.svg.inkscape"
3809- inkscape:export-filename="./dmg_background.png">
3810+ width="1280"
3811+ height="800"
3812+ id="svg13532"
3813+ version="1.1"
3814+ inkscape:version="0.91pre2 r13554 custom"
3815+ viewBox="0 0 1280 800"
3816+ sodipodi:docname="dmg_background.svg">
3817 <defs
3818- id="defs4">
3819+ id="defs13534">
3820+ <linearGradient
3821+ inkscape:collect="always"
3822+ id="content_bg">
3823+ <stop
3824+ style="stop-color:#eeeeee;stop-opacity:1"
3825+ offset="0"
3826+ id="stop4699" />
3827+ <stop
3828+ style="stop-color:#ffffff;stop-opacity:1"
3829+ offset="1"
3830+ id="stop4701" />
3831+ </linearGradient>
3832+ <linearGradient
3833+ inkscape:collect="always"
3834+ id="header_bg">
3835+ <stop
3836+ style="stop-color:#e6e6e6;stop-opacity:1"
3837+ offset="0"
3838+ id="stop4685" />
3839+ <stop
3840+ id="stop4687"
3841+ offset="0.13333334"
3842+ style="stop-color:#e6e6e6;stop-opacity:1" />
3843+ <stop
3844+ style="stop-color:#ffffff;stop-opacity:1"
3845+ offset="1"
3846+ id="stop4689" />
3847+ </linearGradient>
3848+ <linearGradient
3849+ inkscape:collect="always"
3850+ id="nav_foot">
3851+ <stop
3852+ style="stop-color:#4d4d4d;stop-opacity:1"
3853+ offset="0"
3854+ id="stop4635" />
3855+ <stop
3856+ style="stop-color:#333333;stop-opacity:1"
3857+ offset="1"
3858+ id="stop4637" />
3859+ </linearGradient>
3860+ <linearGradient
3861+ inkscape:collect="always"
3862+ id="nav_top">
3863+ <stop
3864+ style="stop-color:#4d4d4d;stop-opacity:1"
3865+ offset="0"
3866+ id="stop4469" />
3867+ <stop
3868+ style="stop-color:#1a1a1a;stop-opacity:1"
3869+ offset="1"
3870+ id="stop4471" />
3871+ </linearGradient>
3872+ <linearGradient
3873+ gradientUnits="userSpaceOnUse"
3874+ id="linearGradient5785-8-9">
3875+ <stop
3876+ offset="0"
3877+ style="stop-color:#c0cdf9;stop-opacity:1"
3878+ id="stop5787-7-9" />
3879+ <stop
3880+ offset="1"
3881+ style="stop-color:#07092d;stop-opacity:0.28804347"
3882+ id="stop5789-3-7" />
3883+ </linearGradient>
3884+ <linearGradient
3885+ gradientUnits="userSpaceOnUse"
3886+ id="WhiteTransparent-3-90">
3887+ <stop
3888+ offset="0"
3889+ style="stop-color:#ffffff;stop-opacity:1"
3890+ id="stop7606-1-2" />
3891+ <stop
3892+ offset="1"
3893+ style="stop-color:#ffffff;stop-opacity:0"
3894+ id="stop7608-8-0" />
3895+ </linearGradient>
3896+ <linearGradient
3897+ id="linearGradient5793-9-3">
3898+ <stop
3899+ offset="0"
3900+ style="stop-color:#eeeeec;stop-opacity:1"
3901+ id="stop5795-5-7" />
3902+ <stop
3903+ offset="1"
3904+ style="stop-color:#eeeeec;stop-opacity:0"
3905+ id="stop5797-4-8" />
3906+ </linearGradient>
3907+ <linearGradient
3908+ id="linearGradient10981-3-9-0">
3909+ <stop
3910+ offset="0"
3911+ style="stop-color:#729fcf;stop-opacity:1"
3912+ id="stop10983-2-0-9" />
3913+ <stop
3914+ offset="1"
3915+ style="stop-color:#729fcf;stop-opacity:0"
3916+ id="stop10985-3-7-7" />
3917+ </linearGradient>
3918 <linearGradient
3919 inkscape:collect="always"
3920 id="linearGradient5781">
3921@@ -35,833 +129,96 @@
3922 offset="1"
3923 id="stop5785" />
3924 </linearGradient>
3925- <inkscape:perspective
3926- sodipodi:type="inkscape:persp3d"
3927- inkscape:vp_x="0 : 175 : 1"
3928- inkscape:vp_y="0 : 1000 : 0"
3929- inkscape:vp_z="624.54108 : 175 : 1"
3930- inkscape:persp3d-origin="312.27054 : 116.66667 : 1"
3931- id="perspective58" />
3932- <linearGradient
3933- id="linearGradient841">
3934- <stop
3935- id="stop842"
3936- offset="0"
3937- style="stop-color:#62c012;stop-opacity:1;" />
3938- <stop
3939- id="stop843"
3940- offset="1"
3941- style="stop-color:white;stop-opacity:0;" />
3942- </linearGradient>
3943- <linearGradient
3944- inkscape:collect="always"
3945- xlink:href="#linearGradient841"
3946- id="linearGradient4989"
3947- gradientUnits="userSpaceOnUse"
3948- gradientTransform="matrix(4.195695,0,0,1.0590609,48.598964,114.17717)"
3949- x1="76.911163"
3950- y1="25.401896"
3951- x2="76.911163"
3952- y2="137.02844" />
3953- <filter
3954- inkscape:collect="always"
3955- x="-1.0928679"
3956- width="3.1857358"
3957- y="-1.212016"
3958- height="3.424032"
3959- id="filter6362">
3960- <feGaussianBlur
3961- inkscape:collect="always"
3962- stdDeviation="6.9435145"
3963- id="feGaussianBlur6364" />
3964- </filter>
3965- <filter
3966- inkscape:collect="always"
3967- x="-0.27738996"
3968- width="1.5547799"
3969- y="-0.28560414"
3970- height="1.5712083"
3971- id="filter6366">
3972- <feGaussianBlur
3973- inkscape:collect="always"
3974- stdDeviation="6.9435145"
3975- id="feGaussianBlur6368" />
3976- </filter>
3977- <filter
3978- inkscape:collect="always"
3979- x="-0.9599201"
3980- width="2.9198402"
3981- y="-1.2584231"
3982- height="3.5168462"
3983- id="filter6370">
3984- <feGaussianBlur
3985- inkscape:collect="always"
3986- stdDeviation="6.9435145"
3987- id="feGaussianBlur6372" />
3988- </filter>
3989- <filter
3990- inkscape:collect="always"
3991- x="-1.2436028"
3992- width="3.4872055"
3993- y="-1.2664239"
3994- height="3.5328478"
3995- id="filter6374">
3996- <feGaussianBlur
3997- inkscape:collect="always"
3998- stdDeviation="6.9435145"
3999- id="feGaussianBlur6376" />
4000- </filter>
4001- <filter
4002- inkscape:collect="always"
4003- x="-0.016262574"
4004- width="1.0325251"
4005- y="-0.19320738"
4006- height="1.3864148"
4007- id="filter6402">
4008- <feGaussianBlur
4009- inkscape:collect="always"
4010- stdDeviation="1.8499877"
4011- id="feGaussianBlur6404" />
4012- </filter>
4013- <clipPath
4014- clipPathUnits="userSpaceOnUse"
4015- id="clipPath8875">
4016- <path
4017- 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"
4018- 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"
4019- id="path8877" />
4020- </clipPath>
4021- <filter
4022- inkscape:collect="always"
4023- id="filter9015">
4024- <feGaussianBlur
4025- inkscape:collect="always"
4026- stdDeviation="1.755523"
4027- id="feGaussianBlur9017" />
4028- </filter>
4029- <linearGradient
4030- gradientTransform="translate(-130.16572,-83.352786)"
4031- gradientUnits="userSpaceOnUse"
4032- xlink:href="#linearGradient10981-3-9"
4033- id="linearGradient1539"
4034- y2="144.5"
4035- x2="153.70045"
4036- y1="217.5"
4037- x1="180.81293" />
4038- <filter
4039- color-interpolation-filters="sRGB"
4040- id="filter10997-7-2">
4041- <feGaussianBlur
4042- inkscape:collect="always"
4043- stdDeviation="2.7696726"
4044- id="feGaussianBlur10999-0-7" />
4045- </filter>
4046- <linearGradient
4047- id="linearGradient10981-3-9">
4048- <stop
4049- offset="0"
4050- style="stop-color:#729fcf;stop-opacity:1"
4051- id="stop10983-2-0" />
4052- <stop
4053- offset="1"
4054- style="stop-color:#729fcf;stop-opacity:0"
4055- id="stop10985-3-7" />
4056- </linearGradient>
4057- <linearGradient
4058- gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)"
4059- gradientUnits="userSpaceOnUse"
4060- xlink:href="#WhiteTransparent-3"
4061- id="linearGradient5822-7"
4062- y2="187.65974"
4063- x2="82.754066"
4064- y1="180.47572"
4065- x1="73.712105" />
4066- <filter
4067- color-interpolation-filters="sRGB"
4068- id="filter5845-5">
4069- <feGaussianBlur
4070- inkscape:collect="always"
4071- stdDeviation="1.2409356"
4072- id="feGaussianBlur5847-5" />
4073- </filter>
4074- <linearGradient
4075- id="linearGradient5805-9">
4076- <stop
4077- offset="0"
4078- style="stop-color:#ffffff;stop-opacity:1"
4079- id="stop5807-4" />
4080- <stop
4081- offset="1"
4082- style="stop-color:#ffffff;stop-opacity:0"
4083- id="stop5809-9" />
4084- </linearGradient>
4085- <radialGradient
4086- gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)"
4087- gradientUnits="userSpaceOnUse"
4088- xlink:href="#linearGradient5805-9"
4089- id="radialGradient5811-3"
4090- fy="214.55121"
4091- fx="181.22731"
4092- r="22.466398"
4093- cy="214.55121"
4094- cx="181.22731" />
4095- <linearGradient
4096- id="linearGradient5793-9">
4097- <stop
4098- offset="0"
4099- style="stop-color:#eeeeec;stop-opacity:1"
4100- id="stop5795-5" />
4101- <stop
4102- offset="1"
4103- style="stop-color:#eeeeec;stop-opacity:0"
4104- id="stop5797-4" />
4105- </linearGradient>
4106- <linearGradient
4107- gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)"
4108- gradientUnits="userSpaceOnUse"
4109- xlink:href="#linearGradient5793-9"
4110- id="linearGradient5801-2"
4111- y2="84.480316"
4112- x2="53.63158"
4113- y1="76.246338"
4114- x1="57.225197" />
4115- <filter
4116- color-interpolation-filters="sRGB"
4117- id="filter5983-8"
4118- x="-0.082508981"
4119- width="1.165018"
4120- y="-0.12233575"
4121- height="1.2446715">
4122- <feGaussianBlur
4123- inkscape:collect="always"
4124- stdDeviation="3.6868363"
4125- id="feGaussianBlur5985-3" />
4126- </filter>
4127- <linearGradient
4128- id="linearGradient5899-9">
4129- <stop
4130- offset="0"
4131- style="stop-color:#ffffff;stop-opacity:1"
4132- id="stop5901-9" />
4133- <stop
4134- offset="1"
4135- style="stop-color:#ffffff;stop-opacity:0"
4136- id="stop5903-3" />
4137- </linearGradient>
4138- <linearGradient
4139- gradientUnits="userSpaceOnUse"
4140- xlink:href="#linearGradient5899-9"
4141- id="linearGradient5905-4"
4142- y2="223.5"
4143- x2="153.5"
4144- y1="208.16444"
4145- x1="95.5" />
4146- <filter
4147- color-interpolation-filters="sRGB"
4148- id="filter9298-4">
4149- <feGaussianBlur
4150- inkscape:collect="always"
4151- stdDeviation="0.32610678"
4152- id="feGaussianBlur9300-4" />
4153- </filter>
4154- <linearGradient
4155- id="linearGradient9286-3">
4156- <stop
4157- offset="0"
4158- style="stop-color:#ffffff;stop-opacity:1"
4159- id="stop9288-9" />
4160- <stop
4161- offset="1"
4162- style="stop-color:#ffffff;stop-opacity:0"
4163- id="stop9290-2" />
4164- </linearGradient>
4165- <radialGradient
4166- gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)"
4167- gradientUnits="userSpaceOnUse"
4168- xlink:href="#linearGradient9286-3"
4169- id="radialGradient11553-3"
4170- fy="21.225746"
4171- fx="68.39994"
4172- r="54.783398"
4173- cy="21.225746"
4174- cx="68.39994" />
4175- <filter
4176- color-interpolation-filters="sRGB"
4177- id="filter9068-2"
4178- x="-0.076179281"
4179- width="1.1523587"
4180- y="-0.1655701"
4181- height="1.3311402">
4182- <feGaussianBlur
4183- inkscape:collect="always"
4184- stdDeviation="0.66458488"
4185- id="feGaussianBlur9070-7" />
4186- </filter>
4187- <linearGradient
4188- id="linearGradient9040-4">
4189- <stop
4190- offset="0"
4191- style="stop-color:#ffffff;stop-opacity:1"
4192- id="stop9042-3" />
4193- <stop
4194- offset="1"
4195- style="stop-color:#ffffff;stop-opacity:0"
4196- id="stop9044-7" />
4197- </linearGradient>
4198- <radialGradient
4199- gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)"
4200- gradientUnits="userSpaceOnUse"
4201- xlink:href="#linearGradient9040-4"
4202- id="radialGradient9046-1"
4203- fy="230.83626"
4204- fx="90.28125"
4205- r="10.46875"
4206- cy="230.83626"
4207- cx="90.28125" />
4208- <linearGradient
4209- gradientUnits="userSpaceOnUse"
4210- xlink:href="#linearGradient8866-0"
4211- id="linearGradient9025-1"
4212- y2="200.07138"
4213- x2="231.37646"
4214- y1="195.62132"
4215- x1="231.37646" />
4216- <linearGradient
4217- gradientUnits="userSpaceOnUse"
4218- xlink:href="#linearGradient8866-0"
4219- id="linearGradient9023-6"
4220- y2="201.5"
4221- x2="231.75"
4222- y1="195.1875"
4223- x1="231.625" />
4224- <linearGradient
4225- id="linearGradient8998-5">
4226- <stop
4227- offset="0"
4228- style="stop-color:#ffffff;stop-opacity:0.33004925"
4229- id="stop9000-9" />
4230- <stop
4231- offset="1"
4232- style="stop-color:#ffffff;stop-opacity:0"
4233- id="stop9002-5" />
4234- </linearGradient>
4235- <radialGradient
4236- gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)"
4237- gradientUnits="userSpaceOnUse"
4238- xlink:href="#linearGradient8998-5"
4239- id="radialGradient9004-6"
4240- fy="187.86935"
4241- fx="89.875"
4242- r="22.75"
4243- cy="187.86935"
4244- cx="89.875" />
4245- <radialGradient
4246- gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
4247- gradientUnits="userSpaceOnUse"
4248- xlink:href="#linearGradient8916-4"
4249- id="radialGradient8994-0"
4250- fy="204.83229"
4251- fx="228.21875"
4252- r="14.09375"
4253- cy="204.83229"
4254- cx="228.21875" />
4255- <linearGradient
4256- gradientUnits="userSpaceOnUse"
4257- xlink:href="#linearGradient8866-0"
4258- id="linearGradient8992-2"
4259- y2="200.07138"
4260- x2="231.37646"
4261- y1="195.62132"
4262- x1="231.37646" />
4263- <linearGradient
4264- gradientUnits="userSpaceOnUse"
4265- xlink:href="#linearGradient8866-0"
4266- id="linearGradient8990-4"
4267- y2="201.5"
4268- x2="231.75"
4269- y1="195.1875"
4270- x1="231.625" />
4271- <filter
4272- color-interpolation-filters="sRGB"
4273- id="filter8980-1"
4274- x="-0.069862768"
4275- width="1.1397254"
4276- y="-0.47285891"
4277- height="1.9457178">
4278- <feGaussianBlur
4279- inkscape:collect="always"
4280- stdDeviation="0.82052366"
4281- id="feGaussianBlur8982-9" />
4282- </filter>
4283- <linearGradient
4284- id="linearGradient8916-4">
4285- <stop
4286- offset="0"
4287- style="stop-color:#ffffff;stop-opacity:1"
4288- id="stop8918-9" />
4289- <stop
4290- offset="1"
4291- style="stop-color:#ffffff;stop-opacity:0"
4292- id="stop8920-9" />
4293- </linearGradient>
4294- <radialGradient
4295- gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
4296- gradientUnits="userSpaceOnUse"
4297- xlink:href="#linearGradient8916-4"
4298- id="radialGradient8922-9"
4299- fy="204.83229"
4300- fx="228.21875"
4301- r="14.09375"
4302- cy="204.83229"
4303- cx="228.21875" />
4304- <filter
4305- color-interpolation-filters="sRGB"
4306- id="filter8906-3"
4307- x="-0.085441329"
4308- width="1.1708827"
4309- y="-0.27823201"
4310- height="1.556464">
4311- <feGaussianBlur
4312- inkscape:collect="always"
4313- stdDeviation="0.56515877"
4314- id="feGaussianBlur8908-7" />
4315- </filter>
4316- <linearGradient
4317- gradientUnits="userSpaceOnUse"
4318- xlink:href="#linearGradient8866-0"
4319- id="linearGradient8910-3"
4320- y2="200.07138"
4321- x2="231.37646"
4322- y1="195.62132"
4323- x1="231.37646" />
4324- <linearGradient
4325- id="linearGradient8866-0">
4326- <stop
4327- offset="0"
4328- style="stop-color:#ffffff;stop-opacity:1"
4329- id="stop8868-3" />
4330- <stop
4331- offset="1"
4332- style="stop-color:#ffffff;stop-opacity:0"
4333- id="stop8870-0" />
4334- </linearGradient>
4335- <linearGradient
4336- gradientUnits="userSpaceOnUse"
4337- xlink:href="#linearGradient8866-0"
4338- id="linearGradient8912-9"
4339- y2="201.5"
4340- x2="231.75"
4341- y1="195.1875"
4342- x1="231.625" />
4343- <filter
4344- color-interpolation-filters="sRGB"
4345- id="filter8764-9"
4346- x="-0.074262142"
4347- width="1.1485243"
4348- y="-0.1754123"
4349- height="1.3508246">
4350- <feGaussianBlur
4351- inkscape:collect="always"
4352- stdDeviation="2.1195652"
4353- id="feGaussianBlur8766-2" />
4354- </filter>
4355- <radialGradient
4356- gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
4357- gradientUnits="userSpaceOnUse"
4358- xlink:href="#linearGradient8738-4"
4359- id="radialGradient8768-6"
4360- fy="182.08189"
4361- fx="217.5"
4362- r="34.25"
4363- cy="182.08189"
4364- cx="217.5" />
4365- <linearGradient
4366- id="linearGradient8738-4">
4367- <stop
4368- offset="0"
4369- style="stop-color:#ffffff;stop-opacity:1"
4370- id="stop8740-8" />
4371- <stop
4372- offset="1"
4373- style="stop-color:#ffffff;stop-opacity:0"
4374- id="stop8742-4" />
4375- </linearGradient>
4376- <radialGradient
4377- gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
4378- gradientUnits="userSpaceOnUse"
4379- xlink:href="#linearGradient8738-4"
4380- id="radialGradient8744-9"
4381- fy="168.5"
4382- fx="210.25"
4383- r="34.25"
4384- cy="168.5"
4385- cx="210.25" />
4386- <filter
4387- color-interpolation-filters="sRGB"
4388- id="filter8732-3"
4389- x="-0.078079157"
4390- width="1.1561583"
4391- y="-0.11422065"
4392- height="1.2284414">
4393- <feGaussianBlur
4394- inkscape:collect="always"
4395- stdDeviation="1.9579068"
4396- id="feGaussianBlur8734-5" />
4397- </filter>
4398- <radialGradient
4399- gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)"
4400- gradientUnits="userSpaceOnUse"
4401- xlink:href="#linearGradient8568-7"
4402- id="radialGradient8574-0"
4403- fy="251.99396"
4404- fx="132.44434"
4405- r="30.599579"
4406- cy="251.99396"
4407- cx="132.44434" />
4408- <linearGradient
4409- id="linearGradient8568-7">
4410- <stop
4411- offset="0"
4412- style="stop-color:#ffffff;stop-opacity:1"
4413- id="stop8570-9" />
4414- <stop
4415- offset="1"
4416- style="stop-color:#ffffff;stop-opacity:0"
4417- id="stop8572-1" />
4418- </linearGradient>
4419- <radialGradient
4420- gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)"
4421- gradientUnits="userSpaceOnUse"
4422- xlink:href="#linearGradient8568-7"
4423- id="radialGradient9177-1"
4424- fy="250.89737"
4425- fx="116.31038"
4426- r="30.599579"
4427- cy="250.89737"
4428- cx="116.31038" />
4429- <linearGradient
4430- gradientUnits="userSpaceOnUse"
4431- xlink:href="#WhiteTransparent-3"
4432- id="IcecapTip-0"
4433- y2="50"
4434- x2="90"
4435- y1="20"
4436- x1="60" />
4437- <linearGradient
4438- gradientUnits="userSpaceOnUse"
4439- id="WhiteTransparent-3">
4440- <stop
4441- offset="0"
4442- style="stop-color:#ffffff;stop-opacity:1"
4443- id="stop7606-1" />
4444- <stop
4445- offset="1"
4446- style="stop-color:#ffffff;stop-opacity:0"
4447- id="stop7608-8" />
4448- </linearGradient>
4449- <linearGradient
4450- gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)"
4451- gradientUnits="userSpaceOnUse"
4452- xlink:href="#WhiteTransparent-3"
4453- id="shinySpecular-0"
4454- y2="60"
4455- x2="58"
4456- y1="35"
4457- x1="33" />
4458- <filter
4459- color-interpolation-filters="sRGB"
4460- id="filter8490-0">
4461- <feGaussianBlur
4462- inkscape:collect="always"
4463- stdDeviation="2.4163949"
4464- id="feGaussianBlur8492-5" />
4465- </filter>
4466- <clipPath
4467- id="clipPath9086-1">
4468- <use
4469- xlink:href="#outline1"
4470- height="300"
4471- width="400"
4472- y="0"
4473- x="0"
4474- style="opacity:0.25;fill:#ffffff;fill-opacity:1"
4475- id="use9088-0"
4476- transform="translate(1.0095461e-6,0)" />
4477- </clipPath>
4478- <linearGradient
4479- gradientUnits="userSpaceOnUse"
4480- id="linearGradient5785-8">
4481- <stop
4482- offset="0"
4483- style="stop-color:#c0cdf9;stop-opacity:1"
4484- id="stop5787-7" />
4485- <stop
4486- offset="1"
4487- style="stop-color:#07092d;stop-opacity:0.28804347"
4488- id="stop5789-3" />
4489- </linearGradient>
4490- <linearGradient
4491- gradientUnits="userSpaceOnUse"
4492- xlink:href="#linearGradient5785-8"
4493- id="linearGradient9175-3"
4494- y2="40"
4495- x2="60"
4496- y1="20"
4497- x1="82.118591" />
4498- <filter
4499- color-interpolation-filters="sRGB"
4500- id="filter6031-0">
4501- <feGaussianBlur
4502- inkscape:collect="always"
4503- stdDeviation="3.4903482"
4504- id="feGaussianBlur6033-8" />
4505- </filter>
4506- <filter
4507- color-interpolation-filters="sRGB"
4508- id="filter6017-3">
4509- <feGaussianBlur
4510- inkscape:collect="always"
4511- stdDeviation="0.80546496"
4512- id="feGaussianBlur6019-9" />
4513- </filter>
4514- <filter
4515- color-interpolation-filters="sRGB"
4516- id="filter8490">
4517- <feGaussianBlur
4518- inkscape:collect="always"
4519- stdDeviation="2.4163949"
4520- id="feGaussianBlur8492" />
4521- </filter>
4522- <linearGradient
4523- gradientUnits="userSpaceOnUse"
4524- id="linearGradient5785">
4525- <stop
4526- offset="0"
4527- style="stop-color:#c0cdf9;stop-opacity:1"
4528- id="stop5787" />
4529- <stop
4530- offset="1"
4531- style="stop-color:#07092d;stop-opacity:0.28804347"
4532- id="stop5789" />
4533- </linearGradient>
4534- <linearGradient
4535- gradientUnits="userSpaceOnUse"
4536- xlink:href="#linearGradient5785"
4537+ <linearGradient
4538+ gradientUnits="userSpaceOnUse"
4539+ xlink:href="#linearGradient5785-8-9"
4540 id="linearGradient9175"
4541 y2="40"
4542 x2="60"
4543 y1="20"
4544 x1="82.118591" />
4545 <clipPath
4546- id="clipoutline1">
4547+ id="clipoutline1-8">
4548 <path
4549- id="outline1"
4550+ id="outline1-2"
4551 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" />
4552 </clipPath>
4553- <linearGradient
4554- gradientUnits="userSpaceOnUse"
4555- xlink:href="#WhiteTransparent"
4556- id="sideSpecular"
4557- y2="40"
4558- x2="60"
4559- y1="20"
4560- x1="80" />
4561- <linearGradient
4562- gradientUnits="userSpaceOnUse"
4563- xlink:href="#WhiteTransparent"
4564- id="liquidSpecular"
4565- y2="76"
4566- x2="0"
4567- y1="128"
4568- x1="0" />
4569- <linearGradient
4570- gradientUnits="userSpaceOnUse"
4571- id="WhiteTransparent">
4572- <stop
4573- offset="0"
4574- style="stop-color:#ffffff;stop-opacity:1"
4575- id="stop7" />
4576- <stop
4577- offset="1"
4578- style="stop-color:#ffffff;stop-opacity:0"
4579- id="stop9" />
4580- </linearGradient>
4581- <inkscape:perspective
4582- id="perspective3208"
4583- inkscape:persp3d-origin="64 : 42.666667 : 1"
4584- inkscape:vp_z="128 : 64 : 1"
4585- inkscape:vp_y="0 : 1000 : 0"
4586- inkscape:vp_x="0 : 64 : 1"
4587- sodipodi:type="inkscape:persp3d" />
4588- <inkscape:perspective
4589- id="perspective3354"
4590- inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
4591- inkscape:vp_z="1 : 0.5 : 1"
4592- inkscape:vp_y="0 : 1000 : 0"
4593- inkscape:vp_x="0 : 0.5 : 1"
4594- sodipodi:type="inkscape:persp3d" />
4595 <filter
4596 color-interpolation-filters="sRGB"
4597 id="filter6017-3-7">
4598 <feGaussianBlur
4599 inkscape:collect="always"
4600 stdDeviation="0.80546496"
4601- id="feGaussianBlur6019-9-6" />
4602+ id="feGaussianBlur6019-9-28" />
4603 </filter>
4604 <filter
4605 color-interpolation-filters="sRGB"
4606- id="filter6031-0-4">
4607+ id="filter6031-0-56">
4608 <feGaussianBlur
4609 inkscape:collect="always"
4610 stdDeviation="3.4903482"
4611- id="feGaussianBlur6033-8-3" />
4612+ id="feGaussianBlur6033-8-49" />
4613 </filter>
4614- <linearGradient
4615- gradientUnits="userSpaceOnUse"
4616- xlink:href="#linearGradient5785-8-3"
4617- id="linearGradient9175-3-0"
4618- y2="40"
4619- x2="60"
4620- y1="20"
4621- x1="82.118591" />
4622- <linearGradient
4623- gradientUnits="userSpaceOnUse"
4624- id="linearGradient5785-8-3">
4625- <stop
4626- offset="0"
4627- style="stop-color:#c0cdf9;stop-opacity:1"
4628- id="stop5787-7-0" />
4629- <stop
4630- offset="1"
4631- style="stop-color:#07092d;stop-opacity:0.28804347"
4632- id="stop5789-3-9" />
4633- </linearGradient>
4634 <clipPath
4635- id="clipPath9086-1-2">
4636+ id="clipPath9086-1-5">
4637 <use
4638- xlink:href="#outline1"
4639+ xlink:href="#outline1-2"
4640 height="300"
4641 width="400"
4642 y="0"
4643 x="0"
4644 style="opacity:0.25;fill:#ffffff;fill-opacity:1"
4645- id="use9088-0-5"
4646+ id="use9088-0-9"
4647 transform="translate(1.0095461e-6,0)" />
4648 </clipPath>
4649 <filter
4650 color-interpolation-filters="sRGB"
4651- id="filter8490-0-4">
4652+ id="filter8490-0-0">
4653 <feGaussianBlur
4654 inkscape:collect="always"
4655 stdDeviation="2.4163949"
4656 id="feGaussianBlur8492-5-0" />
4657 </filter>
4658 <linearGradient
4659- gradientUnits="userSpaceOnUse"
4660- xlink:href="#linearGradient5785-8-3"
4661- id="linearGradient3370"
4662- y2="40"
4663- x2="60"
4664- y1="20"
4665- x1="82.118591" />
4666- <linearGradient
4667- gradientUnits="userSpaceOnUse"
4668- id="linearGradient3372">
4669- <stop
4670- offset="0"
4671- style="stop-color:#c0cdf9;stop-opacity:1"
4672- id="stop3374" />
4673- <stop
4674- offset="1"
4675- style="stop-color:#07092d;stop-opacity:0.28804347"
4676- id="stop3376" />
4677- </linearGradient>
4678- <linearGradient
4679 gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)"
4680 gradientUnits="userSpaceOnUse"
4681- xlink:href="#WhiteTransparent-3-9"
4682- id="shinySpecular-0-5"
4683+ xlink:href="#WhiteTransparent-3-90"
4684+ id="shinySpecular-0-4"
4685 y2="60"
4686 x2="58"
4687 y1="35"
4688 x1="33" />
4689 <linearGradient
4690 gradientUnits="userSpaceOnUse"
4691- id="WhiteTransparent-3-9">
4692- <stop
4693- offset="0"
4694- style="stop-color:#ffffff;stop-opacity:1"
4695- id="stop7606-1-4" />
4696- <stop
4697- offset="1"
4698- style="stop-color:#ffffff;stop-opacity:0"
4699- id="stop7608-8-6" />
4700- </linearGradient>
4701- <linearGradient
4702- gradientUnits="userSpaceOnUse"
4703- xlink:href="#WhiteTransparent-3-9"
4704- id="IcecapTip-0-9"
4705+ xlink:href="#WhiteTransparent-3-90"
4706+ id="IcecapTip-0-3"
4707 y2="50"
4708 x2="90"
4709 y1="20"
4710 x1="60" />
4711- <linearGradient
4712- gradientUnits="userSpaceOnUse"
4713- id="linearGradient3383">
4714- <stop
4715- offset="0"
4716- style="stop-color:#ffffff;stop-opacity:1"
4717- id="stop3385" />
4718- <stop
4719- offset="1"
4720- style="stop-color:#ffffff;stop-opacity:0"
4721- id="stop3387" />
4722- </linearGradient>
4723 <radialGradient
4724 gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)"
4725 gradientUnits="userSpaceOnUse"
4726- xlink:href="#linearGradient8568-7-2"
4727- id="radialGradient9177-1-2"
4728+ xlink:href="#WhiteTransparent-3-90"
4729+ id="radialGradient9177-1-7"
4730 fy="250.89737"
4731 fx="116.31038"
4732 r="30.599579"
4733 cy="250.89737"
4734 cx="116.31038" />
4735- <linearGradient
4736- id="linearGradient8568-7-2">
4737- <stop
4738- offset="0"
4739- style="stop-color:#ffffff;stop-opacity:1"
4740- id="stop8570-9-4" />
4741- <stop
4742- offset="1"
4743- style="stop-color:#ffffff;stop-opacity:0"
4744- id="stop8572-1-7" />
4745- </linearGradient>
4746 <radialGradient
4747 gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)"
4748 gradientUnits="userSpaceOnUse"
4749- xlink:href="#linearGradient8568-7-2"
4750- id="radialGradient8574-0-7"
4751+ xlink:href="#WhiteTransparent-3-90"
4752+ id="radialGradient8574-0-1"
4753 fy="251.99396"
4754 fx="132.44434"
4755 r="30.599579"
4756 cy="251.99396"
4757 cx="132.44434" />
4758- <linearGradient
4759- id="linearGradient3394">
4760- <stop
4761- offset="0"
4762- style="stop-color:#ffffff;stop-opacity:1"
4763- id="stop3396" />
4764- <stop
4765- offset="1"
4766- style="stop-color:#ffffff;stop-opacity:0"
4767- id="stop3398" />
4768- </linearGradient>
4769 <filter
4770 color-interpolation-filters="sRGB"
4771- id="filter8732-3-5"
4772+ id="filter8732-3-8"
4773 x="-0.078079157"
4774 width="1.1561583"
4775 y="-0.11422065"
4776@@ -869,50 +226,28 @@
4777 <feGaussianBlur
4778 inkscape:collect="always"
4779 stdDeviation="1.9579068"
4780- id="feGaussianBlur8734-5-4" />
4781+ id="feGaussianBlur8734-5-0" />
4782 </filter>
4783 <radialGradient
4784 gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
4785 gradientUnits="userSpaceOnUse"
4786- xlink:href="#linearGradient8738-4-1"
4787- id="radialGradient8744-9-8"
4788+ xlink:href="#WhiteTransparent-3-90"
4789+ id="radialGradient8744-9-7"
4790 fy="168.5"
4791 fx="210.25"
4792 r="34.25"
4793 cy="168.5"
4794 cx="210.25" />
4795- <linearGradient
4796- id="linearGradient8738-4-1">
4797- <stop
4798- offset="0"
4799- style="stop-color:#ffffff;stop-opacity:1"
4800- id="stop8740-8-2" />
4801- <stop
4802- offset="1"
4803- style="stop-color:#ffffff;stop-opacity:0"
4804- id="stop8742-4-8" />
4805- </linearGradient>
4806 <radialGradient
4807 gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)"
4808 gradientUnits="userSpaceOnUse"
4809- xlink:href="#linearGradient8738-4-1"
4810- id="radialGradient8768-6-9"
4811+ xlink:href="#WhiteTransparent-3-90"
4812+ id="radialGradient8768-6-2"
4813 fy="182.08189"
4814 fx="217.5"
4815 r="34.25"
4816 cy="182.08189"
4817 cx="217.5" />
4818- <linearGradient
4819- id="linearGradient3407">
4820- <stop
4821- offset="0"
4822- style="stop-color:#ffffff;stop-opacity:1"
4823- id="stop3409" />
4824- <stop
4825- offset="1"
4826- style="stop-color:#ffffff;stop-opacity:0"
4827- id="stop3411" />
4828- </linearGradient>
4829 <filter
4830 color-interpolation-filters="sRGB"
4831 id="filter8764-9-3"
4832@@ -923,49 +258,27 @@
4833 <feGaussianBlur
4834 inkscape:collect="always"
4835 stdDeviation="2.1195652"
4836- id="feGaussianBlur8766-2-6" />
4837+ id="feGaussianBlur8766-2-4" />
4838 </filter>
4839 <linearGradient
4840 gradientUnits="userSpaceOnUse"
4841- xlink:href="#linearGradient8866-0-0"
4842- id="linearGradient8912-9-8"
4843+ xlink:href="#WhiteTransparent-3-90"
4844+ id="linearGradient8912-9-9"
4845 y2="201.5"
4846 x2="231.75"
4847 y1="195.1875"
4848 x1="231.625" />
4849 <linearGradient
4850- id="linearGradient8866-0-0">
4851- <stop
4852- offset="0"
4853- style="stop-color:#ffffff;stop-opacity:1"
4854- id="stop8868-3-2" />
4855- <stop
4856- offset="1"
4857- style="stop-color:#ffffff;stop-opacity:0"
4858- id="stop8870-0-1" />
4859- </linearGradient>
4860- <linearGradient
4861 gradientUnits="userSpaceOnUse"
4862- xlink:href="#linearGradient8866-0-0"
4863- id="linearGradient8910-3-0"
4864+ xlink:href="#WhiteTransparent-3-90"
4865+ id="linearGradient8910-3-8"
4866 y2="200.07138"
4867 x2="231.37646"
4868 y1="195.62132"
4869 x1="231.37646" />
4870- <linearGradient
4871- id="linearGradient3420">
4872- <stop
4873- offset="0"
4874- style="stop-color:#ffffff;stop-opacity:1"
4875- id="stop3422" />
4876- <stop
4877- offset="1"
4878- style="stop-color:#ffffff;stop-opacity:0"
4879- id="stop3424" />
4880- </linearGradient>
4881 <filter
4882 color-interpolation-filters="sRGB"
4883- id="filter8906-3-5"
4884+ id="filter8906-3-4"
4885 x="-0.085441329"
4886 width="1.1708827"
4887 y="-0.27823201"
4888@@ -973,32 +286,21 @@
4889 <feGaussianBlur
4890 inkscape:collect="always"
4891 stdDeviation="0.56515877"
4892- id="feGaussianBlur8908-7-1" />
4893+ id="feGaussianBlur8908-7-88" />
4894 </filter>
4895 <radialGradient
4896 gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
4897 gradientUnits="userSpaceOnUse"
4898- xlink:href="#linearGradient8916-4-0"
4899- id="radialGradient8922-9-1"
4900+ xlink:href="#WhiteTransparent-3-90"
4901+ id="radialGradient8922-9-3"
4902 fy="204.83229"
4903 fx="228.21875"
4904 r="14.09375"
4905 cy="204.83229"
4906 cx="228.21875" />
4907- <linearGradient
4908- id="linearGradient8916-4-0">
4909- <stop
4910- offset="0"
4911- style="stop-color:#ffffff;stop-opacity:1"
4912- id="stop8918-9-8" />
4913- <stop
4914- offset="1"
4915- style="stop-color:#ffffff;stop-opacity:0"
4916- id="stop8920-9-5" />
4917- </linearGradient>
4918 <filter
4919 color-interpolation-filters="sRGB"
4920- id="filter8980-1-0"
4921+ id="filter8980-1-63"
4922 x="-0.069862768"
4923 width="1.1397254"
4924 y="-0.47285891"
4925@@ -1010,182 +312,69 @@
4926 </filter>
4927 <linearGradient
4928 gradientUnits="userSpaceOnUse"
4929- xlink:href="#linearGradient8866-0-0"
4930- id="linearGradient8990-4-4"
4931+ xlink:href="#WhiteTransparent-3-90"
4932+ id="linearGradient8990-4-8"
4933 y2="201.5"
4934 x2="231.75"
4935 y1="195.1875"
4936 x1="231.625" />
4937 <linearGradient
4938- id="linearGradient3435">
4939- <stop
4940- offset="0"
4941- style="stop-color:#ffffff;stop-opacity:1"
4942- id="stop3437" />
4943- <stop
4944- offset="1"
4945- style="stop-color:#ffffff;stop-opacity:0"
4946- id="stop3439" />
4947- </linearGradient>
4948- <linearGradient
4949 gradientUnits="userSpaceOnUse"
4950- xlink:href="#linearGradient8866-0-0"
4951- id="linearGradient8992-2-6"
4952+ xlink:href="#WhiteTransparent-3-90"
4953+ id="linearGradient8992-2-5"
4954 y2="200.07138"
4955 x2="231.37646"
4956 y1="195.62132"
4957 x1="231.37646" />
4958- <linearGradient
4959- id="linearGradient3442">
4960- <stop
4961- offset="0"
4962- style="stop-color:#ffffff;stop-opacity:1"
4963- id="stop3444" />
4964- <stop
4965- offset="1"
4966- style="stop-color:#ffffff;stop-opacity:0"
4967- id="stop3446" />
4968- </linearGradient>
4969- <filter
4970- color-interpolation-filters="sRGB"
4971- id="filter3448"
4972- x="-0.085441329"
4973- width="1.1708827"
4974- y="-0.27823201"
4975- height="1.556464">
4976- <feGaussianBlur
4977- inkscape:collect="always"
4978- stdDeviation="0.56515877"
4979- id="feGaussianBlur3450" />
4980- </filter>
4981 <radialGradient
4982 gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)"
4983 gradientUnits="userSpaceOnUse"
4984- xlink:href="#linearGradient8916-4-0"
4985- id="radialGradient8994-0-2"
4986+ xlink:href="#WhiteTransparent-3-90"
4987+ id="radialGradient8994-0-8"
4988 fy="204.83229"
4989 fx="228.21875"
4990 r="14.09375"
4991 cy="204.83229"
4992 cx="228.21875" />
4993- <linearGradient
4994- id="linearGradient3453">
4995- <stop
4996- offset="0"
4997- style="stop-color:#ffffff;stop-opacity:1"
4998- id="stop3455" />
4999- <stop
5000- offset="1"
The diff has been truncated for viewing.