diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-16 23:36:32 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-16 23:36:32 +0000 |
| commit | b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8 (patch) | |
| tree | 7d37d088e9179f631f22143a980157da49a331a9 | |
| parent | Removed dangerous GTK-mimicking macros. (diff) | |
| parent | update to trunk (r13610) (diff) | |
| download | inkscape-b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8.tar.gz inkscape-b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8.zip | |
Merge in osx-packaging-update branch. OS X packaging now works correctly for trunk.
(bzr r13620)
349 files changed, 6688 insertions, 4390 deletions
diff --git a/.bzrignore b/.bzrignore index 107ffc16a..c85c5284f 100644 --- a/.bzrignore +++ b/.bzrignore @@ -219,3 +219,8 @@ Inkscape.creator Inkscape.creator.user Inkscape.files Inkscape.includes +# osxapp (X11) +build-osxapp +inst-osxapp +packaging/macosx/ScriptExec/build +packaging/macosx/Inkscape.app diff --git a/Info.plist.in b/Info.plist.in index 096557c67..6667f6fc2 100644 --- a/Info.plist.in +++ b/Info.plist.in @@ -328,9 +328,13 @@ <string>Inks</string> <key>CFBundleVersion</key> <string>@VERSION@</string> - <key>NSHumanReadableCopyright</key> - <string>Copyright 2009 Inkscape Developers, GNU General Public License.</string> + <key>CGDisableCoalescedUpdates</key> + <false/> + <key>LSApplicationCategoryType</key> + <string>public.app-category.graphics-design</string> <key>LSMinimumSystemVersion</key> - <string>10.3</string> + <string>10.5</string> + <key>NSHumanReadableCopyright</key> + <string>Copyright 2014 Inkscape Developers, GNU General Public License.</string> </dict> </plist> diff --git a/Makefile.am b/Makefile.am index 1ed5e4d0f..7745f0dc3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,71 +102,365 @@ EXTRA_DIST = \ cxxtest/cxxtest/X11Gui.h \ cxxtest/cxxtest/YesNoRunner.h \ packaging/autopackage/default.apspec.in \ - packaging/macosx/dmg_background.png \ - packaging/macosx/inkscape.ds_store \ - packaging/macosx/osx-app.sh \ - packaging/macosx/osx-dmg.sh \ - packaging/macosx/osx-build.sh \ - packaging/macosx/Resources/MenuBar.nib/classes.nib \ - packaging/macosx/Resources/MenuBar.nib/info.nib \ - packaging/macosx/Resources/MenuBar.nib/objects.xib \ + packaging/macosx/README.txt \ + packaging/macosx/Resources/Inkscape.icns \ + packaging/macosx/Resources/MenuBar.nib/classes.nib \ + packaging/macosx/Resources/MenuBar.nib/info.nib \ + packaging/macosx/Resources/MenuBar.nib/objects.xib \ + packaging/macosx/Resources/ProgressWindow.nib/classes.nib \ + packaging/macosx/Resources/ProgressWindow.nib/info.nib \ + packaging/macosx/Resources/ProgressWindow.nib/objects.xib \ + packaging/macosx/Resources/alert_fccache.sh \ packaging/macosx/Resources/application-gimp-gradient.icns \ - packaging/macosx/Resources/application-vnd.ms.xaml.icns \ - packaging/macosx/Resources/image-vnd.sk1.icns \ + packaging/macosx/Resources/application-illustrator-svg.icns \ packaging/macosx/Resources/application-illustrator.icns \ - packaging/macosx/Resources/application-vnd.corel-draw.icns \ - packaging/macosx/Resources/image-x-eps.icns \ - packaging/macosx/Resources/Inkscape.icns \ - packaging/macosx/Resources/image-vnd.dxf.icns \ - packaging/macosx/Resources/image-svg+xml-compressed.icns \ packaging/macosx/Resources/application-pdf.icns \ - packaging/macosx/Resources/application-vnd.corel-draw-template.icns \ packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns \ + packaging/macosx/Resources/application-vnd.corel-draw-template.icns \ + packaging/macosx/Resources/application-vnd.corel-draw.icns \ + packaging/macosx/Resources/application-vnd.ms.xaml.icns \ + packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \ + packaging/macosx/Resources/bin/gimp-wrapper.sh \ + packaging/macosx/Resources/bin/inkscape \ + packaging/macosx/Resources/bin/python-wrapper.sh \ + packaging/macosx/Resources/etc/fonts/fonts.conf \ + packaging/macosx/Resources/etc/gtk-2.0/gtkrc \ + packaging/macosx/Resources/image-svg+xml-compressed.icns \ packaging/macosx/Resources/image-svg+xml.icns \ + packaging/macosx/Resources/image-vnd.dxf.icns \ + packaging/macosx/Resources/image-vnd.sk1.icns \ packaging/macosx/Resources/image-vnd.windows-metafile.icns \ + packaging/macosx/Resources/image-x-eps.icns \ packaging/macosx/Resources/image-x-ps.icns \ - packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns \ - packaging/macosx/Resources/application-illustrator-svg.icns \ - packaging/macosx/Resources/openDoc \ - packaging/macosx/Resources/script \ - packaging/macosx/Resources/ProgressWindow.nib/classes.nib \ - packaging/macosx/Resources/ProgressWindow.nib/info.nib \ - packaging/macosx/Resources/ProgressWindow.nib/objects.xib \ - packaging/macosx/Resources/bin/getdisplay.sh \ - packaging/macosx/Resources/bin/inkscape \ - packaging/macosx/Resources/etc/fonts/fonts.conf \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png \ - packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png \ - packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \ - packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \ - packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \ - packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \ - packaging/macosx/ScriptExec/Info.plist \ - packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \ - packaging/macosx/ScriptExec/main.c \ - packaging/macosx/ScriptExec/openDoc \ - packaging/macosx/ScriptExec/script \ - packaging/macosx/ScriptExec/version.plist \ - packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \ - packaging/macosx/ScriptExec/MenuBar.nib/info.nib \ - packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \ - packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj \ + packaging/macosx/Resources/openDoc \ + packaging/macosx/Resources/script \ + packaging/macosx/Resources/xdg_setup.sh \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png \ + packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png \ + packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings \ + packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib \ + packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib \ + packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib \ + packaging/macosx/ScriptExec/Info.plist \ + packaging/macosx/ScriptExec/MenuBar.nib/classes.nib \ + packaging/macosx/ScriptExec/MenuBar.nib/info.nib \ + packaging/macosx/ScriptExec/MenuBar.nib/objects.xib \ packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj \ + packaging/macosx/ScriptExec/ScriptExec_Prefix.pch \ + packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh \ + packaging/macosx/ScriptExec/main.c \ + packaging/macosx/ScriptExec/openDoc \ + packaging/macosx/ScriptExec/script \ + packaging/macosx/ScriptExec/version.plist \ + packaging/macosx/create-stock-icon-theme.sh \ + packaging/macosx/dmg_background.png \ + packaging/macosx/dmg_background.svg \ + packaging/macosx/dmg_set_style.scpt \ + packaging/macosx/inkscape.ds_store \ + packaging/macosx/osx-app.sh \ + packaging/macosx/osx-build.sh \ + packaging/macosx/osx-dmg.sh \ + packaging/macosx/ports/devel/inkscape-packaging/Portfile \ + packaging/macosx/ports/lang/python25/Portfile \ + packaging/macosx/ports/lang/python25/files/_localemodule.c.ed \ + packaging/macosx/ports/lang/python25/files/locale.py.ed \ + packaging/macosx/ports/lang/python25/files/patch-64bit.diff \ + packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff \ + packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff \ + packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff \ + packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff \ + packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff \ + packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff \ + packaging/macosx/ports/lang/python25/files/patch-configure.diff \ + packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff \ + packaging/macosx/ports/lang/python25/files/patch-libedit.diff \ + packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff \ + packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff \ + packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff \ + packaging/macosx/ports/lang/python25/files/patch-setup.py.diff \ + packaging/macosx/ports/lang/python25/files/pyconfig.ed \ + packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed \ + packaging/macosx/ports/lang/python25/files/python25 \ + packaging/macosx/ports/lang/python26/Portfile \ + packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff \ + packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff \ + packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff \ + packaging/macosx/ports/lang/python26/files/patch-setup.py.diff \ + packaging/macosx/ports/lang/python26/files/pyconfig.ed \ + packaging/macosx/ports/lang/python26/files/python26 \ + packaging/macosx/ports/lang/python26/files/version.plist \ + packaging/macosx/ports/python/py-Pillow/Portfile \ + packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff \ + packaging/macosx/ports/python/py-sk1libs/Portfile \ + packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff \ + packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff \ + packaging/macosx/ports/python/py-uniconvertor/Portfile \ + packaging/macosx/ports/python/py25-Pillow/Portfile \ + packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff \ + packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff \ + packaging/macosx/ports/python/py25-lxml/Portfile \ + packaging/macosx/ports/python/py25-nose/Portfile \ + packaging/macosx/ports/python/py25-nose/files/nosetests24 \ + packaging/macosx/ports/python/py25-nose/files/nosetests25 \ + packaging/macosx/ports/python/py25-nose/files/nosetests26 \ + packaging/macosx/ports/python/py25-nose/files/nosetests27 \ + packaging/macosx/ports/python/py25-nose/files/nosetests31 \ + packaging/macosx/ports/python/py25-nose/files/nosetests32 \ + packaging/macosx/ports/python/py25-nose/files/nosetests33 \ + packaging/macosx/ports/python/py25-nose/files/nosetests34 \ + packaging/macosx/ports/python/py25-numpy/Portfile \ + packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff \ + packaging/macosx/ports/python/py25-numpy/files/wrapper-template \ + packaging/macosx/ports/python/py25-setuptools/Portfile \ packaging/win32/inkscape.nsi \ packaging/win32/inkscape.nsi.uninstall \ packaging/win32/languages/Breton.nsh \ diff --git a/configure.ac b/configure.ac index f27c4f5d5..7d59ebd97 100644 --- a/configure.ac +++ b/configure.ac @@ -391,10 +391,7 @@ if test "x$enable_lcms" = "xno"; then have_lcms2=no else # Have to test LittleCms presence - if test "x${platform_osx}" != "xyes"; then - # lcms 2.2 & 2.3 have problems on OSX - PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no") - fi + PKG_CHECK_MODULES(LCMS2, lcms2, have_lcms2="yes", have_lcms2="no") if test "x${have_lcms2}" = "xyes"; then LIBS="$LIBS $LCMS2_LIBS" diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt new file mode 100644 index 000000000..31b4247f9 --- /dev/null +++ b/packaging/macosx/README.txt @@ -0,0 +1,31 @@ +Quick instructions: +=================== + +1) install MacPorts from source into $MP_PREFIX (e.g. "/opt/local-x11") + <https://www.macports.org/install.php> + +2) add MacPorts to your PATH environement variable, for example: + +$ export PATH="$MP_PREFIX/bin:$MP_PREFIX/sbin:$PATH" + +3) add 'ports/' subdirectory as local portfile repository: + +$ sudo sed -e '/^rsync:/i\'$'\n'"file://$(pwd)/ports" -i "" "$MP_PREFIX/etc/macports/sources.conf" + +4) index the new local portfile repository: + +$ (cd ports && portindex) + +5) add default variants for x11-based package to MacPorts' global variants: + +$ sudo bash -c "echo '+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' >> \"$MP_PREFIX/etc/macports/variants.conf\"" + +6) install required dependencies: + +$ sudo port install inkscape-packaging + +7) compile inkscape, create app bundle and DMG: + +$ LIBPREFIX="$MP_PREFIX" ./osx-build.sh a c b -j 5 i p -s d + +8) upload the DMG. diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png Binary files differnew file mode 100644 index 000000000..d070809f1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png Binary files differnew file mode 100644 index 000000000..df87def2f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png Binary files differnew file mode 100644 index 000000000..7cd94435a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png Binary files differnew file mode 100644 index 000000000..61543990d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png Binary files differnew file mode 100644 index 000000000..476185370 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png Binary files differnew file mode 100644 index 000000000..45b44f324 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png Binary files differnew file mode 100644 index 000000000..5997b9222 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png Binary files differnew file mode 100644 index 000000000..65d22e4fb --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png Binary files differnew file mode 100644 index 000000000..026014ca3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png Binary files differnew file mode 100644 index 000000000..aaea1ff39 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png Binary files differnew file mode 100644 index 000000000..3409adc7a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png Binary files differnew file mode 100644 index 000000000..18b7d2419 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png Binary files differnew file mode 100644 index 000000000..b714d86e2 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png Binary files differnew file mode 100644 index 000000000..49ae8db9c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png Binary files differnew file mode 100644 index 000000000..8dd48c494 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png Binary files differnew file mode 100644 index 000000000..ff87558fc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png Binary files differnew file mode 100644 index 000000000..2c5a46733 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png Binary files differnew file mode 100644 index 000000000..fca34f52a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png Binary files differnew file mode 100644 index 000000000..e9a40950b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png Binary files differnew file mode 100644 index 000000000..24588a3a4 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png Binary files differnew file mode 100644 index 000000000..f7923083b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png Binary files differnew file mode 100644 index 000000000..7c6c250b6 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png Binary files differnew file mode 100644 index 000000000..e3bd4ba72 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png Binary files differnew file mode 100644 index 000000000..b0c8a48d7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png Binary files differnew file mode 100644 index 000000000..13e061e09 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png Binary files differnew file mode 100644 index 000000000..14ed14a12 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png Binary files differnew file mode 100644 index 000000000..14ed14a12 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png Binary files differnew file mode 100644 index 000000000..776f5767e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png Binary files differnew file mode 100644 index 000000000..18ededbfc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png Binary files differnew file mode 100644 index 000000000..b00e21840 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png Binary files differnew file mode 100644 index 000000000..015c495ef --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png Binary files differnew file mode 100644 index 000000000..57d6a0e35 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png Binary files differnew file mode 100644 index 000000000..a416b25ab --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png Binary files differnew file mode 100644 index 000000000..9a7abf7ff --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png Binary files differnew file mode 100644 index 000000000..15b507332 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png Binary files differnew file mode 100644 index 000000000..7e2c5dba9 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png Binary files differnew file mode 100644 index 000000000..867df5ded --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png Binary files differnew file mode 100644 index 000000000..8a844a3a9 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png Binary files differnew file mode 100644 index 000000000..35bcc8127 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png Binary files differnew file mode 100644 index 000000000..69aaafc2c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png Binary files differnew file mode 100644 index 000000000..dcde30f02 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png Binary files differnew file mode 100644 index 000000000..689ba0a96 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png Binary files differnew file mode 100644 index 000000000..a653e10ed --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png Binary files differnew file mode 100644 index 000000000..fadd43dc3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png Binary files differnew file mode 100644 index 000000000..0f0f57a1a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png Binary files differnew file mode 100644 index 000000000..0f03be58d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png Binary files differnew file mode 100644 index 000000000..a653e10ed --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png Binary files differnew file mode 100644 index 000000000..689ba0a96 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png Binary files differnew file mode 100644 index 000000000..5b9e3f0d1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png Binary files differnew file mode 100644 index 000000000..9e77ac2ea --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png Binary files differnew file mode 100644 index 000000000..9e77ac2ea --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png Binary files differnew file mode 100644 index 000000000..5b9e3f0d1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png Binary files differnew file mode 100644 index 000000000..0a3b1bfba --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png Binary files differnew file mode 100644 index 000000000..432225f51 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png Binary files differnew file mode 100644 index 000000000..0dfa41876 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png Binary files differnew file mode 100644 index 000000000..24233cde0 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png Binary files differnew file mode 100644 index 000000000..097969a7c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png Binary files differnew file mode 100644 index 000000000..e4d912579 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png Binary files differnew file mode 100644 index 000000000..3dece1068 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png Binary files differnew file mode 100644 index 000000000..c5da3f9fb --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png Binary files differnew file mode 100644 index 000000000..2514b6167 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png Binary files differnew file mode 100644 index 000000000..0967a61c3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png Binary files differnew file mode 100644 index 000000000..748bb502d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png Binary files differnew file mode 100644 index 000000000..94f078d91 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png Binary files differnew file mode 100644 index 000000000..2a732a6ee --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png Binary files differnew file mode 100644 index 000000000..c79cea355 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png Binary files differnew file mode 100644 index 000000000..61b46d998 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png Binary files differnew file mode 100644 index 000000000..9703a40df --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png Binary files differnew file mode 100644 index 000000000..2c764b374 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png Binary files differnew file mode 100644 index 000000000..2514b6167 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png Binary files differnew file mode 100644 index 000000000..cc58d0fb5 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png Binary files differnew file mode 100644 index 000000000..a312dd854 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png Binary files differnew file mode 100644 index 000000000..010d294a7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png Binary files differnew file mode 100644 index 000000000..20ae955c3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png Binary files differnew file mode 100644 index 000000000..84b26afd6 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png Binary files differnew file mode 100644 index 000000000..9cd9e5cf2 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png Binary files differnew file mode 100644 index 000000000..0ed9c2210 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png Binary files differnew file mode 100644 index 000000000..18b7d2419 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png Binary files differnew file mode 100644 index 000000000..922f452f1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png Binary files differnew file mode 100644 index 000000000..8b70f471a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png Binary files differnew file mode 100644 index 000000000..e7e2584db --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png Binary files differnew file mode 100644 index 000000000..e3cb29165 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png Binary files differnew file mode 100644 index 000000000..c844e8322 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png Binary files differnew file mode 100644 index 000000000..93b2ec100 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png Binary files differnew file mode 100644 index 000000000..4972cb7ba --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png Binary files differnew file mode 100644 index 000000000..a02022474 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png Binary files differnew file mode 100644 index 000000000..a02022474 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png Binary files differnew file mode 100644 index 000000000..4972cb7ba --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png Binary files differnew file mode 100644 index 000000000..67dbb2e16 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png Binary files differnew file mode 100644 index 000000000..08ad0b69a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png Binary files differnew file mode 100644 index 000000000..08ad0b69a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png Binary files differnew file mode 100644 index 000000000..67dbb2e16 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png Binary files differnew file mode 100644 index 000000000..e74e060ea --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png Binary files differnew file mode 100644 index 000000000..934ee68d3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png Binary files differnew file mode 100644 index 000000000..8e2ab7487 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png Binary files differnew file mode 100644 index 000000000..ebd5ac60c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png Binary files differnew file mode 100644 index 000000000..52410c38d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png Binary files differnew file mode 100644 index 000000000..d88fed703 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png Binary files differnew file mode 100644 index 000000000..c9c48d6a3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png Binary files differnew file mode 100644 index 000000000..7cd94435a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png Binary files differnew file mode 100644 index 000000000..32dcc2e63 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png Binary files differnew file mode 100644 index 000000000..14ed14a12 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png Binary files differnew file mode 100644 index 000000000..14ed14a12 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png Binary files differnew file mode 100644 index 000000000..b9e9ea632 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png Binary files differnew file mode 100644 index 000000000..e9ea8c4e5 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png Binary files differnew file mode 100644 index 000000000..49966a996 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png Binary files differnew file mode 100644 index 000000000..3f8fd257f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png Binary files differnew file mode 100644 index 000000000..a8aa70584 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png Binary files differnew file mode 100644 index 000000000..52f58630f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png Binary files differnew file mode 100644 index 000000000..adbf7f3a2 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png Binary files differnew file mode 100644 index 000000000..6b1b94336 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png Binary files differnew file mode 100644 index 000000000..92dddd2ea --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png Binary files differnew file mode 100644 index 000000000..ddc1eb136 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png Binary files differnew file mode 100644 index 000000000..afca0732a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png Binary files differnew file mode 100644 index 000000000..0a395c099 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png Binary files differnew file mode 100644 index 000000000..2a7da6e2a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png Binary files differnew file mode 100644 index 000000000..c08115f62 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png Binary files differnew file mode 100644 index 000000000..e56236638 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png Binary files differnew file mode 100644 index 000000000..a13d1984b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png Binary files differnew file mode 100644 index 000000000..0c9de64ba --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png Binary files differnew file mode 100644 index 000000000..7de1e0e4f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png Binary files differnew file mode 100644 index 000000000..4152b6c9f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png Binary files differnew file mode 100644 index 000000000..8d899cfa5 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png Binary files differnew file mode 100644 index 000000000..6902efdc6 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png Binary files differnew file mode 100644 index 000000000..b66871a94 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png Binary files differnew file mode 100644 index 000000000..c89e797b7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png Binary files differnew file mode 100644 index 000000000..5edf531e3 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png Binary files differnew file mode 100644 index 000000000..312e1187f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png Binary files differnew file mode 100644 index 000000000..7f405de58 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png Binary files differnew file mode 100644 index 000000000..05d22d7a8 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png Binary files differnew file mode 100644 index 000000000..297c86b0c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png Binary files differnew file mode 100644 index 000000000..3046794e7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png Binary files differnew file mode 100644 index 000000000..46435e1a0 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png Binary files differnew file mode 100644 index 000000000..5da8a02dc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png Binary files differnew file mode 100644 index 000000000..7ef7685f4 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png Binary files differnew file mode 100644 index 000000000..1be6b6c88 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png Binary files differnew file mode 100644 index 000000000..590f673db --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png Binary files differnew file mode 100644 index 000000000..a1178e64f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png Binary files differnew file mode 100644 index 000000000..82b105f80 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png Binary files differnew file mode 100644 index 000000000..e375b894e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png Binary files differnew file mode 100644 index 000000000..ed81e5a82 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png Binary files differnew file mode 100644 index 000000000..5c83fb689 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png Binary files differnew file mode 100644 index 000000000..e938c3e99 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png Binary files differnew file mode 100644 index 000000000..3da43f0c0 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png Binary files differnew file mode 100644 index 000000000..f2c1a50a1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png Binary files differnew file mode 100644 index 000000000..1fc5b8282 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png Binary files differnew file mode 100644 index 000000000..3b12a233a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png Binary files differnew file mode 100644 index 000000000..3ba7d6240 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png Binary files differnew file mode 100644 index 000000000..28b68f338 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png Binary files differnew file mode 100644 index 000000000..28b68f338 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png Binary files differnew file mode 100644 index 000000000..36d231434 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png Binary files differnew file mode 100644 index 000000000..a6f7dc19b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png Binary files differnew file mode 100644 index 000000000..7e3656dc4 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png Binary files differnew file mode 100644 index 000000000..5527663fd --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png Binary files differnew file mode 100644 index 000000000..35579d553 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png Binary files differnew file mode 100644 index 000000000..eaf9a460b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png Binary files differnew file mode 100644 index 000000000..07db84109 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png Binary files differnew file mode 100644 index 000000000..9bbd47ca0 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png Binary files differnew file mode 100644 index 000000000..9869fb8b1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png Binary files differnew file mode 100644 index 000000000..8842b5aa7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png Binary files differnew file mode 100644 index 000000000..04d464e28 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png Binary files differnew file mode 100644 index 000000000..be0906d8a --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png Binary files differnew file mode 100644 index 000000000..79994416e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png Binary files differnew file mode 100644 index 000000000..2a0a8ea2c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png Binary files differnew file mode 100644 index 000000000..e44f9b612 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png Binary files differnew file mode 100644 index 000000000..3ba5c4ba7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png Binary files differnew file mode 100644 index 000000000..a2e0b3c96 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png Binary files differnew file mode 100644 index 000000000..9b639939f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png Binary files differnew file mode 100644 index 000000000..80068face --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png Binary files differnew file mode 100644 index 000000000..3ba5c4ba7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png Binary files differnew file mode 100644 index 000000000..e44f9b612 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png Binary files differnew file mode 100644 index 000000000..727ff37f2 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png Binary files differnew file mode 100644 index 000000000..23b89b761 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png Binary files differnew file mode 100644 index 000000000..23b89b761 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png Binary files differnew file mode 100644 index 000000000..727ff37f2 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png Binary files differnew file mode 100644 index 000000000..9b98fd26f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png Binary files differnew file mode 100644 index 000000000..3df5fe511 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png Binary files differnew file mode 100644 index 000000000..ca76d509b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png Binary files differnew file mode 100644 index 000000000..fd97f343c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png Binary files differnew file mode 100644 index 000000000..97f2143fb --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png Binary files differnew file mode 100644 index 000000000..da8194fa8 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png Binary files differnew file mode 100644 index 000000000..883a003bc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png Binary files differnew file mode 100644 index 000000000..f429e1015 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png Binary files differnew file mode 100644 index 000000000..cde0e8698 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png Binary files differnew file mode 100644 index 000000000..9ddbe9b8e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png Binary files differnew file mode 100644 index 000000000..fcf7f2a49 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png Binary files differnew file mode 100644 index 000000000..cb7b760bc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png Binary files differnew file mode 100644 index 000000000..69ade2524 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png Binary files differnew file mode 100644 index 000000000..c309a6d82 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png Binary files differnew file mode 100644 index 000000000..9acf0d5ff --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png Binary files differnew file mode 100644 index 000000000..2596f3cc5 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png Binary files differnew file mode 100644 index 000000000..0e71c35d7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png Binary files differnew file mode 100644 index 000000000..cde0e8698 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png Binary files differnew file mode 100644 index 000000000..bccc39e7c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png Binary files differnew file mode 100644 index 000000000..22023b853 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png Binary files differnew file mode 100644 index 000000000..063d0df43 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png Binary files differnew file mode 100644 index 000000000..b00fbd8c1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png Binary files differnew file mode 100644 index 000000000..90e26e5bc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png Binary files differnew file mode 100644 index 000000000..2f8b70d9c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png Binary files differnew file mode 100644 index 000000000..0bd69c92c --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png Binary files differnew file mode 100644 index 000000000..7ef7685f4 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png Binary files differnew file mode 100644 index 000000000..c4358f5f8 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png Binary files differnew file mode 100644 index 000000000..6187ba6d2 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png Binary files differnew file mode 100644 index 000000000..0f5348900 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png Binary files differnew file mode 100644 index 000000000..036f05f55 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png Binary files differnew file mode 100644 index 000000000..9e54ef3f5 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png Binary files differnew file mode 100644 index 000000000..d1b25c2f1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png Binary files differnew file mode 100644 index 000000000..508808285 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png Binary files differnew file mode 100644 index 000000000..4a1bdf89b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png Binary files differnew file mode 100644 index 000000000..4a1bdf89b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png Binary files differnew file mode 100644 index 000000000..508808285 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png Binary files differnew file mode 100644 index 000000000..c3a649f4e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png Binary files differnew file mode 100644 index 000000000..3da34257d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png Binary files differnew file mode 100644 index 000000000..3da34257d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png Binary files differnew file mode 100644 index 000000000..c3a649f4e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png Binary files differnew file mode 100644 index 000000000..a6f14418b --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png Binary files differnew file mode 100644 index 000000000..28517473d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png Binary files differnew file mode 100644 index 000000000..13304368e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png Binary files differnew file mode 100644 index 000000000..da6df48a9 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png Binary files differnew file mode 100644 index 000000000..dd70e0be9 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png Binary files differnew file mode 100644 index 000000000..54e1cb3e9 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png Binary files differnew file mode 100644 index 000000000..2b11b5075 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png Binary files differnew file mode 100644 index 000000000..c89e797b7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png Binary files differnew file mode 100644 index 000000000..2574c181f --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png Binary files differnew file mode 100644 index 000000000..28b68f338 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png Binary files differnew file mode 100644 index 000000000..28b68f338 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png Binary files differnew file mode 100644 index 000000000..21462fe0e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png Binary files differnew file mode 100644 index 000000000..09b5df1d1 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png Binary files differnew file mode 100644 index 000000000..ff9c2289d --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png Binary files differnew file mode 100644 index 000000000..44c871133 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png Binary files differnew file mode 100644 index 000000000..d498a59a5 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png Binary files differnew file mode 100644 index 000000000..312b84dae --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png Binary files differnew file mode 100644 index 000000000..dfbdf9b6e --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png Binary files differnew file mode 100644 index 000000000..3a386fae7 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png Binary files differnew file mode 100644 index 000000000..499cbd6c6 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png Binary files differnew file mode 100644 index 000000000..22afd1951 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png Binary files differnew file mode 100644 index 000000000..dc09283f4 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png Binary files differnew file mode 100644 index 000000000..c58e5a6f4 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png Binary files differnew file mode 100644 index 000000000..cb03e5420 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png Binary files differnew file mode 100644 index 000000000..d73990ecc --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png Binary files differnew file mode 100644 index 000000000..f81198437 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png Binary files differnew file mode 100644 index 000000000..14dbd9cac --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png diff --git a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png Binary files differnew file mode 100644 index 000000000..827a33918 --- /dev/null +++ b/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png diff --git a/packaging/macosx/Resources/alert_fccache.sh b/packaging/macosx/Resources/alert_fccache.sh new file mode 100755 index 000000000..50038b2ac --- /dev/null +++ b/packaging/macosx/Resources/alert_fccache.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +ALERT_SCRIPT="$(cat << EOM +try + set parent_path to "$CWD" + set icon_path to POSIX path of (parent_path & "/Inkscape.icns") + set front_app to ((path to frontmost application) as text) + tell application front_app + display dialog "While Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application. + +The first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built." buttons {"OK"} default button 1 with title "Inkscape on OS X" with icon POSIX file icon_path + activate + end tell +end try +EOM)" + +if [ -z "$INK_CACHE_DIR" ]; then + export INK_CACHE_DIR="${HOME}/.cache/inkscape" + mkdir -p "$INK_CACHE_DIR" + [ $_DEBUG ] && echo "INK_CACHE_DIR: falling back to $INK_CACHE_DIR" +fi + +# Warn the user about time-consuming generation of fontconfig caches. +if [ ! -f "${INK_CACHE_DIR}/.fccache-new" ]; then + alert_result=$(osascript -e "$ALERT_SCRIPT") + mkdir -p "$INK_CACHE_DIR" + touch "${INK_CACHE_DIR}/.fccache-new" +fi diff --git a/packaging/macosx/Resources/bin/getdisplay.sh b/packaging/macosx/Resources/bin/getdisplay.sh deleted file mode 100755 index f7f383348..000000000 --- a/packaging/macosx/Resources/bin/getdisplay.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# Author: Aaron Voisine <aaron@voisine.org> - -if [ "$DISPLAY"x == "x" ]; then - echo :0 > /tmp/display.$UID -else - echo $DISPLAY > /tmp/display.$UID -fi diff --git a/packaging/macosx/Resources/bin/gimp-wrapper.sh b/packaging/macosx/Resources/bin/gimp-wrapper.sh new file mode 100755 index 000000000..4cddfcc3a --- /dev/null +++ b/packaging/macosx/Resources/bin/gimp-wrapper.sh @@ -0,0 +1,96 @@ +#!/bin/bash +# +# simple gimp wrapper script for Inkscape.app +# + +#_DEBUG=true + +# --- defaults for GIMP.app + +app_id="org.gnome.gimp" +app_exec_default="GIMP" + + +# --- defaults for gimp in $PATH + +# path for local gimp install +PATH_local="/opt/local/bin" +# launch a specific gimp version? (e.g. gimp-2.9) +gimp_name="gimp" + + +# --- unset environment inherited from Inkscape.app + +unset XDG_CONFIG_HOME XDG_DATA_HOME XDG_CACHE_HOME +unset XDG_CONFIG_DIRS XDG_DATA_DIRS +unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE GTK2_RC_FILES +unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR +unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR +unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS +unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH +unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR +unset ASPELL_CONF +unset POPPLER_DATADIR +unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT PYTHONPATH +unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH +unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS + + +# --- detect installed GIMP.app + +unset GIMP_APP + +APPLESCRIPT1="$(cat << EOM +try + tell application "Finder" + set theApp to application file id "$app_id" as string + set theApp_path to POSIX path of theApp as string + return theApp_path + end tell +end try +EOM)" + +GIMP_APP="$(osascript -e "$APPLESCRIPT1")" + + +# --- pass command line arguments to GIMP.app or gimp or exit + +if [ ! -z "$GIMP_APP" ]; then + + app_exec="$(defaults read "${GIMP_APP}/Contents/Info.plist" CFBundleExecutable)" + [[ $? -ne 0 ]] && app_exec="$app_exec_default" + + GIMP_APP_EXEC="${GIMP_APP}/Contents/MacOS/${app_exec}" + + [ $_DEBUG ] && echo "GIMP.app found as: $GIMP_APP" 1>&2 + [ $_DEBUG ] && echo "Command line arguments: $@" 1>&2 + if [ $# -eq 1 ]; then + [ $_DEBUG ] && echo "open -a $GIMP_APP $@" 1>&2 + open -a "$GIMP_APP" "$@" + else + [ $_DEBUG ] && echo "exec $GIMP_APP_EXEC $@" 1>&2 + exec "$GIMP_APP_EXEC" "$@" + fi + +else # --- test for gimp installed in PATH + + # remove CWD from path (we don't want to recursively call this script) + [ $_DEBUG ] && echo "orig PATH: $PATH" 1>&2 + PATH_cleaned="$(echo $PATH | sed 's|'"$(cd "$(dirname "$0")" && pwd)"':||g')" || exit 1 + [ $_DEBUG ] && echo "clean PATH: $PATH_cleaned" 1>&2 + export PATH="$PATH_local:$PATH_cleaned" + [ $_DEBUG ] && echo "final PATH: $PATH" 1>&2 + + type -p "$gimp_name" + + if [ $? -eq 0 ]; then + [ $_DEBUG ] && echo "gimp found in \$PATH: $PATH" 1>&2 + [ $_DEBUG ] && echo "Command line arguments: $@" 1>&2 + exec "$gimp_name" -n "$@" + else + echo "Giving up - couldn't find GIMP.app nor gimp." 1>&2 + fi + +fi + +# eof diff --git a/packaging/macosx/Resources/bin/inkscape b/packaging/macosx/Resources/bin/inkscape index 486877fa4..775f94e5c 100755 --- a/packaging/macosx/Resources/bin/inkscape +++ b/packaging/macosx/Resources/bin/inkscape @@ -4,71 +4,103 @@ # Inkscape Modifications: # Michael Wybrow <mjwybrow@users.sourceforge.net> # Jean-Olivier Irisson <jo.irisson@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> # -CWD="`(cd \"\`dirname \\\"$0\\\"\`\"; echo \"$PWD\")`" +[ -n "$INK_DEBUG_LAUNCHER" ] && set -x + +CWD="$(cd "$(dirname "$0")" && pwd)" # e.g. /Applications/Inkscape.app/Contents/Resources/bin -TOP="`dirname \"$CWD\"`" +TOP="$(dirname "$CWD")" # e.g. /Applications/Inkscape.app/Contents/Resources +BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')" +# e.g. /Applications/Inkscape.app - -# Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. -# People should really use ~/.macosx/environment.plist to set environment variables as explained by Apple: -# http://developer.apple.com/qa/qa2001/qa1067.html -# but since no one does, we correct this by making the 'classic' PATH additions here: -# /usr/local/bin which, though standard, doesn't seem to be in the PATH -# newer python as recommended by MacPython http://www.python.org/download/mac/ -# Fink -# MacPorts (former DarwinPorts) -# LaTeX distribution for Mac OS X -export PATH="/usr/texbin:/opt/local/bin:/sw/bin/:/Library/Frameworks/Python.framework/Versions/Current/bin:/usr/local/bin:$CWD:$PATH" - -# Put /usr/bin at beginning of path so we make sure we use Apple's python -# over one that may be installed be Macports, Fink or some other means. -export PATH="/usr/bin:$PATH" - -# On Snow Leopard, use the 32-bit version of python from Universal build. -# This is because our bundled i386 python libraries are 32-bit only. -export VERSIONER_PYTHON_VERSION=2.6 -export VERSIONER_PYTHON_PREFER_32_BIT=yes - +# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative +# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change +# of working directory is required: +# +# Due to changes after 0.48, we have change working directory in the script named 'inkscape': +# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or +# fail (for python-based extensions, inkscape changes the working directory to the +# script's directory, and inkscape launched by python script thus can't find resources +# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory). +cd "$BASE" || exit 1 + +# don't prepend to $PATH in recursive calls: +if [ -z "$INK_PATH_ORIG" ]; then + + # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. + # the 'classic' PATH additions: + # /usr/local/bin which, though standard, doesn't seem to be in the PATH + # Fink + # MacPorts (former DarwinPorts) + # LaTeX distribution for Mac OS X + PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" + + # Put /usr/bin at beginning of path so we make sure we use Apple's python + # over one that may be installed be Macports, Fink or some other means. + PATH_PYTHON="/usr/bin" + + # Put $TOP/bin at beginning of path so we make sure that recursive calls + # to inkscape don't pull in other inkscape binaries with different setup. + # Also allows to override system python with custom wrapper script, and + # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export. + PATH_pkgbin="$TOP/bin" + + # save orig, new PATH + export INK_PATH_ORIG="$PATH" + export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG" +fi # Setup PYTHONPATH to use python modules shipped with Inkscape -ARCH=`arch` -PYTHON_VERS=`python -V 2>&1 | cut -c 8-10` -export PYTHONPATH="$TOP/python/site-packages/$ARCH/$PYTHON_VERS" -# NB: we are only preprending some stuff to the default python path so if the directory does not exist it should not harm the rest - -# No longer required if path rewriting has been conducted. -# export DYLD_LIBRARY_PATH="$TOP/lib" - -mkdir -p "${HOME}/.inkscape-etc" +OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" +build_arch=__build_arch__ +if [ $OSXMINORNO -gt "5" ]; then + if [ $OSXMINORNO -eq "6" ]; then + export VERSIONER_PYTHON_VERSION=2.6 + else # if [ $OSXMINORNO -ge "7" ]; then + export VERSIONER_PYTHON_VERSION=2.7 + fi + if [ $build_arch = "i386" ]; then + export VERSIONER_PYTHON_PREFER_32_BIT=yes + else # build & runtime arch x86_64 + export VERSIONER_PYTHON_PREFER_32_BIT=no + fi +fi +PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" +export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="$HOME/.inkscape-etc/pangorc" -export GTK_IM_MODULE_FILE="$HOME/.inkscape-etc/gtk.immodules" -export GDK_PIXBUF_MODULE_FILE="$HOME/.inkscape-etc/gdk-pixbuf.loaders" +export PANGO_RC_FILE="$TOP/etc/pango/pangorc" +export PANGO_SYSCONFDIR="$TOP/etc" +export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache" export GTK_DATA_PREFIX="$TOP" export GTK_EXE_PREFIX="$TOP" +export GTK_PATH="$TOP" export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" +export GIO_USE_VFS="local" +export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1 +export GVFS_DISABLE_FUSE=1 export XDG_DATA_DIRS="$TOP/share" export ASPELL_CONF="prefix $TOP;" +export POPPLER_DATADIR="$TOP/share/poppler" + +# no DBUS for now +unset DBUS_LAUNCHD_SESSION_BUS_SOCKET +unset DBUS_SESSION_BUS_ADDRESS # Note: This requires the path with the exact ImageMagic version number. -# Also, that ImageMagick will only work if it does not find a -# version installed into the same PREFIX as it was originally -# installed. Luckily, this is very unlikely given the extra long -# and strangely named install prefix we use. -# The actual version is inserted by the packaging script. -export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER/config" +# The actual version is inserted by the packaging script. +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" -export INKSCAPE_SHAREDIR="$TOP" -# TODO: move the share directory to a its own folder to make things a bit cleaner in the app bundle +export INKSCAPE_SHAREDIR="$TOP/share/inkscape" export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" -export INKSCAPE_LOCALEDIR="$TOP/locale" +export INKSCAPE_LOCALEDIR="$TOP/share/locale" # Handle the case where the directory storing Inkscape has special characters # ('#', '&', '|') in the name. These need to be escaped to work properly for @@ -77,38 +109,7 @@ ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/ # Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - # Appearance setting - aquaStyle=`defaults read "Apple Global Domain" AppleAquaColorVariant 2>/dev/null` - # 1 for aqua, 6 for graphite, inexistant if the default color was never changed - if [[ "$aquaStyle" == "" ]]; then - aquaStyle=1 # set aqua as default - fi - - # Highlight Color setting - hiliColor=`defaults read "Apple Global Domain" AppleHighlightColor 2>/dev/null` - # a RGB value, with components between 0 and 1, also inexistant if it was not changed - if [[ "$hiliColor" == "" ]]; then - hiliColor="0.709800 0.835300 1.000000" # set blue as default - fi - - # Menu items color - if [[ aquaStyle -eq 1 ]]; then - menuColor="#4a76cd" # blue - else - menuColor="#7c8da4" # graphite - fi - # Format highlight color as a GTK rgb value - hiliColorFormated=`echo $hiliColor | awk -F " " '{print "\\\{"$1","$2","$3"\\\}"}'` - - # echo $menuColor - # echo $hiliColorFormated - - # Modify the gtkrc - # - with the correct colors - # - to point to the correct scrollbars folder - sed 's/OSX_HILI_COLOR_PLACEHOLDER/'$hiliColorFormated'/g' "$INKSCAPE_SHAREDIR/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc" | sed 's/OSX_MENU_COLOR_PLACEHOLDER/\"'$menuColor'\"/g' | sed 's/AQUASTYLE_PLACEHOLDER/'$aquaStyle'/g' | sed 's|${THEMEDIR}|'"$ESCAPEDTOP/themes/Clearlooks-Quicksilver-OSX/gtk-2.0|g" > "${HOME}/.inkscape-etc/gtkrc" - - export GTK2_RC_FILES="$HOME/.inkscape-etc/gtkrc" + export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" fi # If the AppleCollationOrder preference doesn't exist, we fall back to using @@ -116,12 +117,11 @@ fi LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] then - echo "Warning: AppleCollationOrder setting not found, using AppleLocale." 1>&2 LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ sed 's/_.*//'` - echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 else - echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 fi # NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape @@ -129,7 +129,7 @@ fi if [ "x$LANGSTR" == "x" ] then # override broken script - echo "Overriding empty LANGSTR" 1>&2 + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 export LANG="en_US.UTF-8" else tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ @@ -137,22 +137,30 @@ else if [ "x$tmpLANG" == "x" ] then # override broken script - echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 export LANG="en_US.UTF-8" else - echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 export LANG="$tmpLANG.UTF-8" fi fi -echo "Setting Language: $LANG" 1>&2 - -sed 's|${HOME}|'"$HOME|g" "$TOP/etc/pango/pangorc" > "${HOME}/.inkscape-etc/pangorc" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/pango/pango.modules" \ - > "${HOME}/.inkscape-etc/pango.modules" -cp -f "$TOP/etc/pango/pangox.aliases" "${HOME}/.inkscape-etc/" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gtk.immodules" \ - > "${HOME}/.inkscape-etc/gtk.immodules" -sed 's|${CWD}|'"$ESCAPEDTOP|g" "$TOP/etc/gtk-2.0/gdk-pixbuf.loaders" \ - > "${HOME}/.inkscape-etc/gdk-pixbuf.loaders" - -exec "$CWD/inkscape-bin" "$@" +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 +export LC_ALL="$LANG" + +case "$INK_DEBUG" in + gdb) + EXEC="gdb --args" ;; + lldb) + EXEC="lldb -- " ;; + dtruss) + EXEC="dtruss" ;; + *) + EXEC="exec" ;; +esac +unset INK_DEBUG # ignore for recursive calls + +if [ "x$INK_DEBUG_SHELL" != "x" ]; then + exec bash +else + $EXEC "$CWD/inkscape-bin" "$@" +fi diff --git a/packaging/macosx/Resources/bin/python-wrapper.sh b/packaging/macosx/Resources/bin/python-wrapper.sh new file mode 100755 index 000000000..34cd75737 --- /dev/null +++ b/packaging/macosx/Resources/bin/python-wrapper.sh @@ -0,0 +1,78 @@ +#!/bin/sh + + +# --------------------------------------------------------------------- +# a) to use PyGTK (for Sozi or inksmoto) from MacPorts +# --------------------------------------------------------------------- + +# export PYTHONPATH="$INKSCAPE_SHAREDIR"/extensions +# +# # unset other environment variables used in Inkscape.app +# unset DYLD_LIBRARY_PATH +# unset XDG_CONFIG_DIRS XDG_DATA_DIRS +# unset GTK_PATH GTK_DATA_PREFIX GTK_EXE_PREFIX GTK_IM_MODULE_FILE +# unset FONTCONFIG_FILE FONTCONFIG_PATH HB_SHAPER_LIST PANGO_RC_FILE PANGO_SYSCONFDIR +# unset GDK_PIXBUF_MODULE_FILE GSETTINGS_SCHEMA_DIR +# unset DBUS_SESSION_BUS_PID DBUS_LAUNCHD_SESSION_BUS_SOCKET DBUS_SESSION_BUS_ADDRESS +# unset GNOME_VFS_MODULE_CONFIG_PATH GNOME_VFS_MODULE_PATH +# unset GIO_MODULE_DIR GVFS_MOUNTABLE_DIR +# unset ASPELL_CONF +# unset POPPLER_DATADIR +# unset VERSIONER_PYTHON_VERSION VERSIONER_PYTHON_PREFER_32_BIT +# unset MAGICK_HOME MAGICK_CONFIGURE_PATH MAGICK_CODER_FILTER_PATH MAGICK_CODER_MODULE_PATH +# unset GS_LIB GS_ICC_PROFILES GS_RESOURCE_DIR GS_LIB GS_FONTPATH GS +# +# # set locale (language) explicitly +# # (not needed with 0.48.5 package) +# #export LANG="en_US.UTF-8" +# +# # set MacPorts prefix +#Â LIBPREFIX="/opt/local" +# +# exec "$LIBPREFIX/bin/python" "$@" + + +# --------------------------------------------------------------------- +# b) to test different 32bit or 64bit system-provided Python versions +# (available on Mac OS X 10.6 Snow Leopard and later versions) +# --------------------------------------------------------------------- + +# # Python 2.5 (system) - Lion: 2.5.6 +# #exec /usr/bin/python2.5 "$@" +# export VERSIONER_PYTHON_VERSION=2.5 +# export VERSIONER_PYTHON_PREFER_32_BIT=yes +# exec /usr/bin/python "$@" + +# # Python 2.6 (system) - Lion: 2.6.7 +# #exec arch -i386 /usr/bin/python2.6 "$@" +# export VERSIONER_PYTHON_VERSION=2.6 +# export VERSIONER_PYTHON_PREFER_32_BIT=yes +# #export VERSIONER_PYTHON_PREFER_32_BIT=no +# exec /usr/bin/python "$@" + +# # Python 2.7 (system) - Lion: 2.7.1 +# #exec arch -i386 /usr/bin/python2.7 "$@" +# export VERSIONER_PYTHON_VERSION=2.7 +# export VERSIONER_PYTHON_PREFER_32_BIT=yes +# #export VERSIONER_PYTHON_PREFER_32_BIT=no +# exec /usr/bin/python "$@" + + +# --------------------------------------------------------------------- +# c) to test different 32bit or 64bit MacPorts-provided Python versions +# (define $LIBPREFIX locally) +# --------------------------------------------------------------------- + +#Â LIBPREFIX="/opt/local-x11" +#Â exec "$LIBPREFIX/bin/python2.5" "$@" +#Â #exec "$LIBPREFIX/bin/python2.6" "$@" +#Â #exec "$LIBPREFIX/bin/python2.7" "$@" + + +# --------------------------------------------------------------------- +# d) ... otherwise run default python +# --------------------------------------------------------------------- + +exec /usr/bin/python "$@" + +# eof diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf index c8a008dab..316043814 100644 --- a/packaging/macosx/Resources/etc/fonts/fonts.conf +++ b/packaging/macosx/Resources/etc/fonts/fonts.conf @@ -24,12 +24,14 @@ <!-- Font directory list --> <dir>/usr/share/fonts</dir> - <dir>/usr/X11R6/lib/X11/fonts</dir> + <dir>/usr/X11/lib/X11/fonts</dir> <dir>/opt/local/share/fonts</dir> - <!-- <dir>/System/Library/Fonts</dir> --> + <dir>/System/Library/Fonts</dir> <dir>/Network/Library/Fonts</dir> <dir>/Library/Fonts</dir> <dir>~/Library/Fonts</dir> + <dir prefix="xdg">fonts</dir> + <!-- the following element will be removed in the future --> <dir>~/.fonts</dir> <!-- @@ -39,7 +41,7 @@ <test qual="any" name="family"> <string>mono</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>monospace</string> </edit> </match> @@ -51,7 +53,7 @@ <test qual="any" name="family"> <string>sans serif</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -63,7 +65,7 @@ <test qual="any" name="family"> <string>sans</string> </test> - <edit name="family" mode="assign"> + <edit name="family" mode="assign" binding="same"> <string>sans-serif</string> </edit> </match> @@ -75,6 +77,8 @@ <!-- Font cache directory list --> + <cachedir prefix="xdg">fontconfig</cachedir> + <!-- the following element will be removed in the future --> <cachedir>~/.fontconfig</cachedir> <config> diff --git a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc new file mode 100644 index 000000000..5babb9b17 --- /dev/null +++ b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc @@ -0,0 +1,20 @@ +# +# gtkrc file for Inkscape.app (X11) +# + +gtk-theme-name = "Adwaita" +gtk-font-name = "Lucida Grande 9" + +gtk-icon-theme-name = "GtkStock" +gtk-icon-sizes = "gtk-dialog=32,32:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12" + +gtk-button-images = 0 +gtk-menu-images = 0 +gtk-toolbar-style = 0 +#gtk-toolbar-icon-size = 2 + +# fix Adwaita theme for Inkscape's GimpSpinScale widgets +style "spinbutton" {} +widget_class "*GimpSpinScale*" style "spinbutton" + +# eof diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc index fd37dd128..c2740c9b5 100755..100644 --- a/packaging/macosx/Resources/openDoc +++ b/packaging/macosx/Resources/openDoc @@ -1,17 +1,11 @@ -#!/bin/sh +#!/bin/bash # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> +# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> -CWD="`dirname \"$0\"`" +CWD="$(cd "$(dirname "$0")" && pwd)" -# System version: 3 for Panther, 4 for Tiger, 5 for Leopard -export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` +source "${CWD}/xdg_setup.sh" -if [[ $VERSION -le 4 ]]; then - export "DISPLAY=`cat /tmp/display.$UID`" -fi - -BASE="`echo "$0" | sed -e 's/\/Contents\/Resources\/openDoc/\//'`" -cd "$BASE" exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script index 62dcafdf5..a97d02486 100755 --- a/packaging/macosx/Resources/script +++ b/packaging/macosx/Resources/script @@ -1,54 +1,21 @@ -#!/bin/sh +#!/bin/bash # # Author: Aaron Voisine <aaron@voisine.org> # Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> +# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> -CWD=`dirname "$0"` +#export _DEBUG=true -# System version: 3 for Panther, 4 for Tiger, 5 for Leopard -export VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` +CWD="$(cd "$(dirname "$0")" && pwd)" -# On Leopard, X11.app is installed by default, and will be started -# automatically via launchd. On older systems, we need to start -# X11 ourself. +source "${CWD}/xdg_setup.sh" +source "${CWD}/alert_fccache.sh" -# For Panther and Tiger, start X11 -if [[ $VERSION -le 4 ]]; then - # FIXME apparently this removes the xterm that starts with X - # from xinitrc but when is it really used? Should we modify - # the .xinitrc of the user without warning? - ps -wx -ocommand | grep -e '[X]11' > /dev/null - if [ "$?" != "0" -a ! -f "${HOME}/.xinitrc" ]; then - echo "rm -f \"\${HOME}/.xinitrc\"" > "${HOME}/.xinitrc" - sed 's/xterm/# xterm/' /usr/X11R6/lib/X11/xinit/xinitrc >> "${HOME}/.xinitrc" - fi - - # Start X11 and get DISPLAY - # FIXME: Insecure tmp file usage. Why do we have to copy this to /tmp anyway? - cp -f "$CWD/bin/getdisplay.sh" /tmp/ - rm -f /tmp/display.$UID - open-x11 /tmp/getdisplay.sh || \ - open -a XDarwin /tmp/getdisplay.sh || \ - echo ":0" > /tmp/display.$UID - - while [ "$?" == "0" -a ! -f /tmp/display.$UID ]; do - sleep 1 - done - export DISPLAY=`cat /tmp/display.$UID` - - ps -wx -ocommand | grep -e '[X]11' > /dev/null || exit 11 -fi - -# Warn the user about time-consuming generation of fontconfig caches. -test -f "${HOME}/.inkscape-etc/.fccache-new" || exit 12 - - - -BASE=`echo "$0" | sed -e 's/\/Contents\/Resources\/script/\//'` -cd "$BASE" -exec "$CWD/bin/inkscape" "$@" # TODO examine whether it would be wisest to move the code from inkscape shell # script and getdisplay.sh to here and only keep the real binary in bin. This # may make things easier on Leopard and may also help using Inkscape on the # command line. +# +# See related FIXME in bin/inkscape for requirements to merge the two scripts. +exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png Binary files differdeleted file mode 100644 index 62c0b41bd..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-down.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png Binary files differdeleted file mode 100644 index 0dff81db9..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-left.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png Binary files differdeleted file mode 100644 index 02ef8ee7a..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-right.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png Binary files differdeleted file mode 100644 index dba866012..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/stepper-up.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png Binary files differdeleted file mode 100644 index e978dfb9f..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png Binary files differdeleted file mode 100644 index 4f128b323..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars/trough-scrollbar-vert.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh deleted file mode 100755 index 020e059bd..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/copy-slider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cp -f slider-vert.png slider-vert-prelight.png -cp -f slider-vert.png slider-horiz-prelight.png -cp -f slider-vert.png slider-horiz.png -convert -rotate 90 slider-horiz.png slider-horiz.png -convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png
\ No newline at end of file diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png Binary files differdeleted file mode 100644 index 1ee4528ba..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz-prelight.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png Binary files differdeleted file mode 100644 index 1ee4528ba..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-horiz.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png Binary files differdeleted file mode 100644 index 4fa68000c..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert-prelight.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png Binary files differdeleted file mode 100644 index 4fa68000c..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_1/slider-vert.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh deleted file mode 100755 index 020e059bd..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/copy-slider.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -cp -f slider-vert.png slider-vert-prelight.png -cp -f slider-vert.png slider-horiz-prelight.png -cp -f slider-vert.png slider-horiz.png -convert -rotate 90 slider-horiz.png slider-horiz.png -convert -rotate 90 slider-horiz-prelight.png slider-horiz-prelight.png
\ No newline at end of file diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png Binary files differdeleted file mode 100644 index c0f7f3c3f..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz-prelight.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png Binary files differdeleted file mode 100644 index c0f7f3c3f..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-horiz.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png Binary files differdeleted file mode 100644 index 9643f378e..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert-prelight.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png Binary files differdeleted file mode 100644 index 9643f378e..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/Scrollbars_6/slider-vert.png +++ /dev/null diff --git a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc b/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc deleted file mode 100644 index 171e73626..000000000 --- a/packaging/macosx/Resources/themes/Clearlooks-Quicksilver-OSX/gtk-2.0/pre_gtkrc +++ /dev/null @@ -1,547 +0,0 @@ -# -# GTK theme to be used on Mac OS X, to mimic the appearance of Tiger -# -# Heavily based on Clearlooks-Quicksilver -# Scrollbars from OSX-theme by Lauri Taimila (lauri@taimila.com) -# -# (c) 2007 JiHO <jo.irisson@gmail.com>. -# GNU General Public License http://www.gnu.org/copyleft/gpl.html -# - -pixmap_path "${THEMEDIR}" - -style "clearlooks-default" -{ - GtkButton ::default_border = { 0, 0, 0, 0 } - GtkRange ::trough_border = 0 - GtkPaned ::handle_size = 6 - GtkRange ::slider_width = 15 - GtkRange ::stepper_size = 15 - GtkScale ::slider-length = 23 - GtkScale ::trough-side-details = 1 - GtkScrollbar ::min_slider_length = 30 - GtkCheckButton ::indicator_size = 12 - GtkMenuBar ::internal-padding = 0 - GtkTreeView ::expander_size = 14 - GtkExpander ::expander_size = 16 - - xthickness = 1 - ythickness = 1 - - fg[NORMAL] = "#000000" # black - fg[PRELIGHT] = "#000000" # black - fg[SELECTED] = "#ffffff" # white - fg[ACTIVE] = "#000000" # black - fg[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - bg[NORMAL] = {0.95, 0.95, 0.95} # very light gray - bg[PRELIGHT] = "#ffffff" # white - bg[SELECTED] = OSX_MENU_COLOR_PLACEHOLDER # menu color - bg[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - bg[ACTIVE] = {0.85, 0.85, 0.85} # gray - - base[NORMAL] = "#ffffff" # white - base[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER # menu color - base[ACTIVE] = {0.6, 0.6, 0.6} # dark gray - base[SELECTED] = OSX_HILI_COLOR_PLACEHOLDER # highlight color - base[INSENSITIVE] = {0.9, 0.9, 0.9} # light gray - - text[NORMAL] = "#000000" # black - text[PRELIGHT] = "#000000" # black - text[ACTIVE] = "#ffffff" # white - text[SELECTED] = "#ffffff" # white - text[INSENSITIVE] = {0.6, 0.6, 0.6} # dark gray - - engine "clearlooks" - { - colorize_scrollbar = FALSE #TRUE - reliefstyle = 1 - menubarstyle = 0 # 0 = flat, 1 = sunken, 2 = flat gradient - toolbarstyle = 0 # 0 = flat, 1 = enable effects - animation = FALSE - radius = 3.0 # 3.0 = default, 0.0 = sharp corners - style = GUMMY # CLASSIC, GUMMY, GLOSSY - } -} - - -style "clearlooks-wide" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-button" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 - - bg[NORMAL] = "#f0f1f2" # a hint of blue... - - engine "clearlooks" { - style = CLASSIC - } -} - -style "clearlooks-notebook" = "clearlooks-wide" -{ - bg[NORMAL] = {0.93, 0.93, 0.93} - bg[INSENSITIVE] = {0.93, 0.93, 0.93} -} - -style "clearlooks-tasklist" = "clearlooks-default" -{ - xthickness = 5 - ythickness = 3 -} - -style "clearlooks-menu" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 1 - bg[NORMAL] = "#ffffff" -} - -style "clearlooks-menu-item" = "clearlooks-default" -{ - xthickness = 0 - ythickness = 2 - - fg[PRELIGHT] = "#ffffff" - text[PRELIGHT] = "#ffffff" - # We want PRELIGHT to be white for widgets, but coloured for the menu. - bg[PRELIGHT] = OSX_MENU_COLOR_PLACEHOLDER - - # Radius of the menu items (inside menus) - engine "clearlooks" { - radius = 0.0 - } -} - -style "clearlooks-menu-itembar" = "clearlooks-default" -{ - xthickness = 3 - ythickness = 3 -} - -style "clearlooks-tree" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 2 -} - -style "clearlooks-frame-title" = "clearlooks-default" -{ - fg[NORMAL] = "#404040" -} - -style "clearlooks-tooltips" = "clearlooks-default" -{ - xthickness = 4 - ythickness = 4 - bg[NORMAL] = { 1.0,1.0,0.75 } -} - -style "clearlooks-progressbar" = "clearlooks-default" -{ - xthickness = 1 - ythickness = 1 - - fg[PRELIGHT] = "#ffffff" -} - -style "clearlooks-combo" = "clearlooks-default" -{ - xthickness = 2 - ythickness = 3 -} - -# Added pixmaps for scollbars -style "scrollbar" = "default" -{ - # The values I set here have to do with the relative size of three graphic elements - # I have used: the slider, the arrow box, and the trough. They all have the same width - # of 15 pixels, but gtk wants to put in some spacing between them. It seems like it - # places the sliders inside the trough with a default 1 pixel border on either side of the slider, - # so that the trough has its width stretched by an additional two pixels(?). Setting the - # trough border makes the arrow box sit on top of the trough squarely, by making sure that - # the trough stays the same width as the arrowbox(?). I could be totally wrong here. - GtkRange::trough_border = 0 - GtkRange::slider_width = 15 - - # This sets the size of the steppers (arrow buttons on the end of the scrollbar). - # The image I am using is 15x15 pixels, and if I dont set this a one pixel line - # gets cut off of the top of the "up" stepper. - GtkRange::stepper_size = 15 - - # Set a minimum length for the slider. Since I set the border on the slider - # image to 15 pixels on either end of the slider I want the min length to be - # at least 30 pixels to avoid an ugly slider when gtk wants to make it smaller - # than 30 pixels. - GtkScrollbar::min_slider_length = 30 - - engine "pixmap" - { - # Horizontal slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-horiz.png" - border = { 30, 30, 0, 0 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Vertical slider background - image - { - function = BOX - recolorable = TRUE - detail = "trough" - file = "Scrollbars/trough-scrollbar-vert.png" - border = { 0, 0, 30, 30 } - stretch = TRUE - orientation = VERTICAL - } - - # Normal horizontal slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz-prelight.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Horizontal slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-horiz.png" - border = { 15, 15, 6, 6 } - stretch = TRUE - orientation = HORIZONTAL - } - - # Normal vertical slider - image - { - function = SLIDER - recolorable = TRUE - state = NORMAL - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Active) - image - { - function = SLIDER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (mouse over) - image - { - function = SLIDER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - - # Vertical slider (Insesitive) - image - { - function = SLIDER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars_AQUASTYLE_PLACEHOLDER/slider-vert-prelight.png" - border = { 6, 6, 15, 15 } - stretch = TRUE - orientation = VERTICAL - } - -################################################################################ -# SCROLLBAR STEPPERS -################################################################################ - - # Up - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-up.png" - #border = { 12, 2, 2, 9 } - stretch = TRUE - arrow_direction = UP - } - - ######### DOWN ############ - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-down.png" - #border = { 12, 2, 10, 2 } - stretch = TRUE - arrow_direction = DOWN - } - -############ RIGHT ################ - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-right.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = RIGHT - } - -############### LEFT ################### - - - image - { - function = STEPPER - recolorable = TRUE - state = NORMAL - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = PRELIGHT - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = ACTIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - image - { - function = STEPPER - recolorable = TRUE - state = INSENSITIVE - file = "Scrollbars/stepper-left.png" - #border = { 2, 9, 2, 13 } - stretch = TRUE - arrow_direction = LEFT - } - } -} - -# widget styles -class "GtkWidget" style "clearlooks-default" -class "GtkButton" style "clearlooks-button" -class "GtkCombo" style "clearlooks-button" -class "GtkRange" style "clearlooks-wide" -class "GtkFrame" style "clearlooks-wide" -class "GtkMenu" style "clearlooks-menu" -class "GtkEntry" style "clearlooks-button" -class "GtkMenuItem" style "clearlooks-menu-item" -class "GtkStatusbar" style "clearlooks-wide" -class "GtkNotebook" style "clearlooks-notebook" -class "GtkProgressBar" style "clearlooks-progressbar" -class "GtkScrollbar" style "scrollbar" - -widget_class "*MenuItem.*" style "clearlooks-menu-item" - -# combobox stuff -widget_class "*.GtkComboBox.GtkButton" style "clearlooks-combo" -widget_class "*.GtkCombo.GtkButton" style "clearlooks-combo" - -# tooltips stuff -widget_class "*.tooltips.*.GtkToggleButton" style "clearlooks-tasklist" -widget "gtk-tooltips" style "clearlooks-tooltips" - -# treeview stuff -widget_class "*.GtkTreeView.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCTree.GtkButton" style "clearlooks-tree" -widget_class "*.GtkList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkCList.GtkButton" style "clearlooks-tree" -widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title" - -# notebook stuff -widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook" -widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook" - -# OS X uses 11 but due to differences in font smoothing, 10 actually integrates better -gtk-font-name="Lucida Grande 10" - -# icon sizes: 48, 32, 24 (tango=22), 16 -# -# gtk-dialog main icon in a dialog box: e.g. alert when file is not saved -# gtk-dnd icon showed while dragging and dropping (not used on OS X) -# gtk-button buttons: OK/Cancel dialogs, usually 22 but 16 is more OS X-ish -# gtk-large-toolbar large toolbar: toolbox -# gtk-small-toolbar small toolbar: command bar, tools control, snap control -# gtk-menu menus in applications: File, Edit -# panel-menu general Application/Places menu (not used on OS X) -# -# insckape-decoration layers lock, "affect" icons, etc. -# -#gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=22,22:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=16,16" -gtk-icon-sizes = "gtk-dialog=48,48:gtk-button=16,16:gtk-large-toolbar=24,24:gtk-small-toolbar=16,16:gtk-menu=16,16:inkscape-decoration=12,12" - -# use OS X default pdf-viewer for print preview -gtk-print-preview-command="/usr/bin/open %f" - -# Whether images should be shown on buttons. -# Default value: TRUE -gtk-button-images = 0 - -# Whether images should be shown in menus. -gtk-menu-images = 0 - - diff --git a/packaging/macosx/Resources/xdg_setup.sh b/packaging/macosx/Resources/xdg_setup.sh new file mode 100755 index 000000000..ec7fca648 --- /dev/null +++ b/packaging/macosx/Resources/xdg_setup.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +export XDG_CACHE_HOME="${HOME}/.cache" +export XDG_CONFIG_HOME="${HOME}/.config" +export XDG_DATA_HOME="${HOME}/.local/share" + +mkdir -p "$XDG_CACHE_HOME" +mkdir -p "$XDG_CONFIG_HOME" +mkdir -p "$XDG_DATA_HOME" + +export INK_CACHE_DIR="${XDG_CACHE_HOME}/inkscape" +mkdir -p "$INK_CACHE_DIR" + diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj deleted file mode 100644 index bc081d5ef..000000000 --- a/packaging/macosx/ScriptExec/ScriptExec.xcode/project.pbxproj +++ /dev/null @@ -1,451 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 39; - objects = { - 0249A66BFF388E3F11CA2CEA = { - isa = PBXFileReference; - lastKnownFileType = archive.ar; - name = "libstdc++.a"; - path = "/usr/lib/libstdc++.a"; - refType = 0; - sourceTree = "<absolute>"; - }; -//020 -//021 -//022 -//023 -//024 -//080 -//081 -//082 -//083 -//084 - 0867D6AAFE840B52C02AAC07 = { - children = ( - 0867D6ABFE840B52C02AAC07, - ); - isa = PBXVariantGroup; - name = InfoPlist.strings; - refType = 4; - sourceTree = "<group>"; - }; - 0867D6ABFE840B52C02AAC07 = { - fileEncoding = 10; - isa = PBXFileReference; - lastKnownFileType = text.plist.strings; - name = English; - path = English.lproj/InfoPlist.strings; - refType = 4; - sourceTree = "<group>"; - }; -//080 -//081 -//082 -//083 -//084 -//190 -//191 -//192 -//193 -//194 - 195DF8CFFE9D517E11CA2CBB = { - children = ( - 8D0C4E970486CD37000505A6, - ); - isa = PBXGroup; - name = Products; - refType = 4; - sourceTree = "<group>"; - }; -//190 -//191 -//192 -//193 -//194 -//200 -//201 -//202 -//203 -//204 - 20286C28FDCF999611CA2CEA = { - buildSettings = { - }; - buildStyles = ( - 4A9504C5FFE6A39111CA0CBA, - 4A9504C6FFE6A39111CA0CBA, - ); - hasScannedForEncodings = 1; - isa = PBXProject; - mainGroup = 20286C29FDCF999611CA2CEA; - projectDirPath = ""; - targets = ( - 8D0C4E890486CD37000505A6, - ); - }; - 20286C29FDCF999611CA2CEA = { - children = ( - 20286C2AFDCF999611CA2CEA, - 20286C2CFDCF999611CA2CEA, - 20286C32FDCF999611CA2CEA, - 195DF8CFFE9D517E11CA2CBB, - ); - isa = PBXGroup; - name = ScriptExec; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C2AFDCF999611CA2CEA = { - children = ( - 32DBCF6D0370B57F00C91783, - 20286C2BFDCF999611CA2CEA, - ); - isa = PBXGroup; - name = Sources; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C2BFDCF999611CA2CEA = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.c; - path = main.c; - refType = 4; - sourceTree = "<group>"; - }; - 20286C2CFDCF999611CA2CEA = { - children = ( - 664C29F0060ECDC4006EC560, - B8DCE042056DAC3500C390B0, - 8D0C4E960486CD37000505A6, - B8DCE048056DAC5000C390B0, - 0867D6AAFE840B52C02AAC07, - ); - isa = PBXGroup; - name = Resources; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C32FDCF999611CA2CEA = { - children = ( - 20286C33FDCF999611CA2CEA, - 4A9504CAFFE6A41611CA0CBA, - 4A9504C8FFE6A3BC11CA0CBA, - 0249A66BFF388E3F11CA2CEA, - B8DCE04E056DACAE00C390B0, - ); - isa = PBXGroup; - name = "External Frameworks and Libraries"; - path = ""; - refType = 4; - sourceTree = "<group>"; - }; - 20286C33FDCF999611CA2CEA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = Carbon.framework; - path = /System/Library/Frameworks/Carbon.framework; - refType = 0; - sourceTree = "<absolute>"; - }; -//200 -//201 -//202 -//203 -//204 -//320 -//321 -//322 -//323 -//324 - 32DBCF6D0370B57F00C91783 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = sourcecode.c.h; - path = ScriptExec_Prefix.pch; - refType = 4; - sourceTree = "<group>"; - }; -//320 -//321 -//322 -//323 -//324 -//4A0 -//4A1 -//4A2 -//4A3 -//4A4 - 4A9504C5FFE6A39111CA0CBA = { - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = NO; - DEBUGGING_SYMBOLS = YES; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OPTIMIZATION_CFLAGS = "-O0"; - ZERO_LINK = YES; - }; - isa = PBXBuildStyle; - name = Development; - }; - 4A9504C6FFE6A39111CA0CBA = { - buildRules = ( - ); - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = s; - ZERO_LINK = NO; - }; - isa = PBXBuildStyle; - name = Deployment; - }; - 4A9504C8FFE6A3BC11CA0CBA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = ApplicationServices.framework; - path = /System/Library/Frameworks/ApplicationServices.framework; - refType = 0; - sourceTree = "<absolute>"; - }; - 4A9504CAFFE6A41611CA0CBA = { - fallbackIsa = PBXFileReference; - isa = PBXFrameworkReference; - lastKnownFileType = wrapper.framework; - name = CoreServices.framework; - path = /System/Library/Frameworks/CoreServices.framework; - refType = 0; - sourceTree = "<absolute>"; - }; -//4A0 -//4A1 -//4A2 -//4A3 -//4A4 -//660 -//661 -//662 -//663 -//664 - 664C29F0060ECDC4006EC560 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = openDoc; - refType = 4; - sourceTree = "<group>"; - }; - 664C29F1060ECDC4006EC560 = { - fileRef = 664C29F0060ECDC4006EC560; - isa = PBXBuildFile; - settings = { - }; - }; -//660 -//661 -//662 -//663 -//664 -//8D0 -//8D1 -//8D2 -//8D3 -//8D4 - 8D0C4E890486CD37000505A6 = { - buildPhases = ( - 8D0C4E8A0486CD37000505A6, - 8D0C4E8C0486CD37000505A6, - 8D0C4E8F0486CD37000505A6, - 8D0C4E910486CD37000505A6, - 8D0C4E940486CD37000505A6, - ); - buildRules = ( - ); - buildSettings = { - FRAMEWORK_SEARCH_PATHS = ""; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = ScriptExec_Prefix.pch; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; - GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = NO; - HEADER_SEARCH_PATHS = ""; - INFOPLIST_FILE = Info.plist; - INSTALL_PATH = "$(HOME)/Applications"; - LIBRARY_SEARCH_PATHS = ""; - LIBRARY_STYLE = Static; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - OTHER_REZFLAGS = ""; - PRODUCT_NAME = ScriptExec; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas"; - WRAPPER_EXTENSION = app; - }; - dependencies = ( - ); - isa = PBXNativeTarget; - name = ScriptExec; - productInstallPath = "$(HOME)/Applications"; - productName = ScriptExec; - productReference = 8D0C4E970486CD37000505A6; - productType = "com.apple.product-type.application"; - }; - 8D0C4E8A0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E8B0486CD37000505A6, - ); - isa = PBXHeadersBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E8B0486CD37000505A6 = { - fileRef = 32DBCF6D0370B57F00C91783; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E8C0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E8D0486CD37000505A6, - B8DCE045056DAC3500C390B0, - B8DCE049056DAC5000C390B0, - 664C29F1060ECDC4006EC560, - ); - isa = PBXResourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E8D0486CD37000505A6 = { - fileRef = 0867D6AAFE840B52C02AAC07; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E8F0486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E900486CD37000505A6, - ); - isa = PBXSourcesBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E900486CD37000505A6 = { - fileRef = 20286C2BFDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - ATTRIBUTES = ( - ); - }; - }; - 8D0C4E910486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - 8D0C4E920486CD37000505A6, - 8D0C4E930486CD37000505A6, - B8DCE04F056DACAE00C390B0, - ); - isa = PBXFrameworksBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E920486CD37000505A6 = { - fileRef = 20286C33FDCF999611CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E930486CD37000505A6 = { - fileRef = 0249A66BFF388E3F11CA2CEA; - isa = PBXBuildFile; - settings = { - }; - }; - 8D0C4E940486CD37000505A6 = { - buildActionMask = 2147483647; - files = ( - ); - isa = PBXRezBuildPhase; - runOnlyForDeploymentPostprocessing = 0; - }; - 8D0C4E960486CD37000505A6 = { - fileEncoding = 4; - isa = PBXFileReference; - lastKnownFileType = text.plist; - path = Info.plist; - refType = 4; - sourceTree = "<group>"; - }; - 8D0C4E970486CD37000505A6 = { - explicitFileType = wrapper.application; - includeInIndex = 0; - isa = PBXFileReference; - path = ScriptExec.app; - refType = 3; - sourceTree = BUILT_PRODUCTS_DIR; - }; -//8D0 -//8D1 -//8D2 -//8D3 -//8D4 -//B80 -//B81 -//B82 -//B83 -//B84 - B8DCE042056DAC3500C390B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.nib; - path = MenuBar.nib; - refType = 4; - sourceTree = "<group>"; - }; - B8DCE045056DAC3500C390B0 = { - fileRef = B8DCE042056DAC3500C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - B8DCE048056DAC5000C390B0 = { - fileEncoding = 30; - isa = PBXFileReference; - lastKnownFileType = text.script.sh; - path = script; - refType = 4; - sourceTree = "<group>"; - }; - B8DCE049056DAC5000C390B0 = { - fileRef = B8DCE048056DAC5000C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - B8DCE04E056DACAE00C390B0 = { - isa = PBXFileReference; - lastKnownFileType = wrapper.framework; - name = Security.framework; - path = /System/Library/Frameworks/Security.framework; - refType = 0; - sourceTree = "<absolute>"; - }; - B8DCE04F056DACAE00C390B0 = { - fileRef = B8DCE04E056DACAE00C390B0; - isa = PBXBuildFile; - settings = { - }; - }; - }; - rootObject = 20286C28FDCF999611CA2CEA; -} diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj index 3d0fe0120..0443dd764 100644 --- a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj +++ b/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj @@ -12,14 +12,12 @@ 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; }; 8D0C4E900486CD37000505A6 /* main.c in Sources */ = {isa = PBXBuildFile; fileRef = 20286C2BFDCF999611CA2CEA /* main.c */; settings = {ATTRIBUTES = (); }; }; 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; }; - 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0249A66BFF388E3F11CA2CEA /* libstdc++.a */; }; B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE042056DAC3500C390B0 /* MenuBar.nib */; }; B8DCE049056DAC5000C390B0 /* script in Resources */ = {isa = PBXBuildFile; fileRef = B8DCE048056DAC5000C390B0 /* script */; }; B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B8DCE04E056DACAE00C390B0 /* Security.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0249A66BFF388E3F11CA2CEA /* libstdc++.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libstdc++.a"; path = "/usr/lib/libstdc++.a"; sourceTree = "<absolute>"; }; 0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; }; 20286C2BFDCF999611CA2CEA /* main.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; }; 20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; @@ -40,7 +38,6 @@ buildActionMask = 2147483647; files = ( 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, - 8D0C4E930486CD37000505A6 /* libstdc++.a in Frameworks */, B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -94,7 +91,6 @@ 20286C33FDCF999611CA2CEA /* Carbon.framework */, 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */, 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, - 0249A66BFF388E3F11CA2CEA /* libstdc++.a */, B8DCE04E056DACAE00C390B0 /* Security.framework */, ); name = "External Frameworks and Libraries"; @@ -140,9 +136,15 @@ 20286C28FDCF999611CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + en, + ); mainGroup = 20286C29FDCF999611CA2CEA /* ScriptExec */; projectDirPath = ""; + projectRoot = ""; targets = ( 8D0C4E890486CD37000505A6 /* ScriptExec */, ); @@ -199,6 +201,8 @@ 78E9AE170A36A8E3000D76A8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = NO; DEBUGGING_SYMBOLS = YES; FRAMEWORK_SEARCH_PATHS = ""; @@ -217,7 +221,6 @@ INSTALL_PATH = "$(HOME)/Applications"; LIBRARY_SEARCH_PATHS = ""; LIBRARY_STYLE = Static; - OPTIMIZATION_CFLAGS = "-O0"; OTHER_CFLAGS = ""; OTHER_LDFLAGS = ""; OTHER_REZFLAGS = ""; @@ -236,6 +239,8 @@ 78E9AE180A36A8E3000D76A8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; COPY_PHASE_STRIP = YES; FRAMEWORK_SEARCH_PATHS = ""; GCC_ENABLE_FIX_AND_CONTINUE = NO; @@ -270,6 +275,8 @@ 78E9AE190A36A8E3000D76A8 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; + ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; FRAMEWORK_SEARCH_PATHS = ""; GCC_ENABLE_TRIGRAPHS = NO; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -300,25 +307,18 @@ 78E9AE1B0A36A8E3000D76A8 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; }; 78E9AE1C0A36A8E3000D76A8 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = ( - ppc, - i386, - ); - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; }; 78E9AE1D0A36A8E3000D76A8 /* Default */ = { isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; }; diff --git a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh new file mode 100755 index 000000000..d449b5121 --- /dev/null +++ b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Author: Aaron Voisine <aaron@voisine.org> +# Inkscape Modifications: +# Michael Wybrow <mjwybrow@users.sourceforge.net> +# Jean-Olivier Irisson <jo.irisson@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> +# + +[ -n "$INK_DEBUG_LAUNCHER" ] && set -x + +CWD="$(cd "$(dirname "$0")" && pwd)" +# e.g. /Applications/Inkscape.app/Contents/MacOS +TOP="$(dirname "$CWD")/Resources" +# e.g. /Applications/Inkscape.app/Contents/Resources +BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')" +# e.g. /Applications/Inkscape.app + +source "${TOP}/xdg_setup.sh" +source "${TOP}/alert_fccache.sh" + +# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative +# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change +# of working directory is required: +# +# Due to changes after 0.48, we have change working directory in the script named 'inkscape': +# recursive calls to inkscape from python-based extensions otherwise cause the app to hang or +# fail (for python-based extensions, inkscape changes the working directory to the +# script's directory, and inkscape launched by python script thus can't find resources +# like the now essential 'units.xml' in INKSCAPE_UIDIR relative to the working directory). +cd "$BASE" || exit 1 + +# don't prepend to $PATH in recursive calls: +if [ -z "$INK_PATH_ORIG" ]; then + + # Brutally add many things to the PATH. If the directories do not exist, they won't be used anyway. + # the 'classic' PATH additions: + # /usr/local/bin which, though standard, doesn't seem to be in the PATH + # Fink + # MacPorts (former DarwinPorts) + # LaTeX distribution for Mac OS X + PATH_OTHER="/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" + + # Put /usr/bin at beginning of path so we make sure we use Apple's python + # over one that may be installed be Macports, Fink or some other means. + PATH_PYTHON="/usr/bin" + + # Put $TOP/bin at beginning of path so we make sure that recursive calls + # to inkscape don't pull in other inkscape binaries with different setup. + # Also allows to override system python with custom wrapper script, and + # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export. + PATH_pkgbin="$CWD:$TOP/bin" + + # save orig, new PATH + export INK_PATH_ORIG="$PATH" + export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG" +fi + +# Setup PYTHONPATH to use python modules shipped with Inkscape +OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" +build_arch=__build_arch__ +if [ $OSXMINORNO -gt "5" ]; then + if [ $OSXMINORNO -eq "6" ]; then + export VERSIONER_PYTHON_VERSION=2.6 + else # if [ $OSXMINORNO -ge "7" ]; then + export VERSIONER_PYTHON_VERSION=2.7 + fi + if [ $build_arch = "i386" ]; then + export VERSIONER_PYTHON_PREFER_32_BIT=yes + else # build & runtime arch x86_64 + export VERSIONER_PYTHON_PREFER_32_BIT=no + fi +fi +PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" +export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" + +export FONTCONFIG_PATH="$TOP/etc/fonts" +export PANGO_RC_FILE="$TOP/etc/pango/pangorc" +export PANGO_SYSCONFDIR="$TOP/etc" +export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" +export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache" +export GTK_DATA_PREFIX="$TOP" +export GTK_EXE_PREFIX="$TOP" +export GTK_PATH="$TOP" +export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" +export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" +export GIO_USE_VFS="local" +export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1 +export GVFS_DISABLE_FUSE=1 +export XDG_DATA_DIRS="$TOP/share" +export ASPELL_CONF="prefix $TOP;" +export POPPLER_DATADIR="$TOP/share/poppler" + +# no DBUS for now +unset DBUS_LAUNCHD_SESSION_BUS_SOCKET +unset DBUS_SESSION_BUS_ADDRESS + +# Note: This requires the path with the exact ImageMagic version number. +# The actual version is inserted by the packaging script. +export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" +export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" +export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" + +export INKSCAPE_SHAREDIR="$TOP/share/inkscape" +export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" +export INKSCAPE_LOCALEDIR="$TOP/share/locale" + +# Handle the case where the directory storing Inkscape has special characters +# ('#', '&', '|') in the name. These need to be escaped to work properly for +# various configuration files. +ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` + +# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) +if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then + export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" +fi + +# If the AppleCollationOrder preference doesn't exist, we fall back to using +# the AppleLocale preference. +LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` +if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] +then + LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ + sed 's/_.*//'` + [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 +else + [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 +fi + +# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape +# to crash on startup in locale_from_utf8(). +if [ "x$LANGSTR" == "x" ] +then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 + export LANG="en_US.UTF-8" +else + tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ + tail -n1 | sed 's/\./ /' | awk '{print $2}'`" + if [ "x$tmpLANG" == "x" ] + then + # override broken script + [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="en_US.UTF-8" + else + [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 + export LANG="$tmpLANG.UTF-8" + fi +fi +[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 +export LC_ALL="$LANG" + +case "$INK_DEBUG" in + gdb) + EXEC="gdb --args" ;; + lldb) + EXEC="lldb -- " ;; + dtruss) + EXEC="dtruss" ;; + *) + EXEC="exec" ;; +esac +unset INK_DEBUG # ignore for recursive calls + +if [ "x$INK_DEBUG_SHELL" != "x" ]; then + exec bash +else + $EXEC "$CWD/inkscape-bin" "$@" +fi diff --git a/packaging/macosx/ScriptExec/main.c b/packaging/macosx/ScriptExec/main.c index f413d438a..e3f066d70 100644 --- a/packaging/macosx/ScriptExec/main.c +++ b/packaging/macosx/ScriptExec/main.c @@ -6,6 +6,7 @@ With modifications by Aaron Voisine for gimp.app With modifications by Marianne gagnon for Wilber-loves-apple With modifications by Michael Wybrow for Inkscape.app + With modifications by ~suv for Inkscape.app This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,7 +28,7 @@ /* * This app laucher basically takes care of: - * - launching Inkscape and X11 when double-clicked + * - launching Inkscape when double-clicked * - bringing X11 to the top when its icon is clicked in the dock (via a small applescript) * - catch file dropped on icon events (and double-clicked gimp documents) and notify gimp. * - catch quit events performed outside gimp, e.g. on the dock icon. @@ -39,7 +40,12 @@ #pragma mark Includes // Apple stuff + +// Note: including Carbon prevents building the launcher app in x86_64 +// used for StandardAlert in RequestUserAttention(), +// RedFatalAlert() #include <Carbon/Carbon.h> + #include <CoreFoundation/CoreFoundation.h> #include <Security/Authorization.h> #include <Security/AuthorizationTags.h> @@ -67,7 +73,6 @@ #define kEventClassRedFatalAlert 911 // custom carbon event types -#define kEventKindX11Failed 911 #define kEventKindFCCacheFailed 912 //maximum arguments the script accepts @@ -83,15 +88,14 @@ static void *OpenDoc(void *arg); static OSErr ExecuteScript(char *script, pid_t *pid); static void GetParameters(void); -static char* GetScript(void); -static char* GetOpenDoc(void); +static unsigned char* GetScript(void); +static unsigned char* GetOpenDoc(void); OSErr LoadMenuBar(char *appName); -static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize); +static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize); static void RedFatalAlert(Str255 errorString, Str255 expStr); -static short DoesFileExist(char *path); -static OSStatus FixFCCache(void); +static short DoesFileExist(unsigned char *path); static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon); @@ -99,8 +103,6 @@ static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon); static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon); -static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData); static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, EventRef theEvent, void *userData); static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, @@ -109,7 +111,7 @@ static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, static OSStatus CompileAppleScript(const void* text, long textLength, AEDesc *resultData); static OSStatus SimpleCompileAppleScript(const char* theScript); -static void runScript(); +static OSErr runScript(); /////////////////////////////////////// // Globals @@ -144,7 +146,6 @@ extern char **environ; int main(int argc, char* argv[]) { OSErr err = noErr; - EventTypeSpec X11events = { kEventClassRedFatalAlert, kEventKindX11Failed }; EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed }; InitCursor(); @@ -165,9 +166,6 @@ int main(int argc, char* argv[]) 0, false); err += InstallEventHandler(GetApplicationEventTarget(), - NewEventHandlerUPP(X11FailedHandler), 1, - &X11events, NULL, NULL); - err += InstallEventHandler(GetApplicationEventTarget(), NewEventHandlerUPP(FCCacheFailedHandler), 1, &FCCacheEvents, NULL, NULL); @@ -181,7 +179,7 @@ int main(int argc, char* argv[]) GetParameters(); //load data from files containing exec settings // compile "icon clicked" script so it's ready to execute - SimpleCompileAppleScript("tell application \"X11\" to activate"); + SimpleCompileAppleScript("tell application \"XQuartz\" to activate"); RunApplicationEventLoop(); //Run the event loop return 0; @@ -229,6 +227,7 @@ static void ShowFirstStartWarningDialog(void) ////////////////////////////////// // Handler for when fontconfig caches need to be generated +// TODO: remove (alert and touch moved to launcher script) ////////////////////////////////// static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, EventRef theEvent, void *userData) @@ -243,8 +242,8 @@ static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, ShowFirstStartWarningDialog(); // Note that we've seen the warning. - system("test -d \"$HOME/.inkscape-etc\" || mkdir -p \"$HOME/.inkscape-etc\"; " - "touch \"$HOME/.inkscape-etc/.fccache-new\""); + system("test -d \"$HOME/.cache/inkscape\" || mkdir -p \"$HOME/.cache/inkscape\"; " + "touch \"$HOME/.cache/inkscape/.fccache-new\""); // Rerun now. OSErr err = ExecuteScript(scriptPath, &pid); ExitToShell(); @@ -253,116 +252,6 @@ static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, } -static size_t safeRead(int d, void *buf, size_t nbytes) -{ - ssize_t bytesToRead = nbytes; - ssize_t bytesRead = 0; - char *offset = (char *) buf; - - while ((bytesToRead > 0)) - { - bytesRead = read(d, offset, bytesToRead); - if (bytesRead > 0) - { - offset += bytesRead; - bytesToRead -= bytesRead; - } - else if (bytesRead == 0) - { - // Reached EOF. - break; - } - else if (bytesRead == -1) - { - if ((errno == EINTR) || (errno == EAGAIN)) - { - // Try again. - continue; - } - return 0; - } - } - return bytesRead; -} - - -///////////////////////////////////// -// Code to run fc-cache on first run -///////////////////////////////////// -static OSStatus FixFCCache (void) -{ - FILE *fileConnToChild = NULL; - int fdConnToChild = 0; - pid_t childPID = WAIT_ANY; - size_t bytesChildPID; - size_t bytesRead; - int status; - - char commandStr[] = "/usr/X11R6/bin/fc-cache"; - char *commandArgs[] = { "-f", NULL }; - - // Run fc-cache - AuthorizationItem authItems[] = - { - { - kAuthorizationRightExecute, - strlen(commandStr), - commandStr, - 0 - } - }; - AuthorizationItemSet authItemSet = - { - 1, - authItems - }; - AuthorizationRef authRef = NULL; - OSStatus err = AuthorizationCreate (NULL, &authItemSet, - kAuthorizationFlagInteractionAllowed | - kAuthorizationFlagExtendRights, &authRef); - - if (err == errAuthorizationSuccess) - { - err = AuthorizationExecuteWithPrivileges(authRef, commandStr, - kAuthorizationFlagDefaults, commandArgs, - &fileConnToChild); - - if (err == errAuthorizationSuccess) - { - // Unfortunately, AuthorizationExecuteWithPrivileges - // does not return the process ID associated with the - // process it runs. The best solution we have it to - // try and get the process ID from the file descriptor. - // This is based on example code from Apple's - // MoreAuthSample. - - fdConnToChild = fileno(fileConnToChild); - - // Try an get the process ID of the fc-cache command - bytesChildPID = sizeof(childPID); - bytesRead = safeRead(fdConnToChild, &childPID, - bytesChildPID); - if (bytesRead != bytesChildPID) - { - // If we can't get it the best alternative - // is to wait for any child to finish. - childPID = WAIT_ANY; - } - - if (fileConnToChild != NULL) { - fclose(fileConnToChild); - } - - // Wait for child process to finish. - waitpid(childPID, &status, 0); - } - } - AuthorizationFree(authRef, kAuthorizationFlagDestroyRights); - - return err; -} - - /////////////////////////////////// // Execution thread starts here /////////////////////////////////// @@ -373,12 +262,7 @@ static void *Execute (void *arg) taskDone = false; OSErr err = ExecuteScript(scriptPath, &pid); - if (err == (OSErr)11) { - CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindX11Failed, 0, - kEventAttributeNone, &event); - PostEventToQueue(GetMainEventQueue(), event, kEventPriorityStandard); - } - else if (err == (OSErr)12) { + if (err == (OSErr)12) { CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0, kEventAttributeNone, &event); PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh); @@ -448,14 +332,13 @@ static void GetParameters (void) /////////////////////////////////////// // Get path to the script in Resources folder /////////////////////////////////////// -static char* GetScript (void) +static unsigned char* GetScript (void) { CFStringRef fileName; CFBundleRef appBundle; CFURLRef scriptFileURL; FSRef fileRef; - FSSpec fileSpec; - char *path; + unsigned char *path; //get CF URL for script if (! (appBundle = CFBundleGetMainBundle())) return NULL; @@ -472,13 +355,9 @@ static char* GetScript (void) CFRelease(scriptFileURL); CFRelease(fileName); - //convert FSRef to FSSpec - if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec, - NULL)) return NULL; - //create path string if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL; + if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; if (! DoesFileExist(path)) return NULL; return path; @@ -487,14 +366,13 @@ static char* GetScript (void) /////////////////////////////////////// // Gets the path to openDoc in Resources folder /////////////////////////////////////// -static char* GetOpenDoc (void) +static unsigned char* GetOpenDoc (void) { CFStringRef fileName; CFBundleRef appBundle; CFURLRef openDocFileURL; FSRef fileRef; - FSSpec fileSpec; - char *path; + unsigned char *path; //get CF URL for openDoc if (! (appBundle = CFBundleGetMainBundle())) return NULL; @@ -511,13 +389,9 @@ static char* GetOpenDoc (void) CFRelease(openDocFileURL); CFRelease(fileName); - //convert FSRef to FSSpec - if (FSGetCatalogInfo(&fileRef, kFSCatInfoNone, NULL, NULL, &fileSpec, - NULL)) return NULL; - //create path string if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileSpec, path, kMaxPathLength)) return NULL; + if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; if (! DoesFileExist(path)) return NULL; return path; @@ -545,14 +419,8 @@ OSErr LoadMenuBar (char *appName) /////////////////////////////////////// // Generate path string from FSSpec record /////////////////////////////////////// -static OSStatus FSMakePath(FSSpec file, char *path, long maxPathSize) +static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize) { - OSErr err = noErr; - FSRef fileRef; - - //create file reference from file spec - if (err = FSpMakeFSRef(&file, &fileRef)) return err; - // and then convert the FSRef to a path return FSRefMakePath(&fileRef, path, maxPathSize); } @@ -569,9 +437,9 @@ static void RedFatalAlert (Str255 errorString, Str255 expStr) /////////////////////////////////////// // Determines whether file exists at path or not /////////////////////////////////////// -static short DoesFileExist (char *path) +static short DoesFileExist (unsigned char *path) { - if (access(path, F_OK) == -1) return false; + if (access((char *)path, F_OK) == -1) return false; return true; } @@ -590,7 +458,7 @@ static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, if (! taskDone && pid) { //kill the script process brutally kill(pid, 9); - printf("Platypus App: PID %d killed brutally\n", pid); + printf("Inkscape.app: PID %d killed brutally\n", pid); } pthread_cancel(tid); @@ -610,31 +478,31 @@ static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, #pragma unused (reply, refCon) OSErr err = noErr; - AEDescList fileSpecList; + AEDescList fileRefList; AEKeyword keyword; DescType type; short i; long count, actualSize; - FSSpec fileSpec; - char path[kMaxPathLength]; + FSRef fileRef; + unsigned char path[kMaxPathLength]; while (numArgs > 0) free(fileArgs[numArgs--]); //Read the AppleEvent err = AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList, - &fileSpecList); + &fileRefList); - err = AECountItems(&fileSpecList, &count); //Count number of files + err = AECountItems(&fileRefList, &count); //Count number of files for (i = 1; i <= count; i++) { //iteratively process each file - //get fsspec from apple event - if (! (err = AEGetNthPtr(&fileSpecList, i, typeFSS, &keyword, &type, - (Ptr)&fileSpec, sizeof(FSSpec), &actualSize))) + //get fsref from apple event + if (! (err = AEGetNthPtr(&fileRefList, i, typeFSRef, &keyword, &type, + (Ptr)&fileRef, sizeof(FSRef), &actualSize))) { - //get path from file spec - if ((err = FSMakePath(fileSpec, (unsigned char *)&path, + //get path from file ref + if ((err = FSMakePath(fileRef, (unsigned char *)&path, kMaxPathLength))) return err; if (numArgs == kMaxArgumentsToScript) break; @@ -659,7 +527,7 @@ static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, AppleEvent *reply, long refCon) { - runScript(); + return runScript(); } // if app is being opened @@ -675,70 +543,6 @@ static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, } -static void OpenURL(Str255 url) -{ - // Use Internet Config to hand the URL to the appropriate application, as - // set by the user in the Internet Preferences pane. - ICInstance icInstance; - // Applications creator code: - OSType signature = 'Inks'; - OSStatus error = ICStart( &icInstance, signature ); - if ( error == noErr ) - { - ConstStr255Param hint = 0x0; - const char* data = url; - long length = strlen(url); - long start = 0; - long end = length; - // Don't bother testing return value (error); launched application will - // report problems. - ICLaunchURL( icInstance, hint, data, length, &start, &end ); - ICStop( icInstance ); - } -} - - -////////////////////////////////// -// Handler for when X11 fails to start -////////////////////////////////// -static OSStatus X11FailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData) -{ - #pragma unused(theHanderCall, theEvent, userData) - - pthread_join(tid, NULL); - if (odtid) pthread_join(odtid, NULL); - - SInt16 itemHit; - const char *getX11 = "\pGet X11 for Panther"; - - AlertStdAlertParamRec params; - params.movable = true; - params.helpButton = false; - params.filterProc = NULL; - params.defaultText = (StringPtr) kAlertDefaultOKText; - params.cancelText = getX11; - params.otherText = NULL; - params.defaultButton = kAlertStdAlertOKButton; - params.cancelButton = kAlertStdAlertCancelButton; - params.position = kWindowDefaultPosition; - - StandardAlert(kAlertStopAlert, "\pFailed to start X11", - "\pInkscape.app requires Apple's X11, which is freely downloadable from Apple's website for Panther (10.3.x) users and available as an optional install from the installation DVD for Tiger (10.4.x) users.\n\nPlease install X11 and restart Inkscape.", - ¶ms, &itemHit); - - if (itemHit == kAlertStdAlertCancelButton) - { - OpenURL("http://www.apple.com/downloads/macosx/apple/macosx_updates/x11formacosx.html"); - } - - ExitToShell(); - - - return noErr; -} - - // Compile and run a small AppleScript. The code below does no cleanup and no proper error checks // but since it's there until the app is shut down, and since we know the script is okay, // there should not be any problems. @@ -774,7 +578,7 @@ static OSStatus CompileAppleScript(const void* text, long textLength, } /* runs the compiled applescript */ -static void runScript() +static OSErr runScript() { /* run the script */ err = OSAExecute(theComponent, scriptID, kOSANullScript, diff --git a/packaging/macosx/create-stock-icon-theme.sh b/packaging/macosx/create-stock-icon-theme.sh new file mode 100755 index 000000000..6ca3d5772 --- /dev/null +++ b/packaging/macosx/create-stock-icon-theme.sh @@ -0,0 +1,165 @@ +#!/usr/bin/env bash +# +# +# Create new icon theme based on GTK+ stock icons +# +# Copyright (C) 2014 ~suv +# + + +# config +#--------------------------------------------------------- + +if [ -z $LIBPREFIX ]; then + LIBPREFIX="/opt/local-x11" +fi +if [ -z $stock_src ]; then + stock_src="$(pwd)/stock-icons" +fi + + +#Â setup +#--------------------------------------------------------- + +map_legacy_icons="$LIBPREFIX/libexec/icon-name-mapping" +if [ ! -x "$map_legacy_icons" ]; then + echo "Install icon-naming-utils" + exit 1 +fi + +if [ ! -d "$stock_src" ]; then + echo "extra icons not found." + exit 1 +fi + +ICONDIR="$1" +icon_theme_dir="$(dirname "$ICONDIR")" +if [ ! -d "$icon_theme_dir" ] ; then + mkdir -p "$icon_theme_dir" +fi +icon_theme_name="$(basename "$ICONDIR")" +if [ -z "$icon_theme_name" ]; then + echo "Not a valid icon theme name." + exit 1 +fi +theme_color="$2" + +contexts="actions animations apps categories devices emblems emotes mimetypes places status" +gtk_stock_sizes="16 20 24 32 48" + +orig_dir="$(pwd)" +cd "$icon_theme_dir" +current_dir="$(pwd)" + +index_file="${icon_theme_name}/index.theme" + + +# Remove a previously existing icon theme if necessary +#--------------------------------------------------------- + +if [ -d "$icon_theme_name" ]; then + echo "Removing previous $icon_theme_name" + rm -R "$icon_theme_name" +fi + + +# create new icon theme structure +#--------------------------------------------------------- + +mkdir -p "$icon_theme_name" +for size in $gtk_stock_sizes; do + mkdir "${icon_theme_name}/${size}x${size}" +done + + +# copy stock icons +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cp -RP "${stock_src}/$size" "${icon_theme_name}/${size}x${size}/stock" +done + +# workarounds for broken icons (bug #1269698) +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cd "${icon_theme_name}/${size}x${size}/stock" + # directional icons + for di in "edit-undo" "edit-redo" "document-revert"; do + if [ -f "${di}-ltr.png" ]; then + if [ ! -e "${di}.png" ]; then + ln -s "${di}-ltr.png" "${di}.png" + fi + fi + done + # misc failed lookups + for di in "preferences"; do + if [ -f "gtk-${di}.png" ]; then + if [ ! -e "${di}-system.png" ]; then + ln -s "gtk-${di}.png" "${di}-system.png" + fi + fi + done + cd "$current_dir" +done + +# create links (round 1) +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cd "${icon_theme_name}/${size}x${size}" + for ct in $contexts; do + echo "size: $size context: $ct" + mv "stock" "$ct" + $map_legacy_icons -c "$ct" + mv $ct "stock" + done + cd "$current_dir" +done + + +# create links (round 2) +#--------------------------------------------------------- + +for size in $gtk_stock_sizes; do + cd "${icon_theme_name}/${size}x${size}/stock" + for icon_file in *.png; do + [ -s $icon_file ] && ln -s "$icon_file" "$(basename $icon_file .png)"-symbolic.png + done + cd "$current_dir" +done + + +#Â create new index.theme +#--------------------------------------------------------- + +dir_list= +for size in $gtk_stock_sizes; do + dir_list="${dir_list}${size}x${size}/stock," +done + +cat > "$index_file" <<End-of-message +[Icon Theme] +Name=$icon_theme_name +Inherits=hicolor +Comment=Gtk Stock Icons for Inkscape.app +Example=folder + +# Directory list +Directories=$dir_list + +End-of-message + +for size in $gtk_stock_sizes; do + cat >> "$index_file" << End-of-message +[${size}x${size}/stock] +Size=${size} +Context=Stock +Type=fixed + +End-of-message +done + + +#--------------------------------------------------------- +# vim: expandtab shiftwidth=4 tabstop=8 softtabstop=4 fileencoding=utf-8 textwidth=99 diff --git a/packaging/macosx/dmg_background.png b/packaging/macosx/dmg_background.png Binary files differindex 04cc698df..0ee039718 100644 --- a/packaging/macosx/dmg_background.png +++ b/packaging/macosx/dmg_background.png diff --git a/packaging/macosx/dmg_background.svg b/packaging/macosx/dmg_background.svg index 559b77ef6..a62beb370 100644 --- a/packaging/macosx/dmg_background.svg +++ b/packaging/macosx/dmg_background.svg @@ -10,858 +10,215 @@ xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="624.54108" - height="350" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.46+devel r21585 custom" - sodipodi:docname="dmg_background.svg" - version="1.0" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - inkscape:output_extension="org.inkscape.output.svg.inkscape" - inkscape:export-filename="./dmg_background.png"> + width="1280" + height="800" + id="svg13532" + version="1.1" + inkscape:version="0.91pre2 r13554 custom" + viewBox="0 0 1280 800" + sodipodi:docname="dmg_background.svg"> <defs - id="defs4"> + id="defs13534"> <linearGradient inkscape:collect="always" - id="linearGradient5781"> - <stop - style="stop-color:#555753;stop-opacity:1" - offset="0" - id="stop5783" /> - <stop - style="stop-color:#d3d7cf;stop-opacity:1" - offset="1" - id="stop5785" /> - </linearGradient> - <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 175 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="624.54108 : 175 : 1" - inkscape:persp3d-origin="312.27054 : 116.66667 : 1" - id="perspective58" /> - <linearGradient - id="linearGradient841"> - <stop - id="stop842" - offset="0" - style="stop-color:#62c012;stop-opacity:1;" /> - <stop - id="stop843" - offset="1" - style="stop-color:white;stop-opacity:0;" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient841" - id="linearGradient4989" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(4.195695,0,0,1.0590609,48.598964,114.17717)" - x1="76.911163" - y1="25.401896" - x2="76.911163" - y2="137.02844" /> - <filter - inkscape:collect="always" - x="-1.0928679" - width="3.1857358" - y="-1.212016" - height="3.424032" - id="filter6362"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6364" /> - </filter> - <filter - inkscape:collect="always" - x="-0.27738996" - width="1.5547799" - y="-0.28560414" - height="1.5712083" - id="filter6366"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6368" /> - </filter> - <filter - inkscape:collect="always" - x="-0.9599201" - width="2.9198402" - y="-1.2584231" - height="3.5168462" - id="filter6370"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6372" /> - </filter> - <filter - inkscape:collect="always" - x="-1.2436028" - width="3.4872055" - y="-1.2664239" - height="3.5328478" - id="filter6374"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="6.9435145" - id="feGaussianBlur6376" /> - </filter> - <filter - inkscape:collect="always" - x="-0.016262574" - width="1.0325251" - y="-0.19320738" - height="1.3864148" - id="filter6402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.8499877" - id="feGaussianBlur6404" /> - </filter> - <clipPath - clipPathUnits="userSpaceOnUse" - id="clipPath8875"> - <path - style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.81105022pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 251.4419,206.10491 C 247.44915,206.10491 244.22315,209.33092 244.22315,213.32366 L 244.22315,312.47991 C 244.22315,316.47265 247.44915,319.69867 251.4419,319.69866 L 472.16065,319.69866 C 476.1534,319.69866 479.34815,316.47264 479.34815,312.47991 L 479.34815,213.32366 C 479.34815,209.33092 476.1534,206.10491 472.16065,206.10491 L 251.4419,206.10491 z M 321.1294,233.57366 L 321.1294,244.94866 L 321.16065,244.94866 L 440.0669,244.94866 L 440.0669,277.26116 L 321.1919,277.26116 L 321.2544,288.63616 L 282.1294,261.26116 L 321.1294,233.57366 z" - id="path8877" /> - </clipPath> - <filter - inkscape:collect="always" - id="filter9015"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.755523" - id="feGaussianBlur9017" /> - </filter> - <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9" - id="linearGradient1539" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7" /> - </filter> - <linearGradient - id="linearGradient10981-3-9"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3" - id="linearGradient5822-7" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5" /> - </filter> - <linearGradient - id="linearGradient5805-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9" - id="radialGradient5811-3" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> - <linearGradient - id="linearGradient5793-9"> + id="content_bg"> <stop + style="stop-color:#eeeeee;stop-opacity:1" offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9" - id="linearGradient5801-2" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> - <filter - color-interpolation-filters="sRGB" - id="filter5983-8" - x="-0.082508981" - width="1.165018" - y="-0.12233575" - height="1.2446715"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.6868363" - id="feGaussianBlur5985-3" /> - </filter> - <linearGradient - id="linearGradient5899-9"> + id="stop4699" /> <stop - offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9" /> - <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3" /> + id="stop4701" /> </linearGradient> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9" - id="linearGradient5905-4" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4" /> - </filter> - <linearGradient - id="linearGradient9286-3"> + inkscape:collect="always" + id="header_bg"> <stop + style="stop-color:#e6e6e6;stop-opacity:1" offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9" /> + id="stop4685" /> <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3" - id="radialGradient11553-3" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7" /> - </filter> - <linearGradient - id="linearGradient9040-4"> + id="stop4687" + offset="0.13333334" + style="stop-color:#e6e6e6;stop-opacity:1" /> <stop - offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3" /> - <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7" /> + id="stop4689" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4" - id="radialGradient9046-1" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient9025-1" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient9023-6" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient8998-5"> + inkscape:collect="always" + id="nav_foot"> <stop + style="stop-color:#4d4d4d;stop-opacity:1" offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9" /> + id="stop4635" /> <stop + style="stop-color:#333333;stop-opacity:1" offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5" /> + id="stop4637" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5" - id="radialGradient9004-6" - fy="187.86935" - fx="89.875" - r="22.75" - cy="187.86935" - cx="89.875" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4" - id="radialGradient8994-0" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8992-2" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8990-4" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9" /> - </filter> <linearGradient - id="linearGradient8916-4"> + inkscape:collect="always" + id="nav_top"> <stop + style="stop-color:#4d4d4d;stop-opacity:1" offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9" /> + id="stop4469" /> <stop + style="stop-color:#1a1a1a;stop-opacity:1" offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9" /> + id="stop4471" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4" - id="radialGradient8922-9" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7" /> - </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8910-3" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient8866-0"> + id="linearGradient5785-8-9"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3" /> + style="stop-color:#c0cdf9;stop-opacity:1" + id="stop5787-7-9" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0" /> + style="stop-color:#07092d;stop-opacity:0.28804347" + id="stop5789-3-7" /> </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0" - id="linearGradient8912-9" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4" - id="radialGradient8768-6" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <linearGradient - id="linearGradient8738-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4" - id="radialGradient8744-9" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5" /> - </filter> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7" - id="radialGradient8574-0" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <linearGradient - id="linearGradient8568-7"> + id="WhiteTransparent-3-90"> <stop offset="0" style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9" /> + id="stop7606-1-2" /> <stop offset="1" style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1" /> + id="stop7608-8-0" /> </linearGradient> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7" - id="radialGradient9177-1" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3" - id="IcecapTip-0" - y2="50" - x2="90" - y1="20" - x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3"> + id="linearGradient5793-9-3"> <stop offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1" /> + style="stop-color:#eeeeec;stop-opacity:1" + id="stop5795-5-7" /> <stop offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8" /> + style="stop-color:#eeeeec;stop-opacity:0" + id="stop5797-4-8" /> </linearGradient> <linearGradient - gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3" - id="shinySpecular-0" - y2="60" - x2="58" - y1="35" - x1="33" /> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5" /> - </filter> - <clipPath - id="clipPath9086-1"> - <use - xlink:href="#outline1" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0" - transform="translate(1.0095461e-6,0)" /> - </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8"> + id="linearGradient10981-3-9-0"> <stop offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7" /> + style="stop-color:#729fcf;stop-opacity:1" + id="stop10983-2-0-9" /> <stop offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3" /> + style="stop-color:#729fcf;stop-opacity:0" + id="stop10985-3-7-7" /> </linearGradient> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8" - id="linearGradient9175-3" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter8490"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785"> + inkscape:collect="always" + id="linearGradient5781"> <stop + style="stop-color:#555753;stop-opacity:1" offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787" /> + id="stop5783" /> <stop + style="stop-color:#d3d7cf;stop-opacity:1" offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789" /> + id="stop5785" /> </linearGradient> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785" + xlink:href="#linearGradient5785-8-9" id="linearGradient9175" y2="40" x2="60" y1="20" x1="82.118591" /> <clipPath - id="clipoutline1"> + id="clipoutline1-8"> <path - id="outline1" + id="outline1-2" d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" /> </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent" - id="sideSpecular" - y2="40" - x2="60" - y1="20" - x1="80" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent" - id="liquidSpecular" - y2="76" - x2="0" - y1="128" - x1="0" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9" /> - </linearGradient> - <inkscape:perspective - id="perspective3208" - inkscape:persp3d-origin="64 : 42.666667 : 1" - inkscape:vp_z="128 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 64 : 1" - sodipodi:type="inkscape:persp3d" /> - <inkscape:perspective - id="perspective3354" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /> <filter color-interpolation-filters="sRGB" id="filter6017-3-7"> <feGaussianBlur inkscape:collect="always" stdDeviation="0.80546496" - id="feGaussianBlur6019-9-6" /> + id="feGaussianBlur6019-9-28" /> </filter> <filter color-interpolation-filters="sRGB" - id="filter6031-0-4"> + id="filter6031-0-56"> <feGaussianBlur inkscape:collect="always" stdDeviation="3.4903482" - id="feGaussianBlur6033-8-3" /> + id="feGaussianBlur6033-8-49" /> </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-3" - id="linearGradient9175-3-0" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-3"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-0" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-9" /> - </linearGradient> <clipPath - id="clipPath9086-1-2"> + id="clipPath9086-1-5"> <use - xlink:href="#outline1" + xlink:href="#outline1-2" height="300" width="400" y="0" x="0" style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-5" + id="use9088-0-9" transform="translate(1.0095461e-6,0)" /> </clipPath> <filter color-interpolation-filters="sRGB" - id="filter8490-0-4"> + id="filter8490-0-0"> <feGaussianBlur inkscape:collect="always" stdDeviation="2.4163949" id="feGaussianBlur8492-5-0" /> </filter> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-3" - id="linearGradient3370" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient3372"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop3374" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop3376" /> - </linearGradient> - <linearGradient gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-9" - id="shinySpecular-0-5" + xlink:href="#WhiteTransparent-3-90" + id="shinySpecular-0-4" y2="60" x2="58" y1="35" x1="33" /> <linearGradient gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-6" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-9" - id="IcecapTip-0-9" + xlink:href="#WhiteTransparent-3-90" + id="IcecapTip-0-3" y2="50" x2="90" y1="20" x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient3383"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3385" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3387" /> - </linearGradient> <radialGradient gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-2" - id="radialGradient9177-1-2" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient9177-1-7" fy="250.89737" fx="116.31038" r="30.599579" cy="250.89737" cx="116.31038" /> - <linearGradient - id="linearGradient8568-7-2"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1-7" /> - </linearGradient> <radialGradient gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-2" - id="radialGradient8574-0-7" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8574-0-1" fy="251.99396" fx="132.44434" r="30.599579" cy="251.99396" cx="132.44434" /> - <linearGradient - id="linearGradient3394"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3396" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3398" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8732-3-5" + id="filter8732-3-8" x="-0.078079157" width="1.1561583" y="-0.11422065" @@ -869,50 +226,28 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="1.9579068" - id="feGaussianBlur8734-5-4" /> + id="feGaussianBlur8734-5-0" /> </filter> <radialGradient gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-1" - id="radialGradient8744-9-8" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8744-9-7" fy="168.5" fx="210.25" r="34.25" cy="168.5" cx="210.25" /> - <linearGradient - id="linearGradient8738-4-1"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4-8" /> - </linearGradient> <radialGradient gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-1" - id="radialGradient8768-6-9" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8768-6-2" fy="182.08189" fx="217.5" r="34.25" cy="182.08189" cx="217.5" /> - <linearGradient - id="linearGradient3407"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3409" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3411" /> - </linearGradient> <filter color-interpolation-filters="sRGB" id="filter8764-9-3" @@ -923,49 +258,27 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="2.1195652" - id="feGaussianBlur8766-2-6" /> + id="feGaussianBlur8766-2-4" /> </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8912-9-8" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8912-9-9" y2="201.5" x2="231.75" y1="195.1875" x1="231.625" /> <linearGradient - id="linearGradient8866-0-0"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0-1" /> - </linearGradient> - <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8910-3-0" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8910-3-8" y2="200.07138" x2="231.37646" y1="195.62132" x1="231.37646" /> - <linearGradient - id="linearGradient3420"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3422" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3424" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8906-3-5" + id="filter8906-3-4" x="-0.085441329" width="1.1708827" y="-0.27823201" @@ -973,32 +286,21 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="0.56515877" - id="feGaussianBlur8908-7-1" /> + id="feGaussianBlur8908-7-88" /> </filter> <radialGradient gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-0" - id="radialGradient8922-9-1" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8922-9-3" fy="204.83229" fx="228.21875" r="14.09375" cy="204.83229" cx="228.21875" /> - <linearGradient - id="linearGradient8916-4-0"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9-8" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9-5" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter8980-1-0" + id="filter8980-1-63" x="-0.069862768" width="1.1397254" y="-0.47285891" @@ -1010,182 +312,69 @@ </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8990-4-4" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8990-4-8" y2="201.5" x2="231.75" y1="195.1875" x1="231.625" /> <linearGradient - id="linearGradient3435"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3437" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3439" /> - </linearGradient> - <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient8992-2-6" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient8992-2-5" y2="200.07138" x2="231.37646" y1="195.62132" x1="231.37646" /> - <linearGradient - id="linearGradient3442"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3444" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3446" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter3448" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur3450" /> - </filter> <radialGradient gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-0" - id="radialGradient8994-0-2" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient8994-0-8" fy="204.83229" fx="228.21875" r="14.09375" cy="204.83229" cx="228.21875" /> - <linearGradient - id="linearGradient3453"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3455" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3457" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter3459" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur3461" /> - </filter> <radialGradient gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5-8" - id="radialGradient9004-6-5" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient9004-6-0" fy="187.86935" fx="89.875" r="22.75" cy="187.86935" cx="89.875" /> <linearGradient - id="linearGradient8998-5-8"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5-2" /> - </linearGradient> - <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient9023-6-8" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient9023-6-6" y2="201.5" x2="231.75" y1="195.1875" x1="231.625" /> <linearGradient - id="linearGradient3468"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3470" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3472" /> - </linearGradient> - <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-0" - id="linearGradient9025-1-4" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient9025-1-9" y2="200.07138" x2="231.37646" y1="195.62132" x1="231.37646" /> - <linearGradient - id="linearGradient3475"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3477" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3479" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter3481" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur3483" /> - </filter> <radialGradient gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4-2" - id="radialGradient9046-1-7" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient9046-1-8" fy="230.83626" fx="90.28125" r="10.46875" cy="230.83626" cx="90.28125" /> - <linearGradient - id="linearGradient9040-4-2"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7-0" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter9068-2-6" + id="filter9068-2-2" x="-0.076179281" width="1.1523587" y="-0.1655701" @@ -1198,54 +387,32 @@ <radialGradient gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3-9" - id="radialGradient11553-3-9" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient11553-3-1" fy="21.225746" fx="68.39994" r="54.783398" cy="21.225746" cx="68.39994" /> - <linearGradient - id="linearGradient9286-3-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2-8" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter9298-4-1"> + id="filter9298-4-5"> <feGaussianBlur inkscape:collect="always" stdDeviation="0.32610678" - id="feGaussianBlur9300-4-3" /> + id="feGaussianBlur9300-4-6" /> </filter> <linearGradient gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9-1" - id="linearGradient5905-4-1" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient5905-4-7" y2="223.5" x2="153.5" y1="208.16444" x1="95.5" /> - <linearGradient - id="linearGradient5899-9-1"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3-3" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter5983-8-4" + id="filter5983-8-5" x="-0.082508981" width="1.165018" y="-0.12233575" @@ -1253,105 +420,51 @@ <feGaussianBlur inkscape:collect="always" stdDeviation="3.6868363" - id="feGaussianBlur5985-3-0" /> + id="feGaussianBlur5985-3-7" /> </filter> <linearGradient gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-9" - id="linearGradient5801-2-3" + xlink:href="#linearGradient5793-9-3" + id="linearGradient5801-2-8" y2="84.480316" x2="53.63158" y1="76.246338" x1="57.225197" /> - <linearGradient - id="linearGradient5793-9-9"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-1" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-9" /> - </linearGradient> <radialGradient gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9-9" - id="radialGradient5811-3-6" + xlink:href="#WhiteTransparent-3-90" + id="radialGradient5811-3-0" fy="214.55121" fx="181.22731" r="22.466398" cy="214.55121" cx="181.22731" /> - <linearGradient - id="linearGradient5805-9-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4-3" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9-3" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter5845-5-8"> + id="filter5845-5-1"> <feGaussianBlur inkscape:collect="always" stdDeviation="1.2409356" - id="feGaussianBlur5847-5-0" /> + id="feGaussianBlur5847-5-4" /> </filter> <linearGradient gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-9" - id="linearGradient5822-7-5" + xlink:href="#WhiteTransparent-3-90" + id="linearGradient5822-7-1" y2="187.65974" x2="82.754066" y1="180.47572" x1="73.712105" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient3514"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop3516" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop3518" /> - </linearGradient> - <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9-6" - id="linearGradient1539-6" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> - <linearGradient - id="linearGradient10981-3-9-6"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-4" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-0" /> - </linearGradient> <filter color-interpolation-filters="sRGB" - id="filter10997-7-2-0"> + id="filter10997-7-2-1"> <feGaussianBlur inkscape:collect="always" stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-4" /> + id="feGaussianBlur10999-0-7-6" /> </filter> <linearGradient gradientTransform="translate(-130.16572,-83.352786)" @@ -1362,1541 +475,871 @@ x2="153.70045" y1="217.5" x1="180.81293" /> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-9" /> - </filter> - <linearGradient - id="linearGradient10981-3-9-0"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-9" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-7" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient5822-7-6" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5-6"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5-7" /> - </filter> - <linearGradient - id="linearGradient5805-9-6"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9-4" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9-6" - id="radialGradient5811-3-8" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> - <linearGradient - id="linearGradient5793-9-3"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-7" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-8" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-3" - id="linearGradient5801-2-0" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> - <filter - color-interpolation-filters="sRGB" - id="filter5983-8-5" - x="-0.082508981" - width="1.165018" - y="-0.12233575" - height="1.2446715"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.6868363" - id="feGaussianBlur5985-3-1" /> - </filter> - <linearGradient - id="linearGradient5899-9-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3-4" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9-9" - id="linearGradient5905-4-0" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4-2"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4-9" /> - </filter> - <linearGradient - id="linearGradient9286-3-5"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2-0" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3-5" - id="radialGradient11553-3-4" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2-7" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7-26" /> - </filter> - <linearGradient - id="linearGradient9040-4-1"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3-3" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7-7" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4-1" - id="radialGradient9046-1-0" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient9025-1-1" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient9023-6-0" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient8998-5-6"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5-7" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5-6" - id="radialGradient9004-6-9" - fy="187.86935" - fx="89.875" - r="22.75" - cy="187.86935" - cx="89.875" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5" - id="radialGradient8994-0-8" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8992-2-2" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8990-4-6" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1-06" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9-64" /> - </filter> - <linearGradient - id="linearGradient8916-4-5"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9-82" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9-6" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5" - id="radialGradient8922-9-8" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3-7" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7-4" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8910-3-4" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient8866-0-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3-0" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0-6" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4" - id="linearGradient8912-9-7" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9-6" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2-7" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11" - id="radialGradient8768-6-5" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <linearGradient - id="linearGradient8738-4-11"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4-0" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11" - id="radialGradient8744-9-3" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3-0" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5-7" /> - </filter> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6" - id="radialGradient8574-0-2" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <linearGradient - id="linearGradient8568-7-6"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1-1" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6" - id="radialGradient9177-1-9" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="IcecapTip-0-1" - y2="50" - x2="90" - y1="20" - x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-90"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-0" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="shinySpecular-0-4" - y2="60" - x2="58" - y1="35" - x1="33" /> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5-3" /> - </filter> - <clipPath - id="clipPath9086-1-8"> - <use - xlink:href="#outline1-4" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-2" - transform="translate(1.0095461e-6,0)" /> - </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-9"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-9" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-7" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9" - id="linearGradient9175-3-1" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8-8" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9-7" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter8490-9"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-3" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-9"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-4" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-5" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-9" - id="linearGradient9175-9" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <clipPath - id="clipoutline1-7"> - <path - id="outline1-4" - d="M 54.1,12.5 12.9,54.7 C -2.7,70.3 23,69 32.3,74.9 36.6,77.7 18.5,81.3 22.2,85 c 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.7 -7.3,7.6 -3.7,11.3 3.5,3.7 11.9,0.2 13.4,8.6 1.1,6.2 15.4,3.1 21.8,-2.2 4,-3.4 -6.9,-3.4 -3.3,-7.1 9,-9.1 17,-4.1 20.3,-12.5 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 L 73,12.5 c -5.3,-5 -14,-5 -18.9,0 z m -9.9,64.7 c 0.9,0 30.8,4 19.3,7.1 -4.4,1.2 -24.6,-7.1 -19.3,-7.1 z m 57.2,16.6 c 0,2.1 16.3,3.3 15.4,-0.5 -1.3,-6.4 -13.6,-5.9 -15.4,0.5 z m -69.5,11.1 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.7 -16.9,0.3 -11.1,5.2 z m 67.5,-6.7 c -4.6,4.2 0.8,8.6 5.3,5.7 1.2,-0.8 -0.1,-4.7 -5.3,-5.7 z" /> - </clipPath> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-5" - id="sideSpecular-5" - y2="40" - x2="60" - y1="20" - x1="80" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-5" - id="liquidSpecular-2" - y2="76" - x2="0" - y1="128" - x1="0" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-5"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7-4" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9-9" /> - </linearGradient> - <inkscape:perspective - id="perspective4323" - inkscape:persp3d-origin="64 : 42.666667 : 1" - inkscape:vp_z="128 : 64 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 64 : 1" - sodipodi:type="inkscape:persp3d" /> - <inkscape:perspective - id="perspective4469" - inkscape:persp3d-origin="0.5 : 0.33333333 : 1" - inkscape:vp_z="1 : 0.5 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_x="0 : 0.5 : 1" - sodipodi:type="inkscape:persp3d" /> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3-5-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9-7-8" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0-0-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8-8-1" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9-6" - id="linearGradient9175-3-1-6" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-9-6"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-9-2" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-7-1" /> - </linearGradient> <clipPath - id="clipPath9086-1-8-9"> - <use - xlink:href="#outline1-4" - height="300" - width="400" + id="clipPath17127" + clipPathUnits="userSpaceOnUse"> + <rect y="0" x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-2-6" - transform="translate(1.0095461e-6,0)" /> + height="128" + width="128" + id="rect17129" + style="opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> </clipPath> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0-5-4"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5-3-8" /> - </filter> <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9-6" - id="linearGradient4485" - y2="40" + inkscape:collect="always" + xlink:href="#nav_top" + id="linearGradient4475" + x1="60" + y1="110" x2="60" - y1="20" - x1="82.118591" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient4487"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop4489" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop4491" /> - </linearGradient> - <linearGradient - gradientTransform="matrix(1.009184,0,0,1.009184,-0.3890738,-0.3831933)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90-8" - id="shinySpecular-0-4-0" - y2="60" - x2="58" - y1="35" - x1="33" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-90-8"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-2-1" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-0-0" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90-8" - id="IcecapTip-0-1-2" - y2="50" - x2="90" - y1="20" - x1="60" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient4498"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4500" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4502" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6-9" - id="radialGradient9177-1-9-2" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> - <linearGradient - id="linearGradient8568-7-6-9"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8570-9-2-7" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8572-1-1-5" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8568-7-6-9" - id="radialGradient8574-0-2-6" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <linearGradient - id="linearGradient4509"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4511" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4513" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3-0-4" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5-7-6" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11-7" - id="radialGradient8744-9-3-3" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <linearGradient - id="linearGradient8738-4-11-7"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8740-8-9-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8742-4-0-7" /> - </linearGradient> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8738-4-11-7" - id="radialGradient8768-6-5-4" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <linearGradient - id="linearGradient4522"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4524" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4526" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9-6-9" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2-7-1" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8912-9-7-7" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient8866-0-4-0"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8868-3-0-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8870-0-6-0" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8910-3-4-8" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient4535"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4537" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4539" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3-7-5" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7-4-3" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5-4" - id="radialGradient8922-9-8-9" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - id="linearGradient8916-4-5-4"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop8918-9-82-1" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop8920-9-6-5" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1-06-4" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9-64-1" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8990-4-6-5" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient4550"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4552" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4554" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient8992-2-2-5" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient4557"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4559" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4561" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter4563" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur4565" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8916-4-5-4" - id="radialGradient8994-0-8-4" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <linearGradient - id="linearGradient4568"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4570" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4572" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter4574" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur4576" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8998-5-6-8" - id="radialGradient9004-6-9-9" - fy="187.86935" - fx="89.875" - r="22.75" - cy="187.86935" - cx="89.875" /> - <linearGradient - id="linearGradient8998-5-6-8"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:0.33004925" - id="stop9000-9-0-3" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9002-5-7-8" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient9023-6-0-5" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - id="linearGradient4583"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4585" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4587" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient8866-0-4-0" - id="linearGradient9025-1-1-2" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <linearGradient - id="linearGradient4590"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4592" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4594" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter4596" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur4598" /> - </filter> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9040-4-1-2" - id="radialGradient9046-1-0-2" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <linearGradient - id="linearGradient9040-4-1-2"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9042-3-3-7" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9044-7-7-0" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2-7-3" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7-26-4" /> - </filter> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient9286-3-5-3" - id="radialGradient11553-3-4-6" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <linearGradient - id="linearGradient9286-3-5-3"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop9288-9-2-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop9290-2-0-3" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4-2-3"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4-9-4" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5899-9-9-3" - id="linearGradient5905-4-0-4" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <linearGradient - id="linearGradient5899-9-9-3"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5901-9-9-9" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5903-3-4-7" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter5983-8-5-2" - x="-0.082508981" - width="1.165018" - y="-0.12233575" - height="1.2446715"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.6868363" - id="feGaussianBlur5985-3-1-5" /> - </filter> - <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-3-9" - id="linearGradient5801-2-0-8" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> + y2="162" + gradientUnits="userSpaceOnUse" /> <linearGradient - id="linearGradient5793-9-3-9"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-7-0" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-8-2" /> - </linearGradient> + inkscape:collect="always" + xlink:href="#nav_top" + id="linearGradient4483" + x1="70" + y1="110" + x2="70" + y2="162" + gradientUnits="userSpaceOnUse" /> <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5805-9-6-7" - id="radialGradient5811-3-8-4" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> - <linearGradient - id="linearGradient5805-9-6-7"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop5807-4-0-6" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop5809-9-4-5" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5-6-7"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5-7-1" /> - </filter> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90-8" - id="linearGradient5822-7-6-3" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient4629"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop4631" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop4633" /> - </linearGradient> + inkscape:collect="always" + xlink:href="#nav_foot" + id="radialGradient4639" + cx="512" + cy="767" + fx="512" + fy="767" + r="480" + gradientTransform="matrix(0.625,0,0,0.625,192,287.625)" + gradientUnits="userSpaceOnUse" /> <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" + inkscape:collect="always" + xlink:href="#header_bg" + id="linearGradient4681" + x1="532" + y1="0" + x2="532" + y2="75" gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9-0-3" - id="linearGradient1539-7-3" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> + gradientTransform="translate(-20,0)" /> <linearGradient - id="linearGradient10981-3-9-0-3"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-9-8" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-7-5" /> - </linearGradient> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2-5-1"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-9-0" /> - </filter> - <radialGradient inkscape:collect="always" - xlink:href="#linearGradient5781" - id="radialGradient5787" - cx="290.74387" - cy="258.93588" - fx="290.74387" - fy="258.93588" - r="78.96619" - gradientTransform="matrix(2.0000004,-6.2784742e-6,0,0.50066434,-301.34718,131.46569)" + xlink:href="#content_bg" + id="linearGradient4703" + x1="512" + y1="163" + x2="512" + y2="263" gradientUnits="userSpaceOnUse" /> - <radialGradient + <linearGradient inkscape:collect="always" xlink:href="#linearGradient5781" - id="radialGradient5810" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(2.0000004,-6.2784742e-6,0,0.50066434,-301.34718,131.46569)" - cx="290.74387" - cy="258.93588" - fx="290.74387" - fy="258.93588" - r="78.96619" /> + id="linearGradient3762" + gradientUnits="userSpaceOnUse" + x1="220" + y1="233.5" + x2="379" + y2="233.5" /> + <mask + maskUnits="userSpaceOnUse" + id="mask3799"> + <rect + style="display:inline;opacity:1;fill:#808080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect3801" + width="600" + height="400" + x="0" + y="0" /> + </mask> </defs> <sodipodi:namedview id="base" pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="1" + bordercolor="#6666af" + borderopacity="1" + inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1" - inkscape:cx="296.64284" - inkscape:cy="158.77027" + inkscape:cx="1655" + inkscape:cy="550" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="layer5" showgrid="false" - grid_units="mm" - inkscape:grid-points="true" - gridtolerance="10000" - inkscape:grid-bbox="false" - inkscape:object-paths="false" - guidetolerance="10000" - inkscape:guide-bbox="false" - inkscape:window-width="1244" - inkscape:window-height="756" - inkscape:window-x="36" - inkscape:window-y="25" - height="350px" - width="624.54108px" - units="px" - inkscape:window-maximized="0"> + inkscape:object-nodes="true" + inkscape:snap-page="true" + inkscape:showpageshadow="false" + borderlayer="true" + inkscape:window-width="1163" + inkscape:window-height="742" + inkscape:window-x="53" + inkscape:window-y="0" + inkscape:window-maximized="0" + inkscape:snap-bbox="true" + inkscape:bbox-nodes="true" + showguides="false" + inkscape:guide-bbox="true" + inkscape:snap-text-baseline="true" + inkscape:snap-center="true" + inkscape:snap-nodes="true" + inkscape:snap-others="true" + inkscape:snap-midpoints="true"> <inkscape:grid - id="GridFromPre046Settings" type="xygrid" - originx="0px" - originy="0px" - spacingx="2mm" - spacingy="2mm" - color="#0000ff" - empcolor="#0000ff" - opacity="0.2" - empopacity="0.4" - empspacing="5" /> + id="grid14925" /> + <sodipodi:guide + orientation="0,1" + position="113.27875,743.405" + id="guide4435" /> + <sodipodi:guide + orientation="1,0" + position="113.27875,743.405" + id="guide4441" /> + <sodipodi:guide + orientation="0,1" + position="137.888,658.21001" + id="guide4500" /> + <sodipodi:guide + orientation="1,0" + position="115,743" + id="guide4575" /> + <sodipodi:guide + orientation="1,0" + position="146,715" + id="guide4577" /> + <sodipodi:guide + orientation="1,0" + position="512,33" + id="guide4641" /> + <sodipodi:guide + orientation="0,1" + position="141,566.5" + id="guide4834" /> + <sodipodi:guide + orientation="1,0" + position="459,566.5" + id="guide4836" /> </sodipodi:namedview> <metadata - id="metadata7"> + id="metadata13537"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title></dc:title> + <dc:title /> </cc:Work> </rdf:RDF> </metadata> <g - inkscape:label="Layer 1" inkscape:groupmode="layer" - id="layer1" - transform="translate(-48.8794,-125.0409)"> + id="layer3" + inkscape:label="website vector" + style="display:none"> <use x="0" y="0" - xlink:href="#g9139" - id="use5007" - transform="matrix(6.5090909,0,0,6.5090909,-0.80833,-721.208)" - width="624.54108" - height="350" - style="opacity:0.19607843" /> - <rect - style="font-size:12px;fill:url(#linearGradient4989);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.06115007" - id="rect3968" - width="624.46564" - height="157.62523" - x="48.954857" - y="125.0409" - ry="7.2071209" - rx="0" /> - <path - style="fill:#b0e088;fill-opacity:1;stroke-width:1pt;filter:url(#filter6402)" - d="M 211.90625,131.50353 C 205.98536,131.00651 201.16447,138.64884 205.65625,143.19103 C 201.58111,142.39402 202.59325,154.72266 205.53125,154.44103 C 207.92857,154.12103 209.07578,153.09201 211.53125,154.31603 C 217.32456,156.22034 225.89226,152.12727 223.9375,145.15978 C 223.58426,143.30954 221.58678,142.21903 223.25378,141.31776 C 223.20533,136.85003 223.7185,128.54828 217.71875,132.50353 C 215.92538,131.64528 213.88943,131.39446 211.90625,131.50353 z M 242.78125,131.53478 C 233.79442,131.686 227.75459,143.4366 234,150.31603 C 239.43304,157.21146 253.6084,155.92987 254.8125,146.25353 C 256.34217,142.79208 248.19412,142.52195 249.09375,146.47228 C 247.74986,150.93304 239.3353,150.35814 239.6875,145.06603 C 237.97761,140.6411 241.81797,134.16096 246.71875,137.50353 C 249.41376,139.53503 248.68222,144.7773 253.40625,143.03478 C 254.93997,141.69772 255.77025,130.19743 250.78125,131.69103 C 248.48983,133.58272 245.86063,130.6504 242.78125,131.53478 z M 271.8125,132.62853 C 268.88476,137.81053 266.95595,144.19233 263.65625,148.90978 C 259.67153,147.59894 259.59949,156.11933 263.9375,154.25353 C 269.48656,156.75387 278.01244,151.20147 270.5625,149.03478 C 278.56123,146.20513 273.12299,149.82125 275.28125,154.25353 C 280.36022,153.37416 290.27534,157.33095 287.9375,149.03478 C 282.68218,150.73712 283.23236,143.06976 280.63766,140.45052 C 278.39554,137.2537 276.7707,127.60112 271.8125,132.62853 z M 114.8125,133.84728 C 116.77004,137.44183 119.84252,139.92143 118.25,147.06603 C 115.30109,149.26327 111.78292,155.87408 120.8125,154.25353 C 126.85204,157.33159 133.71667,149.54431 125.75,149.03478 C 126.22284,144.18114 123.68261,136.05584 129.125,136.06603 C 130.82877,128.51851 120.43737,133.06616 115.8125,131.84728 C 113.97917,131.01395 115.14583,133.18061 114.8125,133.84728 z M 135.53125,133.84728 C 137.13794,137.51626 141.13623,138.88004 139.1875,146.09728 C 139.90014,148.78088 138.23701,149.77742 135.5625,149.15978 C 133.27286,157.439 143.41425,153.28719 148.4375,154.25353 C 149.06032,150.62414 148.38609,148.80032 145,148.69103 C 144.37781,144.20288 144.67524,140.37677 148.22983,146.14847 C 151.10869,149.12544 157.66223,158.95016 160.03125,152.59728 C 160.56723,147.67323 159.08446,141.633 160.53125,137.15978 C 166.78949,137.51713 163.38644,128.79621 157.65625,131.84728 C 151.96161,128.87124 147.11594,136.8081 153.71875,137.12853 C 155.08393,137.90612 154.71504,144.55646 153.02099,140.78157 C 148.74449,136.84367 145.84142,129.79243 138.9375,131.84728 C 137.12804,132.15832 134.61732,130.69848 135.53125,133.84728 z M 169.90625,133.84728 C 171.85329,137.42108 174.78089,140.0143 173.25,147.06603 C 170.35185,149.32204 166.94881,155.89193 175.90625,154.25353 C 183.25,154.25353 190.59375,154.25353 197.9375,154.25353 C 198.4412,150.73398 198.06744,148.19277 194.25,148.94103 C 192.35148,145.50722 184.29985,141.35591 190.71875,138.62853 C 192.79995,135.96358 198.2411,138.61479 196.65625,133.84728 C 195.14564,129.51414 185.9343,132.88173 181.125,131.84728 C 178.05306,132.8288 169.62024,129.69565 169.90625,133.84728 z M 293.15625,133.84728 C 295.10692,137.42786 298.08265,139.98338 296.53125,147.06603 C 293.61604,149.30232 290.17477,155.88606 299.15625,154.25353 C 305.32284,157.37796 312.34688,149.41219 304.0625,149.03478 C 302.86465,143.8835 309.81747,147.32631 312.71875,144.81603 C 318.59404,142.36193 317.05771,133.06727 310.8125,132.37853 C 305.03715,131.23236 299.02318,132.1357 293.15625,131.84728 L 293.15625,132.84728 L 293.15625,133.84728 z M 322.59375,133.84728 C 324.54442,137.42786 327.52015,139.98338 325.96875,147.06603 C 323.05354,149.30232 319.61227,155.88606 328.59375,154.25353 C 333.93497,153.54619 341.80986,155.64814 345.63415,153.25884 C 346.95428,148.40113 347.18135,139.81716 341.15596,144.41675 C 340.57513,147.60682 339.42531,148.62524 340.03125,144.00353 C 339.41481,135.19467 340.19038,144.69295 345.875,142.37853 C 345.72495,136.36636 346.55912,129.23076 338.3125,131.84728 C 333.91933,133.01706 323.53366,129.40617 322.59375,133.84728 z M 212.90625,136.69103 C 214.7956,136.2583 217.80683,138.96345 217.03125,139.75353 C 216.4244,139.17109 208.72475,139.11563 211,137.03478 C 211.62008,136.69307 212.21398,136.72524 212.90625,136.69103 z M 180.78125,137.06603 C 187.89935,134.91758 178.66084,142.82534 180.78125,137.06603 z M 305.90625,137.06603 C 309.23663,135.96017 309.72242,141.54509 306.25,140.84728 C 303.03028,142.603 303.02031,135.62858 305.90625,137.06603 z M 334.75,137.06603 C 335.39873,138.82924 332.76238,142.0438 333.4375,138.06603 C 332.71875,136.57645 334.04753,137.13439 334.75,137.06603 z M 273.71875,142.90978 C 272.32791,143.69153 273.8227,141.08737 273.71875,142.90978 z M 209.25,145.19103 C 211.70195,146.62318 216.25481,145.47391 217.75,147.90978 C 216.06,151.3315 208.46858,148.82989 209.25,145.19103 z M 333.46875,145.37853 C 335.93079,145.66665 333.11094,150.51246 336.75,149.00353 C 332.80474,149.66943 333.29657,148.87152 333.46875,145.37853 z M 184.875,149.03478 C 177.62334,151.44995 181.19956,141.37917 184.875,149.03478 z " - id="path6392" /> - <path - style="fill:#ffffff;fill-opacity:1;stroke-width:1pt" - d="M 343.30616,142.63289 L 324.60589,142.63289 L 324.60589,143.82976 L 325.16596,143.82976 C 327.68633,143.82976 327.96625,143.95712 327.96625,145.02666 L 327.96625,145.76519 L 327.96625,157.88691 L 327.96625,158.62541 C 327.96625,159.69498 327.68633,159.8223 325.16596,159.8223 L 324.60589,159.8223 L 324.60589,161.0192 L 343.71062,161.0192 L 344.33297,154.21984 L 342.96375,154.21984 C 342.55928,156.00241 341.84362,157.58132 341.09694,158.31983 C 340.13242,159.33846 338.35872,159.8223 335.74504,159.8223 L 333.69141,159.8223 C 332.75812,159.8223 331.9802,159.66952 331.70007,159.44031 C 331.4824,159.28754 331.45117,159.13474 331.45117,158.59995 L 331.45117,152.10617 L 332.0735,152.10617 C 333.97154,152.10617 334.74946,152.25896 335.37178,152.79375 C 336.18074,153.45587 336.49191,154.27077 336.55419,155.77325 L 338.01651,155.77325 L 338.01651,147.42046 L 336.55419,147.42046 C 336.3986,149.9161 335.15394,150.90926 332.19804,150.90926 L 331.45117,150.90926 L 331.45117,145.10308 C 331.45117,144.00805 331.7313,143.82976 333.41149,143.82976 L 335.0294,143.82976 C 337.76763,143.82976 339.1056,144.05898 340.16345,144.77203 C 341.19025,145.43413 341.93693,146.8602 342.4037,149.15213 L 343.74167,149.15213 L 343.30616,142.63289 z M 302.01626,152.84468 L 305.5322,152.84468 C 308.3325,152.84468 309.79502,152.66641 311.0397,152.18256 C 313.2489,151.31673 314.49337,149.68694 314.49337,147.67511 C 314.49337,145.7397 313.40429,144.26269 311.35086,143.42233 C 310.13724,142.913 308.20815,142.63289 306.06122,142.63289 L 295.17078,142.63289 L 295.17078,143.82976 L 295.73084,143.82976 C 298.25121,143.82976 298.53134,143.95712 298.53134,145.02666 L 298.53134,145.76519 L 298.53134,157.88691 L 298.53134,158.62541 C 298.53134,159.69498 298.25121,159.8223 295.73084,159.8223 L 295.17078,159.8223 L 295.17078,161.0192 L 305.62551,161.0192 L 305.62551,159.8223 L 304.81654,159.8223 C 302.29618,159.8223 302.01626,159.69498 302.01626,158.62541 L 302.01626,157.88691 L 302.01626,152.84468 z M 302.01626,151.64778 L 302.01626,145.12853 C 302.01626,143.95712 302.20288,143.82976 303.9143,143.82976 L 305.90564,143.82976 C 309.14164,143.82976 310.66624,145.0776 310.66624,147.77698 C 310.66624,150.39996 309.07938,151.64778 305.7811,151.64778 L 302.01626,151.64778 z M 274.94593,142.27638 L 273.63917,142.27638 L 266.48254,157.12293 C 265.8602,158.44714 265.73586,158.62541 265.26911,159.03287 C 264.77133,159.51672 263.90009,159.8223 263.0599,159.8223 L 262.93555,159.8223 L 262.93555,161.0192 L 271.18107,161.0192 L 271.18107,159.8223 L 270.55874,159.8223 C 268.87856,159.8223 268.03838,159.33846 268.03838,158.37078 C 268.03838,158.06517 268.13169,157.70865 268.31831,157.3012 L 269.34512,155.0602 L 277.59085,155.0602 L 279.27103,158.47264 C 279.45764,158.85461 279.51992,159.03287 279.51992,159.16018 C 279.51992,159.56766 278.742,159.8223 277.59085,159.8223 L 276.2839,159.8223 L 276.2839,161.0192 L 285.92967,161.0192 L 285.92967,159.8223 L 285.49397,159.8223 C 283.93833,159.8223 283.59593,159.61858 282.88028,158.19249 L 274.94593,142.27638 z M 273.42133,146.45276 L 276.93727,153.68506 L 269.96747,153.68506 L 273.42133,146.45276 z M 251.95181,142.45463 L 250.76941,142.45463 L 249.52474,143.95712 C 247.31554,142.63289 246.10212,142.2509 244.01745,142.2509 C 240.99929,142.2509 238.50996,143.24409 236.39425,145.30677 C 234.40272,147.24222 233.46941,149.38133 233.46941,152.00431 C 233.46941,157.47944 237.85659,161.40118 243.98621,161.40118 C 248.96468,161.40118 252.13843,159.00738 252.85408,154.72915 L 251.39174,154.5254 C 251.08059,155.8751 250.70715,156.79188 250.14708,157.55585 C 248.87137,159.31299 246.88004,160.20428 244.35966,160.20428 C 239.75462,160.20428 237.57646,157.58132 237.57646,152.10617 C 237.57646,149.22852 238.0432,147.29313 239.10125,145.76519 C 240.06578,144.33911 241.99486,143.44779 243.98621,143.44779 C 246.16439,143.44779 248.09345,144.39004 249.27586,146.01985 C 249.86715,146.8602 250.3339,147.85338 251.04954,149.81425 L 252.41855,149.81425 L 251.95181,142.45463 z M 220.80547,142.4801 L 219.65412,142.4801 L 218.40964,144.00805 C 216.94712,142.86207 214.95577,142.2509 212.74657,142.2509 C 208.67055,142.2509 205.93233,144.39004 205.93233,147.57326 C 205.93233,150.34903 207.61252,151.72419 212.18651,152.6919 L 215.14239,153.30306 C 217.44512,153.78692 217.66277,153.83785 218.31634,154.24529 C 219.24964,154.83101 219.74762,155.67137 219.74762,156.66454 C 219.74762,157.68318 219.28086,158.52356 218.34736,159.21113 C 217.32056,159.94965 216.29375,160.22976 214.58234,160.22976 C 212.27982,160.22976 210.63087,159.64404 209.16834,158.31983 C 207.8616,157.12293 207.20804,155.92603 206.74129,153.96518 L 205.4035,153.96518 L 205.52785,161.22295 L 206.74129,161.22295 L 208.14155,159.49126 C 210.22619,160.89187 211.96865,161.40118 214.67584,161.40118 C 219.24964,161.40118 222.17449,159.21113 222.17449,155.79871 C 222.17449,154.21984 221.52111,152.87015 220.30769,151.90244 C 219.46749,151.24032 218.25407,150.80742 215.76472,150.2981 L 212.4354,149.61051 C 209.66615,149.02482 208.35939,148.03163 208.35939,146.47823 C 208.35939,144.69561 210.13288,143.47325 212.7778,143.47325 C 214.95577,143.47325 216.72926,144.23725 217.97394,145.68879 C 218.8764,146.73289 219.43646,147.80246 219.84094,149.10121 L 221.17891,149.10121 L 220.80547,142.4801 z M 178.73765,152.6919 L 178.73765,145.76519 L 178.73765,145.02666 C 178.73765,143.95712 179.01778,143.82976 181.53796,143.82976 L 182.12925,143.82976 L 182.12925,142.63289 L 171.89239,142.63289 L 171.89239,143.82976 L 172.45245,143.82976 C 174.97262,143.82976 175.25275,143.95712 175.25275,145.02666 L 175.25275,145.76519 L 175.25275,157.88691 L 175.25275,158.62541 C 175.25275,159.69498 174.97262,159.8223 172.45245,159.8223 L 171.89239,159.8223 L 171.89239,161.0192 L 182.12925,161.0192 L 182.12925,159.8223 L 181.53796,159.8223 C 179.01778,159.8223 178.73765,159.69498 178.73765,158.62541 L 178.73765,157.88691 L 178.73765,154.65275 L 182.34711,151.67324 L 187.76109,158.16702 C 188.25889,158.77822 188.38343,158.98195 188.38343,159.2366 C 188.38343,159.64404 187.79213,159.8223 186.26754,159.8223 L 185.30299,159.8223 L 185.30299,161.0192 L 195.94434,161.0192 L 195.94434,159.8223 L 195.35324,159.8223 C 193.64183,159.8223 193.20631,159.64404 192.30385,158.54901 L 184.77398,149.66144 L 189.41023,145.86704 C 190.9038,144.56829 192.80183,143.82976 194.66865,143.82976 L 194.66865,142.63289 L 185.08515,142.63289 L 185.08515,143.82976 L 185.86307,143.82976 C 187.29436,143.82976 187.88563,144.05898 187.88563,144.59375 C 187.88563,144.95028 187.2633,145.68879 186.36084,146.42729 L 178.73765,152.6919 z M 143.95082,142.63289 L 137.54106,142.63289 L 137.54106,143.82976 L 138.31879,143.82976 C 139.90566,143.82976 140.62151,144.0335 141.18157,144.67015 L 141.18157,155.49312 C 141.18157,158.98195 140.55924,159.72043 137.57211,159.8223 L 137.57211,161.0192 L 146.43996,161.0192 L 146.43996,159.8223 C 143.48408,159.72043 142.86175,158.98195 142.86175,155.49312 L 142.86175,146.04531 L 156.73912,161.37574 L 158.04604,161.37574 L 158.04604,148.15896 C 158.04604,144.67015 158.66839,143.93164 161.65532,143.82976 L 161.65532,142.63289 L 152.78745,142.63289 L 152.78745,143.82976 C 155.74353,143.93164 156.36587,144.67015 156.36587,148.15896 L 156.36587,156.15522 L 143.95082,142.63289 z M 123.72578,145.76519 L 123.72578,145.02666 C 123.72578,143.95712 124.00592,143.82976 126.49504,143.82976 L 127.11738,143.82976 L 127.11738,142.63289 L 116.81822,142.63289 L 116.81822,143.82976 L 117.44055,143.82976 C 119.96093,143.82976 120.24088,143.95712 120.24088,145.02666 L 120.24088,145.76519 L 120.24088,157.88691 L 120.24088,158.62541 C 120.24088,159.69498 119.96093,159.8223 117.44055,159.8223 L 116.81822,159.8223 L 116.81822,161.0192 L 127.11738,161.0192 L 127.11738,159.8223 L 126.49504,159.8223 C 124.00592,159.8223 123.72578,159.69498 123.72578,158.62541 L 123.72578,157.88691 L 123.72578,145.76519 z " - id="path3970" - transform="translate(1.654053e-6,-8.777719)" /> - <path - style="opacity:0.18000004;fill:#ffffff;fill-opacity:1;stroke-width:1pt" - d="M 590.28004,118.44468 L 545.50486,118.44468 L 545.50486,121.23484 L 546.84587,121.23484 C 552.88054,121.23484 553.55077,121.53175 553.55077,124.02508 L 553.55077,125.74675 L 553.55077,154.00514 L 553.55077,155.72674 C 553.55077,158.22014 552.88054,158.51696 546.84587,158.51696 L 545.50486,158.51696 L 545.50486,161.30719 L 591.24846,161.30719 L 592.73859,145.45639 L 589.46018,145.45639 C 588.49174,149.61196 586.77819,153.29274 584.99037,155.01437 C 582.68096,157.38902 578.43408,158.51696 572.17599,158.51696 L 567.25886,158.51696 C 565.02423,158.51696 563.16161,158.16079 562.49088,157.62645 C 561.9697,157.27031 561.89492,156.9141 561.89492,155.66739 L 561.89492,140.52897 L 563.38501,140.52897 C 567.9296,140.52897 569.79222,140.88515 571.28228,142.13187 C 573.21922,143.67541 573.96427,145.57512 574.11339,149.07773 L 577.61471,149.07773 L 577.61471,129.60555 L 574.11339,129.60555 C 573.74085,135.42343 570.76069,137.73871 563.6832,137.73871 L 561.89492,137.73871 L 561.89492,124.20323 C 561.89492,121.65048 562.56566,121.23484 566.58864,121.23484 L 570.46249,121.23484 C 577.0188,121.23484 580.22238,121.7692 582.75526,123.43148 C 585.21379,124.97498 587.00161,128.29946 588.11922,133.64245 L 591.3228,133.64245 L 590.28004,118.44468 z M 491.41715,142.25059 L 499.83558,142.25059 C 506.5405,142.25059 510.0423,141.83501 513.02252,140.70705 C 518.31214,138.68861 521.29185,134.88921 521.29185,130.1992 C 521.29185,125.68733 518.6842,122.2441 513.76755,120.28503 C 510.8617,119.09767 506.24277,118.44468 501.10224,118.44468 L 475.02661,118.44468 L 475.02661,121.23484 L 476.36759,121.23484 C 482.40227,121.23484 483.073,121.53175 483.073,124.02508 L 483.073,125.74675 L 483.073,154.00514 L 483.073,155.72674 C 483.073,158.22014 482.40227,158.51696 476.36759,158.51696 L 475.02661,158.51696 L 475.02661,161.30719 L 500.059,161.30719 L 500.059,158.51696 L 498.12203,158.51696 C 492.08738,158.51696 491.41715,158.22014 491.41715,155.72674 L 491.41715,154.00514 L 491.41715,142.25059 z M 491.41715,139.46036 L 491.41715,124.26256 C 491.41715,121.53175 491.86399,121.23484 495.96174,121.23484 L 500.72973,121.23484 C 508.47788,121.23484 512.12832,124.14383 512.12832,130.43668 C 512.12832,136.55142 508.3288,139.46036 500.43153,139.46036 L 491.41715,139.46036 z M 426.60104,117.61357 L 423.47218,117.61357 L 406.33663,152.22413 C 404.84653,155.31116 404.54881,155.72674 403.43125,156.67662 C 402.23938,157.80458 400.15332,158.51696 398.1416,158.51696 L 397.84386,158.51696 L 397.84386,161.30719 L 417.58661,161.30719 L 417.58661,158.51696 L 416.09652,158.51696 C 412.07357,158.51696 410.06188,157.38902 410.06188,155.13314 C 410.06188,154.4207 410.28529,153.58957 410.73213,152.63972 L 413.19068,147.41546 L 432.93393,147.41546 L 436.95688,155.3706 C 437.40369,156.26106 437.55282,156.67662 437.55282,156.97341 C 437.55282,157.92333 435.6902,158.51696 432.93393,158.51696 L 429.80462,158.51696 L 429.80462,161.30719 L 452.90006,161.30719 L 452.90006,158.51696 L 451.85684,158.51696 C 448.13208,158.51696 447.31225,158.04204 445.59873,154.71751 L 426.60104,117.61357 z M 422.9506,127.34963 L 431.36902,144.2097 L 414.68081,144.2097 L 422.9506,127.34963 z M 371.54484,118.02911 L 368.71374,118.02911 L 365.73356,121.53175 C 360.44394,118.44468 357.53857,117.55417 352.54712,117.55417 C 345.32056,117.55417 339.36021,119.86952 334.29444,124.67808 C 329.526,129.19003 327.29132,134.17677 327.29132,140.29151 C 327.29132,153.05524 337.7958,162.19767 352.47232,162.19767 C 364.39257,162.19767 371.99167,156.6172 373.70519,146.64371 L 370.20383,146.16872 C 369.45882,149.31517 368.56467,151.45238 367.22366,153.23336 C 364.16915,157.32964 359.40119,159.40743 353.3665,159.40743 C 342.34037,159.40743 337.12507,153.29274 337.12507,140.52897 C 337.12507,133.82053 338.24262,129.30872 340.77597,125.74675 C 343.0854,122.42225 347.70431,120.34439 352.47232,120.34439 C 357.68767,120.34439 362.30653,122.54098 365.13765,126.34042 C 366.55341,128.29946 367.67098,130.61478 369.38448,135.186 L 372.66238,135.186 L 371.54484,118.02911 z M 296.96929,118.08849 L 294.21254,118.08849 L 291.23281,121.65048 C 287.73101,118.97894 282.963,117.55417 277.67338,117.55417 C 267.91392,117.55417 261.35763,122.54098 261.35763,129.96176 C 261.35763,136.43269 265.38061,139.63849 276.33239,141.89443 L 283.40983,143.31918 C 288.9234,144.44716 289.44453,144.56589 291.00941,145.51572 C 293.24407,146.88117 294.43641,148.84023 294.43641,151.15553 C 294.43641,153.5302 293.31882,155.48931 291.08368,157.09218 C 288.62516,158.81384 286.1666,159.46683 282.06887,159.46683 C 276.55581,159.46683 272.60763,158.10139 269.10581,155.01437 C 265.977,152.22413 264.41214,149.4339 263.29458,144.86273 L 260.09142,144.86273 L 260.38916,161.78218 L 263.29458,161.78218 L 266.6473,157.74523 C 271.63868,161.01036 275.81076,162.19767 282.29274,162.19767 C 293.24407,162.19767 300.24721,157.09218 300.24721,149.13709 C 300.24721,145.45639 298.68278,142.30997 295.77742,140.05403 C 293.76568,138.51048 290.86032,137.5013 284.89991,136.31396 L 276.92832,134.71104 C 270.29774,133.34566 267.16889,131.03032 267.16889,127.40901 C 267.16889,123.25333 271.41526,120.40374 277.74815,120.40374 C 282.963,120.40374 287.20937,122.18479 290.18958,125.56865 C 292.3504,128.00267 293.69138,130.49608 294.65985,133.52375 L 297.86343,133.52375 L 296.96929,118.08849 z M 196.24378,141.89443 L 196.24378,125.74675 L 196.24378,124.02508 C 196.24378,121.53175 196.91451,121.23484 202.94873,121.23484 L 204.36449,121.23484 L 204.36449,118.44468 L 179.85376,118.44468 L 179.85376,121.23484 L 181.19475,121.23484 C 187.22894,121.23484 187.89967,121.53175 187.89967,124.02508 L 187.89967,125.74675 L 187.89967,154.00514 L 187.89967,155.72674 C 187.89967,158.22014 187.22894,158.51696 181.19475,158.51696 L 179.85376,158.51696 L 179.85376,161.30719 L 204.36449,161.30719 L 204.36449,158.51696 L 202.94873,158.51696 C 196.91451,158.51696 196.24378,158.22014 196.24378,155.72674 L 196.24378,154.00514 L 196.24378,146.4656 L 204.88613,139.51971 L 217.84914,154.65814 C 219.04106,156.08298 219.33925,156.55792 219.33925,157.15156 C 219.33925,158.10139 217.92346,158.51696 214.27305,158.51696 L 211.96357,158.51696 L 211.96357,161.30719 L 237.44279,161.30719 L 237.44279,158.51696 L 236.02748,158.51696 C 231.92975,158.51696 230.88696,158.10139 228.72615,155.54864 L 210.69693,134.82977 L 221.79778,125.98419 C 225.37392,122.95652 229.91849,121.23484 234.38833,121.23484 L 234.38833,118.44468 L 211.44198,118.44468 L 211.44198,121.23484 L 213.3046,121.23484 C 216.73162,121.23484 218.14734,121.7692 218.14734,123.01587 C 218.14734,123.84702 216.65725,125.56865 214.49644,127.29025 L 196.24378,141.89443 z M 112.95159,118.44468 L 97.604314,118.44468 L 97.604314,121.23484 L 99.46648,121.23484 C 103.26602,121.23484 104.98002,121.7098 106.321,123.19398 L 106.321,148.42469 C 106.321,156.55792 104.83092,158.27947 97.678659,158.51696 L 97.678659,161.30719 L 118.91148,161.30719 L 118.91148,158.51696 C 111.83404,158.27947 110.34396,156.55792 110.34396,148.42469 L 110.34396,126.39977 L 143.57138,162.13836 L 146.70062,162.13836 L 146.70062,131.32716 C 146.70062,123.19398 148.19075,121.47235 155.34253,121.23484 L 155.34253,118.44468 L 134.10966,118.44468 L 134.10966,121.23484 C 141.18758,121.47235 142.67768,123.19398 142.67768,131.32716 L 142.67768,149.96819 L 112.95159,118.44468 z M 64.525561,125.74675 L 64.525561,124.02508 C 64.525561,121.53175 65.196317,121.23484 71.156166,121.23484 L 72.646272,121.23484 L 72.646272,118.44468 L 47.986375,118.44468 L 47.986375,121.23484 L 49.476457,121.23484 C 55.511154,121.23484 56.181455,121.53175 56.181455,124.02508 L 56.181455,125.74675 L 56.181455,154.00514 L 56.181455,155.72674 C 56.181455,158.22014 55.511154,158.51696 49.476457,158.51696 L 47.986375,158.51696 L 47.986375,161.30719 L 72.646272,161.30719 L 72.646272,158.51696 L 71.156166,158.51696 C 65.196317,158.51696 64.525561,158.22014 64.525561,155.72674 L 64.525561,154.00514 L 64.525561,125.74675 z " - id="use3972" /> + xlink:href="#rect4669" + id="use4724" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g17092" + id="use17385" + width="100%" + height="100%" + transform="matrix(0.5,0,0,0.5,32,92)" /> + <use + x="0" + y="0" + xlink:href="#text4431" + id="use4447" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#text4443" + id="use4449" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#rect4693" + id="use4728" + width="100%" + height="100%" /> + <use + x="0" + y="0" + xlink:href="#g4485" + id="use4587" + width="100%" + height="100%" /> <g - id="g6386"> - <path - id="path4997" - d="M 92.59375,164.875 C 88.113243,165.75634 90.444126,172.33966 94.3125,171.78125 C 98.790176,171.10793 97.488032,164.81708 93.3125,164.84375 C 93.077807,164.87205 92.819915,164.79564 92.59375,164.875 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6374)" /> - <path - id="path4999" - d="M 68.0625,164 C 63.389338,163.68801 62.994345,172.30386 67.96875,171.40625 C 72.00245,171.56715 75.618715,164.7074 69.84375,164.1875 C 69.28382,163.9933 68.657906,163.92536 68.0625,164 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6362)" /> - <path - id="path5001" - d="M 96.6875,160.96875 C 92.787255,160.12272 89.338676,166.71986 94.4375,167.625 C 98.127844,169.64513 105.11906,165.50747 100.90625,161.84375 C 99.656522,161.05111 98.140071,160.87759 96.6875,160.96875 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6370)" /> - <path - id="path5003" - d="M 78.90625,130.0625 C 71.574069,132.72813 68.195911,140.7692 62.0625,145.25 C 60.185026,147.42322 54.784698,150.53213 57.25,153.90625 C 59.730284,154.72534 65.594263,155.98382 63.34061,159.34427 C 59.717471,163.33418 70.334693,162.45891 71.59375,165.46875 C 73.006345,167.48699 68.928159,170.12348 72.71875,170.65625 C 75.274013,170.82156 76.509875,171.42143 77.15625,173.71875 C 79.798879,175.53189 84.935097,174.59678 86.375,171.65625 C 84.032653,167.37236 91.803417,168.05515 93.09375,164.40625 C 90.163883,162.96743 90.537912,158.77419 94.09375,158.75 C 97.839433,158.38307 104.15352,156.07034 102.125,151.15625 C 95.808038,143.61829 88.597124,136.46857 81.03125,130.28125 C 80.359155,130.04775 79.615042,129.96607 78.90625,130.0625 z M 80.375,133.28125 C 82.853723,134.6375 88.132191,138.59859 83.90625,140.96875 C 81.669601,143.5713 77.157842,142.78439 76.6875,139.0625 C 76.528868,140.88754 72.618484,146.33606 70.0625,142.5 C 68.712832,139.23213 74.807932,134.16459 76.5,138.125 C 75.943839,135.93126 77.766171,131.42089 80.375,133.28125 z " - style="font-size:12px;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1pt;filter:url(#filter6366)" /> + id="g4597"> + <text + transform="translate(-4.8828124e-7,-3.2861328e-6)" + sodipodi:linespacing="125%" + id="text4490" + y="141.78999" + x="137.888" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="137.888" + id="tspan4492" + sodipodi:role="line">ABOUT</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="232.79601" + y="141.78999" + id="text4496" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4498" + x="232.79601" + y="141.78999">DOWNLOAD</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4506" + y="141.78999" + x="361.29599" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="361.29599" + id="tspan4508" + sodipodi:role="line">NEWS</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="448.18799" + y="141.78999" + id="text4510" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4512" + x="448.18799" + y="141.78999">COMMUNITY</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4514" + y="141.78999" + x="580.04602" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="580.04602" + id="tspan4516" + sodipodi:role="line">LEARN</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="671.68799" + y="141.78999" + id="text4518" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4520" + x="671.68799" + y="141.78999">CONTRIBUTE</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4522" + y="141.78999" + x="804.29602" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="141.78999" + x="804.29602" + id="tspan4524" + sodipodi:role="line">DEVELOP</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#ff732c;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="913.59601" + y="141.78999" + id="text4526" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4528" + x="913.59601" + y="141.78999">DONATE</tspan></text> + </g> + <g + id="g4615"> + <use + height="100%" + width="100%" + id="use4550" + xlink:href="#g4543" + y="0" + x="0" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(95,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4553" + style="display:inline" /> + <use + id="use4555" + xlink:href="#g4543" + y="0" + x="0" + transform="translate(223,0)" + width="100%" + height="100%" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(310,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4557" + style="display:inline" /> + <use + id="use4559" + xlink:href="#g4543" + y="0" + x="0" + transform="translate(442,0)" + width="100%" + height="100%" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(534,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4561" + style="display:inline" /> + <use + id="use4563" + xlink:href="#g4543" + y="0" + x="0" + transform="translate(666,0)" + width="100%" + height="100%" + style="display:inline" /> + <use + height="100%" + width="100%" + transform="translate(776,0)" + x="0" + y="0" + xlink:href="#g4543" + id="use4565" + style="display:inline" /> </g> - <flowRoot - style="font-size:7.19999981px;font-style:italic;font-weight:normal;line-height:150%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans" - id="flowRoot4797" - transform="translate(-184.4496,300.46138)"> - <flowRegion - id="flowRegion4799"> + <use + style="display:inline" + x="0" + y="0" + xlink:href="#g4649" + id="use4655" + width="100%" + height="100%" /> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="341.55399" + y="766.96503" + id="text4663" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4665" + x="341.55399" + y="766.96503">Inkscape is Free and Open Source Software licensed under the GPL.</tspan></text> + </g> + <g + inkscape:groupmode="layer" + id="layer5" + inkscape:label="background for dmg" + style="display:inline"> + <g + id="g4785"> + <rect + style="display:inline;opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect13530-7" + width="90" + height="90" + x="414" + y="188.5" /> + <rect + y="188.5" + x="96" + height="90" + width="90" + id="rect13527-5" + style="display:inline;opacity:0.25;fill:#0000ff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <g + id="g3786"> + <rect + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4783" + width="600" + height="400" + x="0" + y="0" /> <use - xlink:href="#d0e15" + style="display:inline" + height="100%" + width="100%" + id="use4735" + xlink:href="#rect4669" y="0" x="0" - id="use4801" - width="744.09448" - height="1052.3622" /> - </flowRegion> - <flowDiv - xml:space="preserve" - id="flowDiv4803">This tutorial covers copy/paste, node editing, freehand and bezier drawing, path manipulation, booleans, offsets, simplification, and text tool. </flowDiv> </flowRoot> - <g - id="g3978" - transform="translate(0,-6.720262)" - style="opacity:0.8258427"> - <path - sodipodi:nodetypes="ccccccccc" - style="color:#000000;fill:url(#radialGradient5810);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible" - d="m 321.13418,233.56827 -38.99349,27.67813 39.09841,27.39295 -0.035,-11.36482 118.86894,0 0,-32.34144 -118.90391,0 -0.035,0 0,-11.36482 z" - id="path4008" /> - <rect - y="245.66743" - x="320.60944" - height="30.984045" - width="118.35905" - id="rect4939" - style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + transform="scale(0.5859375,1)" /> + </g> + <g + id="g3779" + mask="url(#mask3799)"> + <use + height="100%" + width="100%" + id="use4709" + xlink:href="#g4649" + y="0" + x="0" + style="display:inline;opacity:1" + transform="matrix(0.55833333,0,0,1,14.133334,-429)" /> + <use + style="display:inline;opacity:1" + height="100%" + width="100%" + id="use4718" + xlink:href="#g4485" + y="0" + x="0" + transform="matrix(0.55833333,0,0,1,14.133334,0)" /> + <use + style="display:inline;opacity:1" + transform="matrix(0.5,0,0,0.5,32,92)" + height="100%" + width="100%" + id="use4738" + xlink:href="#g17092" + y="0" + x="0" /> + <use + style="display:inline;opacity:1" + height="100%" + width="100%" + id="use4740" + xlink:href="#text4431" + y="0" + x="0" /> + <use + style="display:inline;opacity:1" + height="100%" + width="100%" + id="use4742" + xlink:href="#text4443" + y="0" + x="0" /> + </g> + <g + id="g3790"> + <rect + y="163" + x="32" + height="141" + width="536" + id="rect4828" + style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <use + style="display:inline" + height="100%" + width="100%" + id="use4732" + xlink:href="#rect4693" + y="0" + x="0" + transform="matrix(0.55833333,0,0,1,14.133334,0)" /> + <text + sodipodi:linespacing="125%" + id="text4711" + y="337.96503" + x="132.5152" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:11px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="337.96503" + x="132.5152" + id="tspan4713" + sodipodi:role="line">Inkscape is Free and Open Source Software licensed under the GPL.</tspan></text> + <text + xml:space="preserve" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:14px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + x="376.46323" + y="141.78999" + id="text4804" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan4806" + x="376.46323" + y="141.78999">Inkscape 0.91pre2 custom</tspan></text> + <path + sodipodi:nodetypes="cccccccc" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.8258427;fill:url(#linearGradient3762);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none" + d="m 220,233.5 40,27.5 0,-11 119,0 0,-33 -119,0 0,-11 z" + id="path4958" + inkscape:connector-curvature="0" /> + </g> </g> + <use + x="0" + y="0" + xlink:href="#g4785" + id="dmg_background" + transform="matrix(1.25,0,0,1.25,1280,0)" + width="100%" + height="100%" + inkscape:export-xdpi="72" + inkscape:export-ydpi="72" + inkscape:label="#use4802" + inkscape:export-filename="dmg_background.png" /> + </g> + <g + inkscape:groupmode="layer" + id="layer4" + inkscape:label="assets" + style="display:none"> <g - style="display:inline;enable-background:new" - id="g9139" - transform="matrix(0.42708381,0,0,0.42708381,52.046708,125.92538)"> + clip-path="url(#clipPath17127)" + id="g17092" + transform="translate(0,-128)"> <g - style="opacity:0.78325124" - id="g6035" - transform="translate(3.6896803e-7,0.4883067)"> + transform="matrix(0.9939405,0,0,0.9939405,0.38937111,-1.4450758)" + id="g9139-7" + style="display:inline;enable-background:new"> + <g + transform="translate(3.6896803e-7,0.4883067)" + id="g6035-3" + style="opacity:0.78325124"> + <path + d="m 54.1,12.988307 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699996 -7.3,7.600003 -3.7,11.300003 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.100003 17,-4.1 20.3,-12.500003 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000003 -14,-5.0000003 -18.9,0 z m 47.3,81.3 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 31.9,105.38831 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700003 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700003 c -4.6,4.200003 0.8,8.600003 5.3,5.700003 1.2,-0.8 -0.1,-4.700007 -5.3,-5.700003 z" + id="path5987-2" + style="fill:#000000;fill-opacity:1;filter:url(#filter6017-3-7)" + inkscape:connector-curvature="0" /> + <path + d="m 54.1,13.964921 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699999 -7.3,7.600009 -3.7,11.300009 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.100009 17,-4.1 20.3,-12.500009 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000009 -14,-5.0000009 -18.9,0 z m 47.3,81.3 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 31.9,106.36493 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700009 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700009 c -4.6,4.200009 0.8,8.600009 5.3,5.700009 1.2,-0.8 -0.1,-4.70001 -5.3,-5.700009 z" + id="path6021-6" + style="opacity:0.57635468;fill:#000000;fill-opacity:1;filter:url(#filter6031-0-56)" + inkscape:connector-curvature="0" /> + </g> <path - style="fill:#000000;fill-opacity:1;filter:url(#filter6017-3-5)" - id="path5987" - d="m 54.1,12.988307 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699996 -7.3,7.600003 -3.7,11.300003 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.100003 17,-4.1 20.3,-12.500003 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000003 -14,-5.0000003 -18.9,0 z m 47.3,81.3 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 31.9,105.38831 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700003 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700003 c -4.6,4.200003 0.8,8.600003 5.3,5.700003 1.2,-0.8 -0.1,-4.700007 -5.3,-5.700003 z" /> + 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 47.3,81.3 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" + id="use7631-2" + style="fill:#000000;fill-opacity:1" + inkscape:connector-curvature="0" /> <path - style="opacity:0.57635468;fill:#000000;fill-opacity:1;filter:url(#filter6031-0-0)" - id="path6021" - d="m 54.1,13.964921 -41.2,42.2 c -15.6,15.6 10.1,14.3 19.4,20.2 4.3,2.8 -13.8,6.4 -10.1,10.1 3.6,3.7 21.7,7.1 25.3,10.7 3.6,3.699999 -7.3,7.600009 -3.7,11.300009 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.100009 17,-4.1 20.3,-12.500009 1.8,-4.5 -13.6,-7.7 -9.5,-10.6 9.8,-6.9 45.8,-10.4 29.2,-27 l -42.7,-43.7 c -5.3,-5.0000009 -14,-5.0000009 -18.9,0 z m 47.3,81.3 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 31.9,106.36493 c 3.7,3.2 9.3,-0.7 11.1,-5.2 -3.6,-4.700009 -16.9,0.3 -11.1,5.2 z m 67.5,-6.700009 c -4.6,4.200009 0.8,8.600009 5.3,5.700009 1.2,-0.8 -0.1,-4.70001 -5.3,-5.700009 z" /> - </g> - <path - style="fill:#000000;fill-opacity:1" - id="use7631" - 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 47.3,81.3 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" /> - <path - style="fill:none" - id="use7639" - 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 47.3,81.3 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" /> - <use - xlink:href="#outline1-4" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.66995072;fill:url(#linearGradient9175-3-1);filter:url(#filter8490-0-5)" - id="use7641" - clip-path="url(#clipPath9086-1-8)" - transform="matrix(0.9905442,0,0,0.9905442,0.6051535,0.604136)" /> - <path - style="opacity:0.50526315;fill:url(#shinySpecular-0-4);stroke:none" - id="path7643" - d="M 16.565217,57.039374 C 5.3632748,68.140398 25.042362,65.011927 40.180121,70.966113 L 71.464824,15.965587 c -4.743164,-4.844083 -10.798268,-4.44041 -15.137759,0 L 16.565217,57.039374 z" /> - <path - style="fill:url(#IcecapTip-0-1)" - id="icecap" - d="m 70.5,15.5 16.3,16.6 c 1.5,1.5 1.5,4.6 0.6,5.5 L 79.3,31 77.7,40.7 71,37.1 60.1,44 56.5,29.5 50.7,42.1 36.2,42 c -2.8,0 -2.4,-2.9 0.5,-5.8 5.7,-6.3 16.8,-17 20.3,-20.7 3.6,-3.7 9.9,-3.6 13.5,0 z" /> - <path - style="opacity:0.21674876;fill:url(#radialGradient9177-1-9);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path8566" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -1.25,0.25 -24.57014,5.09545 -29.82014,0.84545 -5.98592,-4.84575 -7.70217,-8.23028 -12.11736,-11.09545 -4.13751,-2.68498 -9.94967,-3.78036 -11.30246,-5.97865 -1.35279,-2.19829 2.7092,-5.03469 2.98996,-9.27135 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" /> - <path - style="opacity:0.27586209;fill:url(#radialGradient8574-0-2);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8732-3-0)" - id="path8718" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -41.33959,0.15736 -33.62485,-10.4946 -49.5625,-17.5 -2.30305,-1.0123 -0.96826,-3.76334 -0.6875,-8 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" /> - <path - style="opacity:0.45320195;fill:url(#radialGradient8744-9-3);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path8736" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 183.25,181.75 c 37.10371,-13.65459 49.02363,-15.53058 61.25,-27.75 -14.16069,11.95366 -44.09847,18.3658 -68.5,29 l 7.25,-1.25 z" /> - <path - style="opacity:0.51231528;fill:url(#radialGradient8768-6-5);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8764-9-6)" - id="path8746" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.791044)" - d="m 183.25,181.75 c 61.10371,-21.65459 50.77363,-21.53058 61.25,-27.75 -19.42769,7.43666 -55.73446,8.22981 -68.5,29 l 7.25,-1.25 z" /> - <path - style="opacity:0.2857143;fill:url(#linearGradient8912-9-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8864" - transform="matrix(0.5296484,0,0,0.5296484,-12.384318,-14.791044)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> - <path - style="opacity:0.62068942;fill:url(#linearGradient8910-3-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8906-3-7);enable-background:accumulate" - id="path8874" - transform="matrix(0.7131486,0,0,1.1407811,-54.577902,-134.95502)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> - <path - style="fill:url(#radialGradient8922-9-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-06)" - id="path8914" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.238677)" - d="m 214.125,203.75 c 3.76948,3.48424 24.75576,5.27219 28.1875,-1 -6.73663,4.7839 -21.71677,3.10264 -28.1875,1 z" /> - <path - style="opacity:0.2857143;fill:url(#linearGradient8990-4-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8984" - transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,5.7547955,30.286555)" - d="m 236.44594,199.0625 a 6.5084434,3.0820823 0 1 1 -13.01688,0 6.5084434,3.0820823 0 1 1 13.01688,0 z" /> - <path - style="opacity:0.62068942;fill:url(#linearGradient8992-2-2);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8906-3-7);enable-background:accumulate" - id="path8986" - transform="matrix(0.2750159,-0.1394397,0.5158824,1.0174708,-65.353496,-69.300635)" - d="m 236.99305,199.0625 a 7.0555515,2.1400476 0 1 1 -14.1111,0 7.0555515,2.1400476 0 1 1 14.1111,0 z" /> - <path - style="fill:url(#radialGradient8994-0-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-06)" - id="path8988" - transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,6.2599008,30.649764)" - d="m 217.05754,201.94027 c 3.76948,3.48424 26.97122,8.91123 25.25496,0.80973 -3.31737,5.32326 -18.78423,1.29291 -25.25496,-0.80973 z" /> - <path - style="fill:url(#radialGradient9004-6-9);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path8996" - transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" - d="m 68.25,186 c 0,-0.62057 38.84622,11.83854 45.5,18.5 -5.47122,-5.33854 -33.159709,-17.61609 -37.375,-17.75 -4.215291,-0.13391 -7.625,-0.5 -8.125,-0.75 z" /> - <g - id="g9018" - transform="matrix(0.8790148,-0.1929959,0.2338341,0.6959295,-20.209533,36.725557)"> + 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 47.3,81.3 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" + id="use7639-7" + style="fill:none" + inkscape:connector-curvature="0" /> + <use + transform="matrix(0.9905442,0,0,0.9905442,0.6051535,0.604136)" + clip-path="url(#clipPath9086-1-5)" + id="use7641-0" + style="opacity:0.66995072;fill:url(#linearGradient9175);filter:url(#filter8490-0-0)" + x="0" + y="0" + width="400" + height="300" + xlink:href="#outline1-2" /> + <path + d="M 16.565217,57.039374 C 5.3632748,68.140398 25.042362,65.011927 40.180121,70.966113 L 71.464824,15.965587 c -4.743164,-4.844083 -10.798268,-4.44041 -15.137759,0 L 16.565217,57.039374 Z" + id="path7643-5" + style="opacity:0.50526315;fill:url(#shinySpecular-0-4);stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 70.5,15.5 16.3,16.6 c 1.5,1.5 1.5,4.6 0.6,5.5 L 79.3,31 77.7,40.7 71,37.1 60.1,44 56.5,29.5 50.7,42.1 36.2,42 c -2.8,0 -2.4,-2.9 0.5,-5.8 5.7,-6.3 16.8,-17 20.3,-20.7 3.6,-3.7 9.9,-3.6 13.5,0 z" + id="icecap-3" + style="fill:url(#IcecapTip-0-3)" + inkscape:connector-curvature="0" /> + <path + d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -1.25,0.25 -24.57014,5.09545 -29.82014,0.84545 -5.98592,-4.84575 -7.70217,-8.23028 -12.11736,-11.09545 -4.13751,-2.68498 -9.94967,-3.78036 -11.30246,-5.97865 -1.35279,-2.19829 2.7092,-5.03469 2.98996,-9.27135 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8566-7" + style="opacity:0.21674876;fill:url(#radialGradient9177-1-7);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 113,203.5 c 0,0 3.34046,5.10071 3,7.5 -0.66817,4.70868 -10.80945,7.05842 -8.5625,11.25 2.21991,4.14114 10.22139,1.79405 16.9375,6.125 6.6875,4.3125 4.88949,13.10149 9.75,15.3125 9.47925,4.31205 34.375,-7.4375 33.125,-7.1875 -41.33959,0.15736 -33.62485,-10.4946 -49.5625,-17.5 -2.30305,-1.0123 -0.96826,-3.76334 -0.6875,-8 0.16862,-2.54442 -4,-7.5 -4,-7.5 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8718-6" + style="opacity:0.27586209;fill:url(#radialGradient8574-0-1);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8732-3-8)" + inkscape:connector-curvature="0" /> + <path + d="m 183.25,181.75 c 37.10371,-13.65459 49.02363,-15.53058 61.25,-27.75 -14.16069,11.95366 -44.09847,18.3658 -68.5,29 l 7.25,-1.25 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8736-9" + style="opacity:0.45320195;fill:url(#radialGradient8744-9-7);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 183.25,181.75 c 61.10371,-21.65459 50.77363,-21.53058 61.25,-27.75 -19.42769,7.43666 -55.73446,8.22981 -68.5,29 l 7.25,-1.25 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.791044)" + id="path8746-3" + style="opacity:0.51231528;fill:url(#radialGradient8768-6-2);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8764-9-3)" + inkscape:connector-curvature="0" /> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.5296484,0,0,0.5296484,-12.384318,-14.791044)" + id="path8864-0" + style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient8912-9-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.7131486,0,0,1.1407811,-54.577902,-134.95502)" + id="path8874-9" + style="display:inline;overflow:visible;visibility:visible;opacity:0.62068936;fill:url(#linearGradient8910-3-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906-3-4);enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 214.125,203.75 c 3.76948,3.48424 24.75576,5.27219 28.1875,-1 -6.73663,4.7839 -21.71677,3.10264 -28.1875,1 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-14.238677)" + id="path8914-1" + style="fill:url(#radialGradient8922-9-3);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-63)" + inkscape:connector-curvature="0" /> + <path + d="m 236.44594,199.0625 a 6.5084434,3.0820823 0 1 1 -13.01688,0 6.5084434,3.0820823 0 1 1 13.01688,0 z" + transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,5.7547955,30.286555)" + id="path8984-2" + style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient8990-4-8);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 236.99305,199.0625 a 7.0555515,2.1400476 0 1 1 -14.1111,0 7.0555515,2.1400476 0 1 1 14.1111,0 z" + transform="matrix(0.2750159,-0.1394397,0.5158824,1.0174708,-65.353496,-69.300635)" + id="path8986-0" + style="display:inline;overflow:visible;visibility:visible;opacity:0.62068936;fill:url(#linearGradient8992-2-5);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906-3-4);enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 217.05754,201.94027 c 3.76948,3.48424 26.97122,8.91123 25.25496,0.80973 -3.31737,5.32326 -18.78423,1.29291 -25.25496,-0.80973 z" + transform="matrix(0.2042516,-0.1035605,0.2395168,0.4723972,6.2599008,30.649764)" + id="path8988-7" + style="fill:url(#radialGradient8994-0-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter8980-1-63)" + inkscape:connector-curvature="0" /> <path - style="opacity:0.2857143;fill:url(#linearGradient9023-6-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path9006" - transform="matrix(0.5296484,0,0,0.5296484,-84.4165,-4.7277245)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> + d="m 68.25,186 c 0,-0.62057 38.84622,11.83854 45.5,18.5 -5.47122,-5.33854 -33.159709,-17.61609 -37.375,-17.75 -4.215291,-0.13391 -7.625,-0.5 -8.125,-0.75 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.722258,-13.864159)" + id="path8996-6" + style="fill:url(#radialGradient9004-6-0);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <g + transform="matrix(0.8790148,-0.1929959,0.2338341,0.6959295,-20.209533,36.725557)" + id="g9018-6"> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.5296484,0,0,0.5296484,-84.4165,-4.7277245)" + id="path9006-8" + style="display:inline;overflow:visible;visibility:visible;opacity:0.2857143;fill:url(#linearGradient9023-6-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" + transform="matrix(0.7131486,0,0,1.1407811,-126.61008,-124.8917)" + id="path9008-0" + style="display:inline;overflow:visible;visibility:visible;opacity:0.62068936;fill:url(#linearGradient9025-1-9);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;filter:url(#filter8906-3-4);enable-background:accumulate" + inkscape:connector-curvature="0" /> + </g> <path - style="opacity:0.62068942;fill:url(#linearGradient9025-1-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter8906-3-7);enable-background:accumulate" - id="path9008" - transform="matrix(0.7131486,0,0,1.1407811,-126.61008,-124.8917)" - d="m 237.875,199.0625 a 7.9375,2.4375 0 1 1 -15.875,0 7.9375,2.4375 0 1 1 15.875,0 z" /> + d="m 80.5,220.0625 c 0,0 2.10339,5.65078 7.875,5.9375 5.83887,0.29006 12.50324,-7.00698 13.0625,-9.625 -1,2.25 -6.590334,9.03328 -13.8125,8.9375 -4.099862,-0.0544 -7.125,-5.25 -7.125,-5.25 z" + transform="matrix(0.5296484,0,0,0.5296484,-11.622949,-14.42691)" + id="path9038-1" + style="opacity:0.61576353;fill:url(#radialGradient9046-1-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter9068-2-2)" + inkscape:connector-curvature="0" /> + <path + d="m 63.40625,10.21875 c -3.098181,0 -6.134601,1.122042 -8.28125,3.3125 l -41.1875,42.1875 c -3.76562,3.76562 -4.6702413,6.23069 -4.4375,7.625 0.1163706,0.697155 0.4585994,1.303027 1.1875,1.9375 0.728901,0.634473 1.831495,1.256389 3.15625,1.8125 2.649511,1.112222 6.217961,2.008085 9.71875,2.96875 3.500789,0.960665 6.929812,1.974626 9.53125,3.625 0.396623,0.258266 0.769088,0.576468 1.03125,1.03125 0.262162,0.454782 0.354216,1.056088 0.25,1.5625 -0.208431,1.012824 -0.83202,1.546985 -1.46875,2.03125 -1.27346,0.96853 -3.023257,1.773229 -4.78125,2.625 -1.757993,0.851771 -3.524925,1.723242 -4.40625,2.4375 -0.440663,0.357129 -0.600112,0.678133 -0.59375,0.65625 0.0064,-0.02188 -0.116851,-0.273101 0.09375,-0.0625 0.551764,0.56709 2.274075,1.538165 4.46875,2.40625 2.194675,0.868085 4.88065,1.745624 7.59375,2.625 2.7131,0.879376 5.4575,1.749959 7.78125,2.65625 2.32375,0.906291 4.217694,1.748944 5.46875,3 0.622681,0.639978 1.062632,1.435956 1.15625,2.25 0.09362,0.814044 -0.126809,1.578032 -0.4375,2.21875 -0.621382,1.28144 -1.620313,2.26719 -2.53125,3.21875 -0.910938,0.95156 -1.736226,1.86034 -2.03125,2.46875 -0.147512,0.3042 -0.170347,0.50242 -0.15625,0.625 0.0141,0.12258 0.03518,0.24623 0.3125,0.53125 A 1.4566768,1.4566768 0 0 1 44.875,106 c 1.193594,1.2618 3.787002,1.43924 6.71875,2.125 1.465874,0.34288 2.998909,0.86196 4.3125,2 1.313591,1.13804 2.299435,2.87059 2.71875,5.21875 0.176459,0.99459 0.702722,1.4788 1.96875,1.875 1.266028,0.3962 3.194353,0.46554 5.3125,0.15625 4.236295,-0.61859 9.260035,-2.69532 12.15625,-5.09375 0.17999,-0.15299 0.129956,-0.11255 0.1875,-0.1875 -0.194805,-0.13939 -0.651644,-0.43652 -1.40625,-0.8125 -0.891527,-0.4442 -1.944708,-0.85956 -2.75,-1.875 -0.402646,-0.50772 -0.679877,-1.30934 -0.5625,-2.09375 0.117377,-0.78441 0.546832,-1.43702 1.125,-2.03125 4.745751,-4.79848 9.421937,-5.944136 12.9375,-6.875 1.757782,-0.465432 3.229292,-0.891233 4.34375,-1.59375 1.114458,-0.702517 1.98508,-1.663728 2.71875,-3.53125 0.08087,-0.202174 0.07855,-0.260846 -0.03125,-0.5 C 94.515197,92.542096 94.220541,92.159521 93.75,91.75 92.808918,90.930959 91.239577,90.050804 89.6875,89.1875 88.135423,88.324196 86.627034,87.519262 85.53125,86.5 84.983358,85.990369 84.409233,85.348367 84.34375,84.375 84.27827,83.401633 84.916318,82.523367 85.65625,82 88.401968,80.06679 92.552528,78.595094 97.0625,77.03125 101.57247,75.467406 106.42363,73.849125 110.375,72 c 3.95137,-1.849125 6.85729,-3.978669 7.78125,-6.125 0.46198,-1.073165 0.54663,-2.158606 0.0625,-3.5625 -0.48413,-1.403894 -1.58958,-3.120831 -3.5625,-5.09375 L 72,13.5625 c -0.01071,-0.0101 -0.02051,-0.02119 -0.03125,-0.03125 -2.357722,-2.207738 -5.478371,-3.3125 -8.5625,-3.3125 z m 45.9375,80 c -2.63522,0.09513 -5.05952,1.301393 -6.09375,3.1875 0.29381,0.110524 0.55838,0.234969 1.03125,0.34375 1.37562,0.316455 3.29543,0.520736 5.1875,0.5625 1.89207,0.04176 3.78415,-0.117472 4.9375,-0.4375 0.50487,-0.14009 0.77236,-0.281778 0.90625,-0.375 -0.2558,-1.091098 -0.86487,-1.862126 -1.90625,-2.4375 -1.07862,-0.595951 -2.55669,-0.898111 -4.0625,-0.84375 z m -70.5,9.0625 c -2.089872,-0.145348 -4.716548,0.686551 -6,1.71875 -0.641726,0.5161 -0.913269,0.99441 -0.9375,1.3125 -0.02423,0.31809 0.07726,0.74199 0.9375,1.46875 a 1.4566768,1.4566768 0 0 1 0,0.0312 c 1.352809,1.17 2.882256,1.04802 4.625,0.0937 1.460951,-0.79997 2.757201,-2.30075 3.625,-3.875 -0.585032,-0.377341 -1.284532,-0.682853 -2.25,-0.75 z m 61,0.625 c -0.447303,0.5686 -0.690902,1.09797 -0.71875,1.46875 -0.03844,0.51176 0.106611,0.90723 0.5,1.28125 0.73729,0.70099 2.33912,1.00278 3.96875,0.125 -0.0322,-0.1891 -0.0933,-0.47591 -0.34375,-0.84375 -0.4999,-0.73414 -1.6686,-1.5251 -3.40625,-2.03125 z" + id="87235-3" + style="fill:none;stroke:url(#radialGradient11553-3-1);stroke-width:0.48830673;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter9298-4-5)" + inkscape:connector-curvature="0" /> + <path + d="m 95.5,172 c -5.090606,1.50191 -21.592018,7.73713 -19.25,12.5 2.243595,4.56272 40.61138,6.40132 46.5,20 2.5679,5.93009 -5.89238,10.40326 -3.75,16.5 1.64973,4.69477 14.41196,16.49084 22.48603,22.06781 6.33298,4.37435 14.65096,-3.52244 11.26397,-10.06781 -5.39589,-10.42759 18.44266,-23.19912 29.25,-29 6.30524,-3.38436 -13,-20 -13,-20 0,0 -73.5,-12 -73.5,-12 z" + transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" + id="path5897-0" + style="opacity:0.32512315;fill:url(#linearGradient5905-4-7);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5983-8-5)" + inkscape:connector-curvature="0" /> + <path + d="m 41.742167,78.533037 c 2.231933,1.639226 6.636757,0.650538 9.282124,1.841759 6.349518,2.859218 14.154941,6.045427 12.718568,0.404555 0,0 -1.615771,1.342042 -1.615771,1.342042 0,0 -0.03153,-2.557545 -0.03153,-2.557545 0,0 -3.751977,0.916294 -3.751977,0.916294 0,0 -2.906173,-2.332759 -4.238526,-3.101995 -0.27829,-0.160669 -1.707695,1.292815 -1.707695,1.292815 0,0 -0.25697,-1.543804 -0.25697,-1.543804 -1.857372,-0.197638 -3.696159,-0.284805 -5.31515,-0.271821 -3.880942,0.03112 -6.499059,0.637741 -5.083074,1.6777 z" + id="path5783-7" + style="fill:url(#linearGradient5801-2-8);fill-opacity:1;fill-rule:evenodd;stroke:none" + inkscape:connector-curvature="0" /> + <path + d="m 182.75,187.25 c -1.75981,6.4783 21.62776,15.27989 19.875,19.75 -3.85895,9.84158 -24.97596,3.13755 -41.125,23.75 -2.31318,2.95251 3.25,13.5 2.5,12.25 -0.75,-1.25 -6.4649,-9.96285 -5,-14.25 4.59417,-13.44525 49.0128,-18.45749 40.875,-24.875 -4.67988,-3.69058 -21.50546,-13.88721 -17.125,-16.625 z" + transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" + id="path5803-5" + style="opacity:0.47783251;fill:url(#radialGradient5811-3-0);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5845-5-1)" + inkscape:connector-curvature="0" /> + <path + d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" + transform="matrix(0.4883067,0,0,0.4883067,-6.3597463,-8.0094438)" + id="path6041-9" + style="display:inline;overflow:visible;visibility:visible;opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" + transform="matrix(0.3096579,0,0,0.4883067,27.528443,1.5735759)" + id="path6043-3" + style="display:inline;overflow:visible;visibility:visible;opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" + transform="matrix(0.5478563,0,0,0.4883067,-92.102233,1.115795)" + id="path6045-5" + style="display:inline;overflow:visible;visibility:visible;opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 36.672282,76.528654 c -7.152988,4.424107 -18.274031,6.034229 -6.103834,8.972635 -1.449712,-3.2281 3.138581,-2.872021 6.103834,-8.972635 z" + id="path5049-8" + style="display:inline;overflow:visible;visibility:visible;opacity:0.25123153;fill:url(#linearGradient5822-7-1);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.04789329;marker:none;enable-background:accumulate" + inkscape:connector-curvature="0" /> + <path + d="m 8.8342799,171.64721 c 0,0 22.5917801,-2.12795 27.8180201,-8.64645 3.05755,-3.81358 -12.15146,-8.2638 -8.86827,-12 12.35008,-14.0541 22.73076,-13.46729 37.05025,-19.35355 14.31949,-5.88626 9.03544,-8.76906 4.40381,-11.35355 -7.9325,-4.4264 -25.58722,-9.14237 -19.74696,-19.64645 5.87688,-10.569936 57.34315,-25.249996 57.34315,-25.249996 15.59619,-5.32843 13.63909,-14.96447 6,-23 l -46,-45.7499997 c 0,0 2.28296,43.3886497 -7,61.9999997 -11.4715,22.99914 -72.54408,48.661766 -47,51.499996 9,1 13.32065,4.0705 17,11 7.57631,14.26883 -21.0000001,40.5 -21.0000001,40.5 z" + transform="matrix(0.48830674,0,0,0.48830674,57.750397,32.997477)" + id="path10207-0" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.36315792;fill:url(#linearGradient1539-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;filter:url(#filter10997-7-2-1);enable-background:accumulate" + inkscape:connector-curvature="0" /> </g> - <path - style="opacity:0.61576353;fill:url(#radialGradient9046-1-0);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter9068-2-7)" - id="path9038" - transform="matrix(0.5296484,0,0,0.5296484,-11.622949,-14.42691)" - d="m 80.5,220.0625 c 0,0 2.10339,5.65078 7.875,5.9375 5.83887,0.29006 12.50324,-7.00698 13.0625,-9.625 -1,2.25 -6.590334,9.03328 -13.8125,8.9375 -4.099862,-0.0544 -7.125,-5.25 -7.125,-5.25 z" /> - <path - style="fill:none;stroke:url(#radialGradient11553-3-4);stroke-width:0.48830673;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter9298-4-2)" - id="87235" - d="m 63.40625,10.21875 c -3.098181,0 -6.134601,1.122042 -8.28125,3.3125 l -41.1875,42.1875 c -3.76562,3.76562 -4.6702413,6.23069 -4.4375,7.625 0.1163706,0.697155 0.4585994,1.303027 1.1875,1.9375 0.728901,0.634473 1.831495,1.256389 3.15625,1.8125 2.649511,1.112222 6.217961,2.008085 9.71875,2.96875 3.500789,0.960665 6.929812,1.974626 9.53125,3.625 0.396623,0.258266 0.769088,0.576468 1.03125,1.03125 0.262162,0.454782 0.354216,1.056088 0.25,1.5625 -0.208431,1.012824 -0.83202,1.546985 -1.46875,2.03125 -1.27346,0.96853 -3.023257,1.773229 -4.78125,2.625 -1.757993,0.851771 -3.524925,1.723242 -4.40625,2.4375 -0.440663,0.357129 -0.600112,0.678133 -0.59375,0.65625 0.0064,-0.02188 -0.116851,-0.273101 0.09375,-0.0625 0.551764,0.56709 2.274075,1.538165 4.46875,2.40625 2.194675,0.868085 4.88065,1.745624 7.59375,2.625 2.7131,0.879376 5.4575,1.749959 7.78125,2.65625 2.32375,0.906291 4.217694,1.748944 5.46875,3 0.622681,0.639978 1.062632,1.435956 1.15625,2.25 0.09362,0.814044 -0.126809,1.578032 -0.4375,2.21875 -0.621382,1.28144 -1.620313,2.26719 -2.53125,3.21875 -0.910938,0.95156 -1.736226,1.86034 -2.03125,2.46875 -0.147512,0.3042 -0.170347,0.50242 -0.15625,0.625 0.0141,0.12258 0.03518,0.24623 0.3125,0.53125 A 1.4566768,1.4566768 0 0 1 44.875,106 c 1.193594,1.2618 3.787002,1.43924 6.71875,2.125 1.465874,0.34288 2.998909,0.86196 4.3125,2 1.313591,1.13804 2.299435,2.87059 2.71875,5.21875 0.176459,0.99459 0.702722,1.4788 1.96875,1.875 1.266028,0.3962 3.194353,0.46554 5.3125,0.15625 4.236295,-0.61859 9.260035,-2.69532 12.15625,-5.09375 0.17999,-0.15299 0.129956,-0.11255 0.1875,-0.1875 -0.194805,-0.13939 -0.651644,-0.43652 -1.40625,-0.8125 -0.891527,-0.4442 -1.944708,-0.85956 -2.75,-1.875 -0.402646,-0.50772 -0.679877,-1.30934 -0.5625,-2.09375 0.117377,-0.78441 0.546832,-1.43702 1.125,-2.03125 4.745751,-4.79848 9.421937,-5.944136 12.9375,-6.875 1.757782,-0.465432 3.229292,-0.891233 4.34375,-1.59375 1.114458,-0.702517 1.98508,-1.663728 2.71875,-3.53125 0.08087,-0.202174 0.07855,-0.260846 -0.03125,-0.5 C 94.515197,92.542096 94.220541,92.159521 93.75,91.75 92.808918,90.930959 91.239577,90.050804 89.6875,89.1875 88.135423,88.324196 86.627034,87.519262 85.53125,86.5 84.983358,85.990369 84.409233,85.348367 84.34375,84.375 84.27827,83.401633 84.916318,82.523367 85.65625,82 88.401968,80.06679 92.552528,78.595094 97.0625,77.03125 101.57247,75.467406 106.42363,73.849125 110.375,72 c 3.95137,-1.849125 6.85729,-3.978669 7.78125,-6.125 0.46198,-1.073165 0.54663,-2.158606 0.0625,-3.5625 -0.48413,-1.403894 -1.58958,-3.120831 -3.5625,-5.09375 L 72,13.5625 c -0.01071,-0.0101 -0.02051,-0.02119 -0.03125,-0.03125 -2.357722,-2.207738 -5.478371,-3.3125 -8.5625,-3.3125 z m 45.9375,80 c -2.63522,0.09513 -5.05952,1.301393 -6.09375,3.1875 0.29381,0.110524 0.55838,0.234969 1.03125,0.34375 1.37562,0.316455 3.29543,0.520736 5.1875,0.5625 1.89207,0.04176 3.78415,-0.117472 4.9375,-0.4375 0.50487,-0.14009 0.77236,-0.281778 0.90625,-0.375 -0.2558,-1.091098 -0.86487,-1.862126 -1.90625,-2.4375 -1.07862,-0.595951 -2.55669,-0.898111 -4.0625,-0.84375 z m -70.5,9.0625 c -2.089872,-0.145348 -4.716548,0.686551 -6,1.71875 -0.641726,0.5161 -0.913269,0.99441 -0.9375,1.3125 -0.02423,0.31809 0.07726,0.74199 0.9375,1.46875 a 1.4566768,1.4566768 0 0 1 0,0.0312 c 1.352809,1.17 2.882256,1.04802 4.625,0.0937 1.460951,-0.79997 2.757201,-2.30075 3.625,-3.875 -0.585032,-0.377341 -1.284532,-0.682853 -2.25,-0.75 z m 61,0.625 c -0.447303,0.5686 -0.690902,1.09797 -0.71875,1.46875 -0.03844,0.51176 0.106611,0.90723 0.5,1.28125 0.73729,0.70099 2.33912,1.00278 3.96875,0.125 -0.0322,-0.1891 -0.0933,-0.47591 -0.34375,-0.84375 -0.4999,-0.73414 -1.6686,-1.5251 -3.40625,-2.03125 z" /> - <path - style="opacity:0.32512315;fill:url(#linearGradient5905-4-0);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5983-8-5)" - id="path5897" - transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" - d="m 95.5,172 c -5.090606,1.50191 -21.592018,7.73713 -19.25,12.5 2.243595,4.56272 40.61138,6.40132 46.5,20 2.5679,5.93009 -5.89238,10.40326 -3.75,16.5 1.64973,4.69477 14.41196,16.49084 22.48603,22.06781 6.33298,4.37435 14.65096,-3.52244 11.26397,-10.06781 -5.39589,-10.42759 18.44266,-23.19912 29.25,-29 6.30524,-3.38436 -13,-20 -13,-20 0,0 -73.5,-12 -73.5,-12 z" /> - <path - style="fill:url(#linearGradient5801-2-0);fill-opacity:1;fill-rule:evenodd;stroke:none" - id="path5783" - d="m 41.742167,78.533037 c 2.231933,1.639226 6.636757,0.650538 9.282124,1.841759 6.349518,2.859218 14.154941,6.045427 12.718568,0.404555 0,0 -1.615771,1.342042 -1.615771,1.342042 0,0 -0.03153,-2.557545 -0.03153,-2.557545 0,0 -3.751977,0.916294 -3.751977,0.916294 0,0 -2.906173,-2.332759 -4.238526,-3.101995 -0.27829,-0.160669 -1.707695,1.292815 -1.707695,1.292815 0,0 -0.25697,-1.543804 -0.25697,-1.543804 -1.857372,-0.197638 -3.696159,-0.284805 -5.31515,-0.271821 -3.880942,0.03112 -6.499059,0.637741 -5.083074,1.6777 z" /> - <path - style="opacity:0.47783251;fill:url(#radialGradient5811-3-8);fill-opacity:1;fill-rule:evenodd;stroke:none;filter:url(#filter5845-5-6)" - id="path5803" - transform="matrix(0.4883067,0,0,0.4883067,-5.8104012,-7.7042521)" - d="m 182.75,187.25 c -1.75981,6.4783 21.62776,15.27989 19.875,19.75 -3.85895,9.84158 -24.97596,3.13755 -41.125,23.75 -2.31318,2.95251 3.25,13.5 2.5,12.25 -0.75,-1.25 -6.4649,-9.96285 -5,-14.25 4.59417,-13.44525 49.0128,-18.45749 40.875,-24.875 -4.67988,-3.69058 -21.50546,-13.88721 -17.125,-16.625 z" /> - <path - style="opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6041" - transform="matrix(0.4883067,0,0,0.4883067,-6.3597463,-8.0094438)" - d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" /> - <path - style="opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6043" - transform="matrix(0.3096579,0,0,0.4883067,27.528443,1.5735759)" - d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" /> - <path - style="opacity:0.58620689;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6045" - transform="matrix(0.5478563,0,0,0.4883067,-92.102233,1.115795)" - d="m 236.5,201.1875 a 2.5625,1.0625 0 1 1 -5.125,0 2.5625,1.0625 0 1 1 5.125,0 z" /> - <path - style="opacity:0.25123153;fill:url(#linearGradient5822-7-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.04789329;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path5049" - d="m 36.672282,76.528654 c -7.152988,4.424107 -18.274031,6.034229 -6.103834,8.972635 -1.449712,-3.2281 3.138581,-2.872021 6.103834,-8.972635 z" /> - <path - style="opacity:0.36315792;color:#000000;fill:url(#linearGradient1539-7);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter10997-7-2-5);enable-background:accumulate" - id="path10207" - transform="matrix(0.48830674,0,0,0.48830674,57.750397,32.997477)" - d="m 8.8342799,171.64721 c 0,0 22.5917801,-2.12795 27.8180201,-8.64645 3.05755,-3.81358 -12.15146,-8.2638 -8.86827,-12 12.35008,-14.0541 22.73076,-13.46729 37.05025,-19.35355 14.31949,-5.88626 9.03544,-8.76906 4.40381,-11.35355 -7.9325,-4.4264 -25.58722,-9.14237 -19.74696,-19.64645 5.87688,-10.569936 57.34315,-25.249996 57.34315,-25.249996 15.59619,-5.32843 13.63909,-14.96447 6,-23 l -46,-45.7499997 c 0,0 2.28296,43.3886497 -7,61.9999997 -11.4715,22.99914 -72.54408,48.661766 -47,51.499996 9,1 13.32065,4.0705 17,11 7.57631,14.26883 -21.0000001,40.5 -21.0000001,40.5 z" /> </g> + <g + id="g4453" + transform="translate(0,-92)"> + <text + sodipodi:linespacing="125%" + id="text4431" + y="56.595001" + x="113.27875" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:33.75px;line-height:125%;font-family:Calluna;-inkscape-font-specification:Calluna;text-align:start;letter-spacing:0px;word-spacing:0px;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="56.595001" + x="113.27875" + id="tspan4433" + sodipodi:role="line">INKSCAPE</tspan></text> + <text + sodipodi:linespacing="125%" + id="text4443" + y="84.804001" + x="144.53799" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:17px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + xml:space="preserve"><tspan + y="84.804001" + x="144.53799" + id="tspan4445" + sodipodi:role="line">Draw Freely.</tspan></text> + </g> + <g + style="display:inline" + id="g4485"> + <rect + y="162" + x="32" + height="1" + width="960" + id="rect4461" + style="opacity:1;fill:#262626;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + rx="10" + y="110" + x="32" + height="52" + width="960" + id="rect4459" + style="opacity:1;fill:url(#linearGradient4475);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + style="opacity:1;fill:url(#linearGradient4483);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4463" + width="960" + height="42" + x="32" + y="120" /> + </g> + <g + id="g4543"> + <rect + y="110" + x="113" + height="52" + width="1" + id="rect4531" + style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + style="opacity:1;fill:#5a5a5a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4533" + width="1" + height="52" + x="114" + y="110" /> + </g> + <g + style="display:inline" + id="g4649"> + <rect + y="733" + x="32" + height="4" + width="960" + id="rect4625" + style="opacity:1;fill:#0d0d0d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + y="737" + x="32" + height="50" + width="960" + id="rect4629" + style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> + <rect + rx="10" + style="opacity:1;fill:#333333;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4627" + width="960" + height="60" + x="32" + y="737" /> + <rect + y="737" + x="32" + height="60" + width="960" + id="rect4631" + style="opacity:1;fill:url(#radialGradient4639);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + rx="10" /> + </g> + <use + style="display:inline" + transform="matrix(0.5,0,0,0.5,32,-8)" + height="100%" + width="100%" + id="use4705" + xlink:href="#g17092" + y="0" + x="0" /> + <rect + style="display:inline;opacity:1;fill:url(#linearGradient4681);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" + id="rect4669" + width="1024" + height="75" + x="0" + y="0" /> + <rect + y="163" + x="32" + height="100" + width="960" + id="rect4693" + style="display:inline;opacity:1;fill:url(#linearGradient4703);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1" /> </g> - <style - id="style26" - type="text/css" /> - <style - id="style26-8" - type="text/css" /> </svg> diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt Binary files differindex 7c010d102..b27a6860d 100755 --- a/packaging/macosx/dmg_set_style.scpt +++ b/packaging/macosx/dmg_set_style.scpt diff --git a/packaging/macosx/inkscape.ds_store b/packaging/macosx/inkscape.ds_store Binary files differindex c4bc9e32d..469da6fcc 100644 --- a/packaging/macosx/inkscape.ds_store +++ b/packaging/macosx/inkscape.ds_store diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index ef4301c17..8931aca77 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -15,10 +15,14 @@ # Kees Cook <kees@outflux.net> # Michael Wybrow <mjwybrow@users.sourceforge.net> # Jean-Olivier Irisson <jo.irisson@gmail.com> +# Liam P. White <inkscapebrony@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> # # Copyright (C) 2005 Kees Cook # Copyright (C) 2005-2009 Michael Wybrow # Copyright (C) 2007-2009 Jean-Olivier Irisson +# Copyright (C) 2014 Liam P. White +# Copyright (C) 2014 ~suv # # Released under GNU GPL, read the file 'COPYING' for more information # @@ -26,17 +30,19 @@ # https://gnunet.org/svn/GNUnet/contrib/OSX/build_app # # NB: -# When packaging Inkscape for OS X, configure should be run with the +# When packaging Inkscape for OS X, configure should be run with the # "--enable-osxapp" option which sets the correct paths for support # files inside the app bundle. # # Defaults -strip=false -add_python=false +strip_build=false +add_wrapper=true +add_python=true python_dir="" -# If LIBPREFIX is not already set (by osx-build.sh for example) set it to blank (one should use the command line argument to set it correctly) +# If LIBPREFIX is not already set (by osx-build.sh for example) set it to blank +# (one should use the command line argument to set it correctly) if [ -z $LIBPREFIX ]; then LIBPREFIX="" fi @@ -63,13 +69,15 @@ Create an app bundle for OS X \033[1m-l,--libraries\033[0m specify the path to the librairies Inkscape depends on (typically /sw or /opt/local) - \033[1m-b--binary\033[0m + \033[1m-b,--binary\033[0m specify the path to Inkscape's binary. By default it is in Build/bin/ at the base of the source code directory \033[1m-p,--plist\033[0m specify the path to Info.plist. Info.plist can be found in the base directory of the source code once configure has been run + \033[1m-v,--verbose\033[0m + Verbose mode. \033[1mEXAMPLE\033[0m $0 -s -py ~/python-modules -l /opt/local -b ../../Build/bin/inkscape -p ../../Info.plist @@ -87,7 +95,7 @@ do python_dir="$2" shift 1 ;; -s) - strip=true ;; + strip_build=true ;; -l|--libraries) LIBPREFIX="$2" shift 1 ;; @@ -97,11 +105,13 @@ do -p|--plist) plist="$2" shift 1 ;; + -v|--verbose) + verbose_mode=true ;; -h|--help) help exit 0 ;; *) - echo "Invalid command line option: $1" + echo "Invalid command line option: $1" exit 2 ;; esac shift 1 @@ -109,7 +119,9 @@ done echo -e "\n\033[1mCREATE INKSCAPE APP BUNDLE\033[0m\n" + # Safety tests +#---------------------------------------------------------- if [ "x$binary" == "x" ]; then echo "Inkscape binary path not specified." >&2 @@ -131,70 +143,181 @@ if [ ! -f "$plist" ]; then exit 1 fi -PYTHONPACKURL="http://inkscape.modevia.com/macosx-snap/Python-packages.dmg" +if [ ${add_python} = "true" ]; then + if [ -z "$python_dir" ]; then + echo "Python modules will be copied from MacPorts tree." >&2 + else + if [ ! -e "$python_dir" ]; then + echo "Python modules directory \""$python_dir"\" not found." >&2 + exit 1 + else + if [ -e "$python_dir/i386" -o -e "$python_dir/ppc" ]; then + echo "Outdated structure in custom python modules detected," >&2 + echo "not compatible with current packaging." >&2 + exit 1 + else + echo "Python modules will be copied from $python_dir." >&2 + fi + fi + fi +fi + +if [ ! -e "$LIBPREFIX" ]; then + echo "Cannot find the directory containing the libraires: $LIBPREFIX" >&2 + exit 1 +fi + +if [ "x$(otool -L "$binary" | grep "libgtk-quartz")" != "x" ]; then + if ! pkg-config --exists gtk+-quartz-2.0; then + echo "Missing GTK+ backend -- please install gtk2 and its dependencies with variant '+quartz' and try again." >&2 + exit 1 + fi + _backend="quartz" +else + if ! pkg-config --exists gtk+-x11-2.0; then + echo "Missing GTK+ backend -- please install gtk2 and its dependencies with variant '+x11' and try again." >&2 + exit 1 + fi + _backend="x11" +fi -if [ "x$python_dir" == "x" ]; then - echo "Python modules directory not specified." >&2 - echo "Python modules can be downloaded from:" >&2 - echo " $PYTHONPACKURL" >&2 +if ! pkg-config --exists gtk-engines-2; then + echo "Missing gtk-engines2 -- please install gtk-engines2 and try again." >&2 exit 1 fi -if [ ! -e "$python_dir/i386" -o ! -e "$python_dir/ppc" ]; then - echo "Directory does not appear to contain the i386 and ppc python modules:" >&2 - echo " $python_dir" >&2 - echo "Python modules can be downloaded from:" >&2 - echo " $PYTHONPACKURL" >&2 +if [ ! -e "$LIBPREFIX/lib/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/engines/libmurrine.so" ]; then + echo "Missing gtk2-murrine -- please install gtk2-murrine and try again." >&2 exit 1 fi -if [ ! -e "$LIBPREFIX" ]; then - echo "Cannot find the directory containing the libraires: $LIBPREFIX" >&2 +if [ ! -e "$LIBPREFIX/lib/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/engines/libadwaita.so" ]; then + echo "Missing gnome-themes-standard -- please install gnome-themes-standard and try again." >&2 exit 1 fi -if ! pkg-config --exists gtk-engines-2; then - echo "Missing gtk-engines2 -- please install gtk-engines2 and try again." >&2 +if [ ! -e "$LIBPREFIX/share/icons/hicolor/index.theme" ]; then + echo "Missing hicolor-icon-theme -- please install hicolor-icon-theme and try again." >&2 exit 1 fi -if ! pkg-config --exists gnome-vfs-2.0; then - echo "Missing gnome-vfs2 -- please install gnome-vfs2 and try again." >&2 +if ! pkg-config --exists icon-naming-utils; then + echo "Missing icon-naming-utils -- please install icon-naming-utils and try again." >&2 exit 1 fi +# if [ "$default_theme" != "default" ] ; then +# if ! pkg-config --exists gnome-icon-theme; then +# echo "Missing gnome-icon-theme -- please install gnome-icon-theme and try again." >&2 +# exit 1 +# fi +# +# if ! pkg-config --exists gnome-icon-theme-symbolic; then +# echo "Missing gnome-icon-theme-symbolic -- please install gnome-icon-theme-symbolic and try again." >&2 +# exit 1 +# fi +# fi + +unset WITH_GNOME_VFS +if ! pkg-config --exists gnome-vfs-2.0; then + echo "Missing gnome-vfs2 -- some features will be disabled" >&2 +else + WITH_GNOME_VFS=true +fi + +# unset WITH_DBUS +# if ! pkg-config --exists dbus-1; then +# echo "Missing dbus -- some features will be disabled" >&2 +# else +# WITH_DBUS=true +# fi +# +# unset WITH_GVFS +# if [ ! -e "$LIBPREFIX/libexec/gvfsd" ]; then +# echo "Missing gvfs -- some features will be disabled" >&2 +# elif [ ! -z "$WITH_DBUS" ]; then +# WITH_GVFS=true +# else +# echo "Missing dbus for gvfs -- some features will be disabled" >&2 +# fi + if ! pkg-config --exists poppler; then echo "Missing poppler -- please install poppler and try again." >&2 exit 1 fi -if ! pkg-config --modversion ImageMagick >/dev/null 2>&1; then +if ! pkg-config --exists ImageMagick; then echo "Missing ImageMagick -- please install ImageMagick and try again." >&2 exit 1 fi if [ ! -e "$LIBPREFIX/lib/aspell-0.60/en.dat" ]; then echo "Missing aspell en dictionary -- please install at least 'aspell-dict-en', but" >&2 - echo "preferably all dictionaries ('aspell-dict-*') and try again." >&2 + echo "preferably more dictionaries ('aspell-dict-*') and try again." >&2 exit 1 fi +# awk on Leopard fails in fixlib(), test earlier and require gawk if test fails +awk_test="$(echo "/lib" | awk -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" +if [ -z "$awk_test" ]; then + if [ ! -x "$LIBPREFIX/bin/gawk" ]; then + echo "awk provided by system is too old, please install gawk and try again" >&2 + exit 1 + else + awk_cmd="$LIBPREFIX/bin/gawk" + fi +else + awk_cmd="awk" +fi +unset awk_test + -# Handle some version specific details. -VERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -f2 -d'.'` -if [ "$VERSION" -ge "4" ]; then - # We're on Tiger (10.4) or later. - # XCode behaves a little differently in Tiger and later. - XCODEFLAGS="-configuration Deployment" - SCRIPTEXECDIR="ScriptExec/build/Deployment/ScriptExec.app/Contents/MacOS" - EXTRALIBS="" +# OS X version +#---------------------------------------------------------- +OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" +OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)" +OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" +OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)" +ARCH="$(uname -a | awk '{print $NF;}')" + +# guess default build_arch (MacPorts) +if [ "$OSXMINORNO" -ge "6" ]; then + if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then + _build_arch="x86_64" + else + _build_arch="i386" + fi else - # Panther (10.3) or earlier. - XCODEFLAGS="-buildstyle Deployment" - SCRIPTEXECDIR="ScriptExec/build/ScriptExec.app/Contents/MacOS" - EXTRALIBS="" + if [ $ARCH = "powerpc" ]; then + _build_arch="ppc" + else + _build_arch="i386" + fi fi +# Setup +#---------------------------------------------------------- +case $_backend in + x11) + echo "Building package with GTK+/X11." >&2 + # Handle some version specific details. + if [ "$OSXMINORNO" -le "4" ]; then + echo "Note: Inkscape packaging requires Mac OS X 10.5 Leopard or later." + exit 1 + else # if [ "$OSXMINORNO" -ge "5" ]; then + XCODEFLAGS="-configuration Deployment" + SCRIPTEXECDIR="ScriptExec/build/Deployment/ScriptExec.app/Contents/MacOS" + EXTRALIBS="" + fi + ;; + quartz) + # quartz backend + echo "Building package with GTK+/Quartz." >&2 + ;; + *) + exit 1 +esac + # Package always has the same name. Version information is stored in # the Info.plist file which is filled in by the configure script. @@ -203,50 +326,71 @@ package="Inkscape.app" # Remove a previously existing package if necessary if [ -d $package ]; then echo "Removing previous Inkscape.app" - rm -Rf $package + rm -rf $package fi # Set the 'macosx' directory, usually the current directory. resdir=`pwd` +# Custom resources used to generate resources during app bundle creation. +if [ -z "$custom_res" ] ; then + custom_res="${resdir}/Resources-extras" +fi + # Prepare Package #---------------------------------------------------------- pkgexec="$package/Contents/MacOS" pkgbin="$package/Contents/Resources/bin" +pkgetc="$package/Contents/Resources/etc" pkglib="$package/Contents/Resources/lib" -pkglocale="$package/Contents/Resources/locale" -pkgpython="$package/Contents/Resources/python/site-packages/" +pkgshare="$package/Contents/Resources/share" +pkglocale="$package/Contents/Resources/share/locale" pkgresources="$package/Contents/Resources" mkdir -p "$pkgexec" mkdir -p "$pkgbin" +mkdir -p "$pkgetc" mkdir -p "$pkglib" +mkdir -p "$pkgshare" mkdir -p "$pkglocale" -mkdir -p "$pkgpython" - -mkdir -p "$pkgresources/Dutch.lprj" -mkdir -p "$pkgresources/English.lprj" -mkdir -p "$pkgresources/French.lprj" -mkdir -p "$pkgresources/German.lprj" -mkdir -p "$pkgresources/Italian.lprj" -mkdir -p "$pkgresources/Spanish.lprj" -mkdir -p "$pkgresources/fi.lprj" -mkdir -p "$pkgresources/no.lprj" -mkdir -p "$pkgresources/sv.lprj" + + +# utility +#---------------------------------------------------------- + +if [ $verbose_mode ] ; then + cp_cmd="/bin/cp -v" + ln_cmd="/bin/ln -sv" + rsync_cmd="/usr/bin/rsync -av" +else + cp_cmd="/bin/cp" + ln_cmd="/bin/ln -s" + rsync_cmd="/usr/bin/rsync -a" +fi + # Build and add the launcher #---------------------------------------------------------- -( - # Build fails if CC happens to be set (to anything other than CompileC) - unset CC - - cd "$resdir/ScriptExec" - echo -e "\033[1mBuilding launcher...\033[0m\n" - xcodebuild $XCODEFLAGS clean build -) -cp "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Inkscape" +case $_backend in + x11) + ( + # Build fails if CC happens to be set (to anything other than CompileC) + unset CC + + cd "$resdir/ScriptExec" + echo -e "\033[1mBuilding launcher...\033[0m\n" + xcodebuild $XCODEFLAGS clean build + ) + $cp_cmd "$resdir/$SCRIPTEXECDIR/ScriptExec" "$pkgexec/Inkscape" + ;; + quartz) + $cp_cmd "$resdir/ScriptExec/launcher-quartz-no-macintegration.sh" "$pkgexec/inkscape" + ;; + *) + exit 1 +esac # Copy all files into the bundle @@ -257,99 +401,273 @@ binary_name=`basename "$binary"` binary_dir=`dirname "$binary"` # Inkscape's binary -binpath="$pkgbin/inkscape-bin" -cp -v "$binary" "$binpath" +if [ $_backend = "x11" ]; then + scrpath="$pkgbin/inkscape" + binpath="$pkgbin/inkscape-bin" +else + scrpath="$pkgexec/inkscape" + binpath="$pkgexec/inkscape-bin" +fi +$cp_cmd "$binary" "$binpath" # TODO Add a "$verbose" variable and command line switch, which sets wether these commands are verbose or not +# Info.plist +$cp_cmd "$plist" "$package/Contents/Info.plist" +if [ $_backend = "quartz" ]; then + /usr/libexec/PlistBuddy -x -c "Set :CGDisableCoalescedUpdates 1" "${package}/Contents/Info.plist" +fi + # Share files -rsync -av "$binary_dir/../share/$binary_name"/* "$pkgresources/" -cp "$plist" "$package/Contents/Info.plist" -rsync -av "$binary_dir/../share/locale"/* "$pkgresources/locale" +$rsync_cmd "$binary_dir/../share/$binary_name"/* "$pkgshare/$binary_name" +$rsync_cmd "$binary_dir/../share/locale"/* "$pkglocale" # Copy GTK shared mime information mkdir -p "$pkgresources/share" -cp -rp "$LIBPREFIX/share/mime" "$pkgresources/share/" +$cp_cmd -rp "$LIBPREFIX/share/mime" "$pkgshare/" # Copy GTK hicolor icon theme index file mkdir -p "$pkgresources/share/icons/hicolor" -cp "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" +$cp_cmd "$LIBPREFIX/share/icons/hicolor/index.theme" "$pkgresources/share/icons/hicolor" + +# GTK+ stock icons with legacy icon mapping +echo "Creating GtkStock icon theme ..." +stock_src="${custom_res}/src/icons/stock-icons" \ + ./create-stock-icon-theme.sh "${pkgshare}/icons/GtkStock" +gtk-update-icon-cache --index-only "${pkgshare}/icons/GtkStock" + +# GTK+ themes +$cp_cmd -RP "$LIBPREFIX/share/gtk-engines" "$pkgshare/" +for item in Adwaita Clearlooks HighContrast Industrial Raleigh Redmond ThinIce; do + mkdir -p "$pkgshare/themes/$item" + $cp_cmd -RP "$LIBPREFIX/share/themes/$item/gtk-2.0" "$pkgshare/themes/$item/" +done +if [ $_backend = "quartz" ]; then + for item in Mac; do + $cp_cmd -RP "$LIBPREFIX/share/themes/$item/gtk-2.0"* "$pkgshare/themes/$item/" + done +fi # Icons and the rest of the script framework -rsync -av --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" +$rsync_cmd --exclude ".svn" "$resdir"/Resources/* "$pkgresources/" + +# remove files not needed with GTK+/Quartz +if [ $_backend = "quartz" ]; then + rm "$pkgresources/script" + rm "$pkgresources/openDoc" + rm "$pkgbin/inkscape" +fi -# Update the ImageMagick path in startup script. -IMAGEMAGICKVER=`pkg-config --modversion ImageMagick` -sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" $pkgbin/inkscape +# activate wrapper scripts for python and gimp (optional) +if [ $add_wrapper = "true" ]; then + mv "$pkgbin/gimp-wrapper.sh" "$pkgbin/gimp" + #mv "$pkgbin/python-wrapper.sh" "$pkgbin/python" +fi # Add python modules if requested if [ ${add_python} = "true" ]; then - # copy python site-packages. They need to be organized in a hierarchical set of directories, by architecture and python major+minor version, e.g. i386/2.3/ for Ptyhon 2.3 on Intel; ppc/2.4/ for Python 2.4 on PPC - cp -rvf "$python_dir"/* "$pkgpython" + install_py_modules () + { + # lxml + $cp_cmd -RL "$packages_path/lxml" "$pkgpython" + # numpy + $cp_cmd -RL "$packages_path/nose" "$pkgpython" + $cp_cmd -RL "$packages_path/numpy" "$pkgpython" + # UniConvertor + $cp_cmd -RL "$packages_path/PIL" "$pkgpython" + if [ "$PYTHON_VER" == "2.5" ]; then + $cp_cmd -RL "$packages_path/_imaging.so" "$pkgpython" + $cp_cmd -RL "$packages_path/_imagingcms.so" "$pkgpython" + $cp_cmd -RL "$packages_path/_imagingft.so" "$pkgpython" + $cp_cmd -RL "$packages_path/_imagingmath.so" "$pkgpython" + fi + $cp_cmd -RL "$packages_path/sk1libs" "$pkgpython" + $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython" + #Â PyGTK (Sozi) + $cp_cmd -RL "$packages_path/cairo" "$pkgpython" + $cp_cmd -RL "$packages_path/glib" "$pkgpython" + $cp_cmd -RL "$packages_path/gobject" "$pkgpython" + $cp_cmd -RL "$packages_path/../../../share/pygobject" "$pkgshare" + $cp_cmd -RL "$packages_path/gtk-2.0" "$pkgpython" + $cp_cmd -RL "$packages_path/../../../share/pygtk" "$pkgshare" + $cp_cmd -RL "$packages_path/pygtk.pth" "$pkgpython" + $cp_cmd -RL "$packages_path/pygtk.py" "$pkgpython" + # cleanup python modules + find "$pkgpython" -name *.pyc -print0 | xargs -0 rm -f + find "$pkgpython" -name *.pyo -print0 | xargs -0 rm -f + find "${pkgshare}/pygobject" -name *.pyc -print0 | xargs -0 rm -f + + # TODO: test whether to remove hard-coded paths from *.la files or to exclude them altogether + for la_file in $(find "$pkgpython" -name *.la); do + sed -e "s,libdir=\'.*\',libdir=\'\',g" -i "" "$la_file" + done + } + + if [ $OSXMINORNO -eq "5" ]; then + PYTHON_VERSIONS="2.5 2.6 2.7" + elif [ $OSXMINORNO -eq "6" ]; then + PYTHON_VERSIONS="2.6 2.7" + else # if [ $OSXMINORNO -ge "7" ]; then + PYTHON_VERSIONS="2.7" + fi + if [ -z "$python_dir" ]; then + for PYTHON_VER in $PYTHON_VERSIONS; do + python_dir="$(${LIBPREFIX}/bin/python${PYTHON_VER}-config --prefix)" + packages_path="${python_dir}/lib/python${PYTHON_VER}/site-packages" + pkgpython="${pkglib}/python${PYTHON_VER}/site-packages" + mkdir -p $pkgpython + install_py_modules + done + else + # copy custom python site-packages. + #Â They need to be organized in a hierarchical set of directories by python major+minor version: + # - ${python_dir}/python2.5/site-packages/lxml + # - ${python_dir}/python2.5/site-packages/nose + # - ${python_dir}/python2.5/site-packages/numpy + # - ${python_dir}/python2.6/site-packages/lxml + # - ... + $cp_cmd -rf "$python_dir"/* "$pkglib" + fi fi +sed -e "s,__build_arch__,$_build_arch,g" -i "" "$scrpath" + # PkgInfo must match bundle type and creator code from Info.plist echo "APPLInks" > $package/Contents/PkgInfo # Pull in extra requirements for Pango and GTK -pkgetc="$package/Contents/Resources/etc" mkdir -p $pkgetc/pango -cp $LIBPREFIX/etc/pango/pangox.aliases $pkgetc/pango/ -# Need to adjust path and quote in case of spaces in path. -sed -e "s,$LIBPREFIX,\"\${CWD},g" -e 's,\.so ,.so" ,g' $LIBPREFIX/etc/pango/pango.modules > $pkgetc/pango/pango.modules -cat > $pkgetc/pango/pangorc <<END_PANGO -[Pango] -ModuleFiles=\${HOME}/.inkscape-etc/pango.modules -[PangoX] -AliasFiles=\${HOME}/.inkscape-etc/pangox.aliases -END_PANGO +touch "$pkgetc/pango/pangorc" # We use a modified fonts.conf file so only need the dtd +mkdir -p $pkgshare/xml/fontconfig +$cp_cmd $LIBPREFIX/share/xml/fontconfig/fonts.dtd $pkgshare/xml/fontconfig mkdir -p $pkgetc/fonts -cp $LIBPREFIX/etc/fonts/fonts.dtd $pkgetc/fonts/ -cp -r $LIBPREFIX/etc/fonts/conf.avail $pkgetc/fonts/ -cp -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ - -mkdir -p $pkgetc/gtk-2.0 -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gdk-pixbuf.loaders > $pkgetc/gtk-2.0/gdk-pixbuf.loaders -sed -e "s,$LIBPREFIX,\${CWD},g" $LIBPREFIX/etc/gtk-2.0/gtk.immodules > $pkgetc/gtk-2.0/gtk.immodules - -for item in gnome-vfs-mime-magic gnome-vfs-2.0 -do - cp -r $LIBPREFIX/etc/$item $pkgetc/ -done +$cp_cmd -r $LIBPREFIX/etc/fonts/conf.d $pkgetc/fonts/ +mkdir -p $pkgshare/fontconfig +$cp_cmd -r $LIBPREFIX/share/fontconfig/conf.avail $pkgshare/fontconfig/ +(cd $pkgetc/fonts/conf.d && $ln_cmd ../../../share/fontconfig/conf.avail/10-autohint.conf) +(cd $pkgetc/fonts/conf.d && $ln_cmd ../../../share/fontconfig/conf.avail/70-no-bitmaps.conf) pango_version=`pkg-config --variable=pango_module_version pango` mkdir -p $pkglib/pango/$pango_version/modules -cp $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ +$cp_cmd $LIBPREFIX/lib/pango/$pango_version/modules/*.so $pkglib/pango/$pango_version/modules/ gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` -mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders,printbackends} -cp -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ - -mkdir -p $pkglib/gnome-vfs-2.0/modules -cp $LIBPREFIX/lib/gnome-vfs-2.0/modules/*.so $pkglib/gnome-vfs-2.0/modules/ +mkdir -p $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends} +$cp_cmd -r $LIBPREFIX/lib/gtk-2.0/$gtk_version/* $pkglib/gtk-2.0/$gtk_version/ + +gdk_pixbuf_version=`pkg-config --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0` +mkdir -p $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders +$cp_cmd $LIBPREFIX/lib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gdk_pixbuf_version/loaders/ + +sed -e "s,__gtk_version__,$gtk_version,g" -i "" "$scrpath" +sed -e "s,__gdk_pixbuf_version__,$gdk_pixbuf_version,g" -i "" "$scrpath" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/etc/pango/pango.modules" > "$pkgetc/pango/pango.modules" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/lib/gtk-2.0/$gtk_version/immodules.cache" > "$pkglib/gtk-2.0/$gtk_version/immodules.cache" +#sed -e "s,$LIBPREFIX,@loader_path/..,g" "$LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders.cache" > "$pkglib/gdk-pixbuf-2.0/$gtk_version/loaders.cache" + +# recreate loaders and modules caches based on actually included modules + +# Pango modules +pango-querymodules "$pkglib/pango/$pango_version"/modules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkgetc"/pango/pango.modules + +# Gtk immodules +gtk-query-immodules-2.0 "$pkglib/gtk-2.0/$gtk_version"/immodules/*.so \ + | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ + > "$pkglib/gtk-2.0/$gtk_version/"immodules.cache + +# Gdk pixbuf loaders +GDK_PIXBUF_MODULEDIR="$pkglib/gdk-pixbuf-2.0/$gtk_version/"loaders gdk-pixbuf-query-loaders \ + | sed -e "s,$pkgresources,@loader_path/..,g" > "$pkglib/gdk-pixbuf-2.0/$gtk_version/"loaders.cache + +# GIO modules +#gio-querymodules "$pkglib/gio/modules" + +# Gnome-vfs modules (deprecated, optional in inkscape) +if [ $WITH_GNOME_VFS ] ; then + for item in gnome-vfs-mime-magic gnome-vfs-2.0; do + $cp_cmd -r "$LIBPREFIX/etc/$item" "$pkgetc/" + done + for item in modules; do + mkdir -p "$pkglib/gnome-vfs-2.0/$item" + $cp_cmd "$LIBPREFIX/lib/gnome-vfs-2.0/$item"/*.so "$pkglib/gnome-vfs-2.0/$item/" + done +fi -mkdir -p $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders -cp $LIBPREFIX/lib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/ +# ImageMagick version +IMAGEMAGICKVER="$(pkg-config --modversion ImageMagick)" +IMAGEMAGICKVER_MAJOR="$(cut -d. -f1 <<< "$IMAGEMAGICKVER")" -cp -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" -cp -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER" "$pkgresources/share/" +# ImageMagick data +# include *.la files for main libs too +for item in "$LIBPREFIX/lib/libMagick"*.la; do + $cp_cmd "$item" "$pkglib/" +done +# ImageMagick modules +$cp_cmd -r "$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER" "$pkglib/" +$cp_cmd -r "$LIBPREFIX/etc/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgetc/" +$cp_cmd -r "$LIBPREFIX/share/ImageMagick-$IMAGEMAGICKVER_MAJOR" "$pkgshare/" +# REQUIRED: remove hard-coded paths from *.la files +for la_file in "$pkglib/libMagick"*.la; do + sed -e "s,$LIBPREFIX/lib,,g" -i "" "$la_file" +done +for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders"/*.la; do + sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders,,g" -i "" "$la_file" +done +for la_file in "$pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters"/*.la; do + sed -e "s,$LIBPREFIX/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters,,g" -i "" "$la_file" +done +sed -e "s,IMAGEMAGICKVER,$IMAGEMAGICKVER,g" -i "" "$scrpath" +sed -e "s,IMAGEMAGICKVER_MAJOR,$IMAGEMAGICKVER_MAJOR,g" -i "" "$scrpath" # Copy aspell dictionary files: -cp -r "$LIBPREFIX/lib/aspell-0.60" "$pkglib/" -cp -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" +$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgresources/share/" -# Find out libs we need from fink, darwinports, or from a custom install +# Copy Poppler data: +$cp_cmd -r "$LIBPREFIX/share/poppler" "$pkgshare" + +#Â GLib2 schemas +mkdir -p "$pkgshare/glib-2.0" +$cp_cmd -RP "$LIBPREFIX/share/glib-2.0/schemas" "$pkgshare/glib-2.0/" + +# Copy all linked libraries into the bundle +#---------------------------------------------------------- +# get list of *.so modules from python modules +python_libs="" +for PYTHON_VER in "2.5" "2.6" "2.7"; do + python_libs="$python_libs $(find "${pkglib}/python${PYTHON_VER}" -name *.so -or -name *.dylib)" +done +[ $verbose_mode ] && echo "Python libs: $python_libs" + +# get list of included binary executables +extra_bin=$(find $pkgbin -exec file {} \; | grep executable | grep -v text | cut -d: -f1) +[ $verbose_mode ] && echo "Extra binaries: $extra_bin" + +# Find out libs we need from MacPorts, Fink, or from a custom install # (i.e. $LIBPREFIX), then loop until no changes. a=1 nfiles=0 endl=true while $endl; do echo -e "\033[1mLooking for dependencies.\033[0m Round" $a - libs="`otool -L $pkglib/gtk-2.0/$gtk_version/{engines,immodules,loaders,printbackends}/*.{dylib,so} $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/* $pkglib/pango/$pango_version/modules/* $pkglib/gnome-vfs-2.0/modules/* $package/Contents/Resources/lib/* $pkglib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/{filters,coders}/*.so $binary 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq`" - cp -f $libs $package/Contents/Resources/lib + libs="$(otool -L \ + $pkglib/gtk-2.0/$gtk_version/{engines,immodules,printbackends}/*.{dylib,so} \ + $pkglib/gdk-pixbuf-2.0/$gtk_version/loaders/*.so \ + $pkglib/pango/$pango_version/modules/*.so \ + $pkglib/gnome-vfs-2.0/modules/*.so \ + $pkglib/gio/modules/*.so \ + $pkglib/ImageMagick-$IMAGEMAGICK_VER/modules-Q16/{filters,coders}/*.so \ + $pkglib/*.{dylib,so} \ + $pkgbin/*.so \ + $python_libs \ + $extra_bin \ + $binpath \ + 2>/dev/null | fgrep compatibility | cut -d\( -f1 | grep $LIBPREFIX | sort | uniq)" + $cp_cmd -f $libs "$pkglib" let "a+=1" - nnfiles=`ls $package/Contents/Resources/lib | wc -l` + nnfiles="$(ls "$pkglib" | wc -l)" if [ $nnfiles = $nfiles ]; then endl=false else @@ -357,143 +675,108 @@ while $endl; do fi done -# Add extra libraries of necessary -for libfile in $EXTRALIBS -do - cp -f $libfile $package/Contents/Resources/lib -done - # Some libraries don't seem to have write permission, fix this. -chmod -R u+w $package/Contents/Resources/lib +chmod -R u+w "$package/Contents/Resources/lib" # Strip libraries and executables if requested #---------------------------------------------------------- -if [ "$strip" = "true" ]; then - echo -e "\n\033[1mStripping debugging symbols...\033[0m\n" - chmod +w "$pkglib"/*.dylib - strip -x "$pkglib"/*.dylib - strip -ur "$binpath" +if [ "$strip_build" = "true" ]; then + echo -e "\n\033[1mStripping debugging symbols...\033[0m\n" + chmod +w "$pkglib"/*.dylib + strip -x "$pkglib"/*.dylib + strip -ur "$binpath" fi -# NOTE: This works for all the dylibs but causes GTK to crash at startup. -# Instead we leave them with their original install_names and set -# DYLD_LIBRARY_PATH within the app bundle before running Inkscape. -# +# Rewrite id and paths of linked libraries +#---------------------------------------------------------- +# extract level for relative path to libs +echo -e "\n\033[1mRewriting library paths ...\033[0m\n" + +LIBPREFIX_levels="$(echo "$LIBPREFIX"|awk -F/ '{print NF+1}')" + fixlib () { - libPath="`echo $2 | sed 's/.*Resources//'`" - pkgPath="`echo $2 | sed 's/Resources\/.*/Resources/'`" - # Fix a given executable or library to be relocatable if [ ! -d "$1" ]; then - libs="`otool -L $1 | fgrep compatibility | cut -d\( -f1`" - for lib in $libs; do - echo " $lib" - base=`echo $lib | awk -F/ '{print $NF}'` - first=`echo $lib | cut -d/ -f1-3` - relative=`echo $lib | cut -d/ -f4-` - to=@executable_path/../$relative - if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /System/Library ]; then - /usr/bin/install_name_tool -change $lib $to $1 - if [ "`echo $lib | fgrep libcrypto`" = "" ]; then - /usr/bin/install_name_tool -id $to $1 - for ll in $libs; do - base=`echo $ll | awk -F/ '{print $NF}'` - first=`echo $ll | cut -d/ -f1-3` - relative=`echo $ll | cut -d/ -f4-` - to=@executable_path/../$relative - if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /System/Library -a "`echo $ll | fgrep libcrypto`" = "" ]; then - /usr/bin/install_name_tool -change $ll $to $pkgPath/$relative - fi - done - fi + fileLibs="$(otool -L $1 | fgrep compatibility | cut -d\( -f1)" + filePath="$(echo "$2" | sed 's/.*Resources//')" + fileType="$3" + unset to_id + case $fileType in + lib) + # TODO: verfiy correct/expected install name for relocated libs + to_id="$package/Contents/Resources$filePath/$1" + loader_to_res="$(echo $filePath | $awk_cmd -F/ '{for (i=1;i<NF;i++) sub($i,".."); sub($NF,"",$0); print $0}')" + ;; + bin) + loader_to_res="../" + ;; + exec) + loader_to_res="../Resources/" + ;; + *) + echo "Skipping loader_to_res for $1" + ;; + esac + [ $verbose_mode ] && echo "basename: $1" + [ $verbose_mode ] && echo "dirname: $2" + [ $verbose_mode ] && echo "filePath: $filePath" + [ $verbose_mode ] && echo "to_id: $to_id" + [ $verbose_mode ] && echo "loader_to_res: $loader_to_res" + [ $to_id ] && install_name_tool -id "$to_id" "$1" + for lib in $fileLibs; do + first="$(echo $lib | cut -d/ -f1-3)" + if [ $first != /usr/lib -a $first != /usr/X11 -a $first != /opt/X11 -a $first != /System/Library ]; then + lib_prefix_levels="$(echo $lib | $awk_cmd -F/ '{for (i=NF;i>0;i--) if($i=="lib") j=i; print j}')" + res_to_lib="$(echo $lib | cut -d/ -f$lib_prefix_levels-)" + unset to_path + case $fileType in + lib) + to_path="@loader_path/$loader_to_res$res_to_lib" + ;; + bin) + to_path="@executable_path/$loader_to_res$res_to_lib" + ;; + exec) + to_path="@executable_path/$loader_to_res$res_to_lib" + ;; + *) + echo "Skipping to_path for $lib in $1" + ;; + esac + [ $verbose_mode ] && echo "lib: $lib" + [ $verbose_mode ] && echo "lib_prefix_levels: $lib_prefix_levels" + [ $verbose_mode ] && echo "res_to_lib: $res_to_lib" + [ $verbose_mode ] && echo "to_path: $to_path" + [ $verbose_mode ] && echo "install_name_tool arguments: -change $lib $to_path $1" + [ $to_path ] && install_name_tool -change "$lib" "$to_path" "$1" fi done fi } rewritelibpaths () { - # - # Fix package deps - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/loaders" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/engines" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/immodules" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gtk-2.0/$gtk_version/printbackends" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gnome-vfs-2.0/modules" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/gdk-pixbuf-2.0/$gtk_version/loaders" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/pango/$pango_version/modules" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/filters" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/lib/ImageMagick-$IMAGEMAGICKVER/modules-Q16/coders" - for file in *.so; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" - done - ) - (cd "$package/Contents/Resources/bin" - for file in *; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" + if [ $_backend = "quartz" ]; then + echo -n "Rewriting dylib paths for executable ... " + (cd "$pkgexec"; fixlib "inkscape-bin" "$package/Contents/Resources/../MacOS" "exec") + echo "done" + fi + echo "Rewriting dylib paths for included binaries:" + for file in $extra_bin; do + echo -n "Rewriting dylib paths for $file ... " + (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "bin") + echo "done" done - cd ../lib - for file in *.dylib; do - echo "Rewriting dylib paths for $file..." - fixlib "$file" "`pwd`" + echo "Rewriting dylib paths for included libraries:" + for file in $(find $package \( -name '*.so' -or -name '*.dylib' \) -and -not -ipath '*.dSYM*'); do + echo -n "Rewriting dylib paths for $file ... " + (cd "$(dirname $file)" ; fixlib "$(basename $file)" "$(dirname $file)" "lib") + echo "done" done - ) } -PATHLENGTH=`echo $LIBPREFIX | wc -c` -if [ "$PATHLENGTH" -ge "50" ]; then - # If the LIBPREFIX path is long enough to allow - # path rewriting, then do this. - rewritelibpaths -else - echo "Could not rewrite dylb paths for bundled libraries. This requires" >&2 - echo "Macports to be installed in a PREFIX of at least 50 characters in length." >&2 - echo "" >&2 - echo "The package will still work if the following line is uncommented in" >&2 - echo "Inkscape.app/Contents/Resources/bin/inkscape:" >&2 - echo ' export DYLD_LIBRARY_PATH="$TOP/lib"' >&2 - exit 1 +rewritelibpaths -fi +# All done. +#---------------------------------------------------------- +echo "Inkscape.app created successfully." exit 0 diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh index 5281e70c6..3d5e5b1de 100755 --- a/packaging/macosx/osx-build.sh +++ b/packaging/macosx/osx-build.sh @@ -6,13 +6,15 @@ # http://wiki.inkscape.org/wiki/index.php?title=CompilingMacOsX # for more complete information # -# Author: +# Authors: # Jean-Olivier Irisson <jo.irisson@gmail.com> +# Liam P. White <inkscapebrony@gmail.com> +# ~suv <suv-sf@users.sourceforge.net> # with information from # Kees Cook # Michael Wybrow # -# Copyright (C) 2006-2010 +# Copyright (C) 2006-2014 # Released under GNU GPL, read the file 'COPYING' for more information # @@ -21,11 +23,11 @@ # User modifiable parameters #---------------------------------------------------------- # Configure flags -CONFFLAGS="--disable-openmp --enable-osxapp" +CONFFLAGS="--enable-osxapp" # Libraries prefix (Warning: NO trailing slash) -LIBPREFIX="/opt/local" -# User name on Modevia -MODEVIA_NAME="" +if [ -z "$LIBPREFIX" ]; then + LIBPREFIX="/opt/local-x11" +fi ############################################################ @@ -59,40 +61,39 @@ Compilation script for Inkscape on Mac OS X. install the build products locally, inside the source directory (run make install) \033[1mp,pack,package\033[0m - package Inkscape in a double clickable .app bundle + package Inkscape in a double clickable .app bundle \033[1m-s,--strip\033[0m remove debugging information in Inkscape package + \033[1m-v,--verbose\033[0m verbose mode \033[1m-py,--with-python\033[0m specify python modules path for inclusion into the app bundle \033[1md,dist,distrib\033[0m store Inkscape.app in a disk image (dmg) for distribution - \033[1mf,fat,universal\033[0m - compile inkscape as a universal binary as both i386 and ppc architectures - \033[1mput,upload\033[0m - upload the dmg and the associate info file on Modevia server - \033[1mall\033[0m - do everything (update, configure, build, install, package, distribute) + \033[1minfo\033[0m + create info file for current build \033[1mEXAMPLES\033[0m \033[1m$0 conf build install\033[0m configure, build and install a dowloaded version of Inkscape in the default - directory, keeping debugging information. - \033[1m$0 u a c b -p ~ i -s -py ~/site-packages/ p d\033[0m + directory, keeping debugging information. + \033[1m$0 u a c b -p ~ i -s -py ~/python_modules/ p d\033[0m update an bzr checkout, prepare configure script, configure, - build and install Inkscape in the user home directory (~). + build and install Inkscape in the user home directory (~). Then package Inkscape without debugging information, - with python packages from ~/site-packages/ and prepare + with python packages from ~/python_modules/ and prepare a dmg for distribution." } # Parameters #---------------------------------------------------------- # Paths -HERE=`pwd` -SRCROOT=$HERE/../.. # we are currently in packaging/macosx +HERE="$(pwd)" +SRCROOT="$(cd ../.. && pwd)" # we are currently in packaging/macosx # Defaults -if [ "$INSTALLPREFIX" = "" ] -then - INSTALLPREFIX=$SRCROOT/Build/ +if [ -z "$BUILDPREFIX" ]; then + BUILDPREFIX="$SRCROOT/build-osxapp/" +fi +if [ -z "$INSTALLPREFIX" ]; then + INSTALLPREFIX="$SRCROOT/inst-osxapp/" fi BZRUPDATE="f" AUTOGEN="f" @@ -102,10 +103,10 @@ NJOBS=1 INSTALL="f" PACKAGE="f" DISTRIB="f" -UPLOAD="f" -UNIVERSAL="f" +BUILD_INFO="f" STRIP="" +VERBOSE="" PYTHON_MODULES="" # Parse command line options @@ -114,12 +115,12 @@ while [ "$1" != "" ] do case $1 in h|help) - help + help exit 1 ;; - all) + all) BZRUPDATE="t" CONFIGURE="t" - BUILD="t" + BUILD="t" INSTALL="t" PACKAGE="t" DISTRIB="t" ;; @@ -129,8 +130,6 @@ do AUTOGEN="t" ;; c|conf|configure) CONFIGURE="t" ;; - -u|--universal) - UNIVERSAL="t" ;; b|build) BUILD="t" ;; -j|--jobs) @@ -142,24 +141,54 @@ do PACKAGE="t" ;; d|dist|distrib) DISTRIB="t" ;; - put|upload) - UPLOAD="t" ;; -p|--prefix) - INSTALLPREFIX=$2 - shift 1 ;; + INSTALLPREFIX=$2 + shift 1 ;; -s|--strip) - STRIP="-s" ;; + STRIP="-s" ;; -py|--with-python) PYTHON_MODULES="$2" shift 1 ;; + -v|--verbose) + VERBOSE="-v" ;; + info) + BUILD_INFO="t" ;; *) - echo "Invalid command line option: $1" + echo "Invalid command line option: $1" exit 2 ;; esac shift 1 done -OSXMINORVER=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2 | cut -f1-2 -d.` +# Checks +# ---------------------------------------------------------- +# OS X version +OSXVERSION="$(/usr/bin/sw_vers | grep ProductVersion | cut -f2)" +OSXMINORVER="$(cut -d. -f 1,2 <<< $OSXVERSION)" +OSXMINORNO="$(cut -d. -f2 <<< $OSXVERSION)" +OSXPOINTNO="$(cut -d. -f3 <<< $OSXVERSION)" +ARCH="$(uname -a | awk '{print $NF;}')" + +# MacPorts for dependencies +[[ -x $LIBPREFIX/bin/port && -d $LIBPREFIX/etc/macports ]] && use_port="t" + +# guess default build_arch (MacPorts) +if [ "$OSXMINORNO" -ge "6" ]; then + if [ "$(sysctl -n hw.cpu64bit_capable 2>/dev/null)" = "1" ]; then + _build_arch="x86_64" + else + _build_arch="i386" + fi +else + if [ $ARCH = "powerpc" ]; then + _build_arch="ppc" + else + _build_arch="i386" + fi +fi + +# GTK+ backend +gtk_target="$(pkg-config --variable=target gtk+-2.0 2>/dev/null)" # Set environment variables # ---------------------------------------------------------- @@ -169,31 +198,232 @@ export LIBPREFIX # automake seach path export CPATH="$LIBPREFIX/include" # configure search path -export CPPFLAGS="-I$LIBPREFIX/include" -# export CPPFLAGS="-I$LIBPREFIX/include -I /System/Library/Frameworks/Carbon.framework/Versions/Current/Headers" -export LDFLAGS="-L$LIBPREFIX/lib" +export CPPFLAGS="$CPPFLAGS -I$LIBPREFIX/include" +export LDFLAGS="$LDFLAGS -L$LIBPREFIX/lib" # compiler arguments -export CFLAGS="-O3 -Wall" -export CXXFLAGS="$CFLAGS" - -if [[ "$UNIVERSAL" == "t" ]] -then - MINOSXVER="$OSXMINORVER" - - export SDK=/Developer/SDKs/MacOSX${MINOSXVER}.sdk - - export CFLAGS="$CFLAGS -isysroot $SDK -arch ppc -arch i386" +export CFLAGS="$CFLAGS -Os" + +# Use system compiler and compiler flags which are known to work: +if [ "$OSXMINORNO" -le "4" ]; then + echo "Note: Inkscape packaging requires Mac OS X 10.5 Leopard or later." + exit 1 +elif [ "$OSXMINORNO" -eq "5" ]; then + ## Apple's GCC 4.2.1 on Leopard + TARGETNAME="LEOPARD" + TARGETVERSION="10.5" + export CC="/usr/bin/gcc-4.2" + export CXX="/usr/bin/g++-4.2" + #export CLAGS="$CFLAGS -arch $_build_arch" export CXXFLAGS="$CFLAGS" - - export CONFFLAGS="$CONFFLAGS --disable-dependency-tracking" + CONFFLAGS="--disable-openmp $CONFFLAGS" +elif [ "$OSXMINORNO" -eq "6" ]; then + ## Apple's LLVM-GCC 4.2.1 on Snow Leopard + TARGETNAME="SNOW LEOPARD" + TARGETVERSION="10.6" + export CC="/usr/bin/llvm-gcc-4.2" + export CXX="/usr/bin/llvm-g++-4.2" + #export CLAGS="$CFLAGS -arch $_build_arch" + export CXXFLAGS="$CFLAGS" + CONFFLAGS="--disable-openmp $CONFFLAGS" +elif [ "$OSXMINORNO" -eq "7" ]; then + ## Apple's clang on Lion and later + TARGETNAME="LION" + TARGETVERSION="10.7" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + #export CLAGS="$CFLAGS -arch $_build_arch" + export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align" #-stdlib=libstdc++ -std=c++11 +elif [ "$OSXMINORNO" -eq "8" ]; then + ## Apple's clang on Mountain Lion + TARGETNAME="MOUNTAIN LION" + TARGETVERSION="10.8" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + #export CLAGS="$CFLAGS -arch $_build_arch" + export CXXFLAGS="$CFLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libstdc++" +elif [ "$OSXMINORNO" -eq "9" ]; then + ## Apple's clang on Mavericks + TARGETNAME="MAVERICKS" + TARGETVERSION="10.9" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + #export CLAGS="$CFLAGS -arch $_build_arch" + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" +elif [ "$OSXMINORNO" -eq "10" ]; then + ## Apple's clang on Yosemite + TARGETNAME="YOSEMITE" + TARGETVERSION="10.10" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + #export CLAGS="$CFLAGS -arch $_build_arch" + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" + echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION" + echo " Inkscape packaging has not been tested on ${TARGETNAME}." +else # if [ "$OSXMINORNO" -ge "11" ]; then + ## Apple's clang after Yosemite? + TARGETNAME="UNKNOWN" + TARGETVERSION="10.XX" + export CC="/usr/bin/clang" + export CXX="/usr/bin/clang++" + #export CLAGS="$CFLAGS -arch $_build_arch" + export CXXFLAGS="$CLAGS -Wno-mismatched-tags -Wno-cast-align -std=c++11 -stdlib=libc++" + echo "Note: Detected version of OS X: $TARGETNAME $OSXVERSION" + echo " Inkscape packaging has not been tested on this unknown version of OS X (${OSXVERSION})." fi +# Utility functions +# ---------------------------------------------------------- +getinkscapeinfo () { + + osxapp_domain="$BUILDPREFIX/Info" + INKVERSION="$(defaults read $osxapp_domain CFBundleVersion)" + [ $? -ne 0 ] && INKVERSION="devel" + REVISION="$(bzr revno 2>/dev/null)" + [ $? -ne 0 ] && REVISION="" || REVISION="-r$REVISION" + + TARGETARCH="$_build_arch" + NEWNAME="Inkscape-$INKVERSION$REVISION-$gtk_target-$TARGETVERSION-$TARGETARCH" + DMGFILE="$NEWNAME.dmg" + INFOFILE="$NEWNAME-info.txt" + +} + +checkversion () { + DEPVER="$(pkg-config --modversion $1 2>/dev/null)" + if [[ "$?" == "1" ]]; then + [[ $2 ]] && DEPVER="$(checkversion-port $2)" || unset DEPVER + fi + if [[ ! -z "$DEPVER" ]]; then + [[ $2 ]] && DEPVER="${DEPVER}$(checklicense-port $2)" + else + DEPVER="---" + fi + echo "$DEPVER" +} + +checkversion-port () { + if [[ "$use_port" == "t" ]]; then + PORTVER="$(port echo $1 and active 2>/dev/null | cut -d@ -f2 | cut -d_ -f1)" + else + PORTVER="" + fi + echo "$PORTVER" +} + +checklicense-port() { + if [[ "$use_port" == "t" ]]; then + PORTLIC="$(port info --license --line $1 2>/dev/null)" + PORTURL="$(port info --homepage --line $1 2>/dev/null)" + if [[ -z "$PORTLIC" ]]; then + PORTLIC="Unknown" + fi + _spacer="\t\t" + PORTLIC="$(echo -ne "${_spacer}(License: ${PORTLIC}, Homepage: ${PORTURL})")" + else + PORTLIC="Unknown license" + fi + echo "$PORTLIC" +} + +checkversion-py-module () { + # python -c "import foo; ..." + echo "TODO." +} + +buildinfofile () { + getinkscapeinfo + # Prepare information file + echo "Build information on $(date) for $(whoami): + For OS X Ver $TARGETNAME ($TARGETVERSION) + Architecture $TARGETARCH +Build system information: + OS X Version $OSXVERSION + Architecture $_build_arch + MacPorts Ver $(port version 2>/dev/null | cut -f2 -d \ ) + Compiler $($CXX --version | head -1) + GTK+ backend $gtk_target +Included dependency versions (build or runtime): + Glib $(checkversion glib-2.0 glib2) + Glibmm $(checkversion glibmm-2.4 glibmm) + GTK $(checkversion gtk+-2.0 gtk2) + GTKmm $(checkversion gtkmm-2.4 gtkmm) + GdkPixbuf $(checkversion gdk-pixbuf-2.0 gdk-pixbuf2) + Pixman $(checkversion pixman-1 libpixman) + Cairo $(checkversion cairo cairo) + Cairomm $(checkversion cairomm-1.0 cairomm) + CairoPDF $(checkversion cairo-pdf cairo) + Poppler $(checkversion poppler-cairo poppler) + Fontconfig $(checkversion fontconfig fontconfig) + Freetype $(checkversion freetype2 freetype) + Pango $(checkversion pango pango) + Pangoft2 $(checkversion pangoft2 pango) + Harfbuzz $(checkversion harfbuzz harfbuzz) + LibXML2 $(checkversion libxml-2.0 libxml2) + LibXSLT $(checkversion libxslt libxslt) + LibSigC++ $(checkversion sigc++-2.0 libsigcxx2) + Boost $(checkversion boost boost) + Boehm GC $(checkversion bdw-gc boehmgc) + GSL $(checkversion gsl gsl) + LibPNG $(checkversion libpng libpng) + Librsvg $(checkversion librsvg-2.0 librsvg) + LittleCMS $(checkversion lcms lcms) + LittleCMS2 $(checkversion lcms2 lcms2) + GnomeVFS $(checkversion gnome-vfs-2.0 gnome-vfs) + DBus $(checkversion dbus-1 dbus) + Gvfs $(checkversion gvfs gvfs) + ImageMagick $(checkversion ImageMagick ImageMagick) + Libexif $(checkversion libexif libexif) + JPEG $(checkversion jpeg jpeg) + Icu $(checkversion icu-uc icu) + LibWPD $(checkversion libwpd-0.9 libwpd) + LibWPG $(checkversion libwpg-0.2 libwpg) + Libcdr $(checkversion libcdr-0.0 libcdr) + Libvisio $(checkversion libvisio-0.0 libvisio) +Included python modules: + lxml $(checkversion py27-lxml py27-lxml) + numpy $(checkversion py27-numpy py27-numpy) + sk1libs $(checkversion py27-sk1libs py27-sk1libs) + UniConvertor $(checkversion py27-uniconvertor py27-uniconvertor) + Pillow $(checkversion py27-Pillow py27-Pillow) +" > $INFOFILE + + ## TODO: Pending merge adds support for: + #LibRevenge $(checkversion librevenge-0.0 librevenge-devel) + #LibWPD $(checkversion libwpd-0.10 libwpd-10.0) + #LibWPG $(checkversion libwpg-0.3 libwpg-0.3) + #Libcdr $(checkversion libcdr-0.1 libcdr-0.1) + #Libvisio $(checkversion libvisio-0.1 libvisio-0.1) + + ## TODO: add support for gtk-mac-integration (see osxmenu branch) + #Gtk-mac-integration $(checkversion gtk-mac-integration gtk-osx-application) + + ## TODO: how to realiably add details specific to config and build + #if [[ ! -z "$ALLCONFFLAGS" ]]; then + # echo "Configure options: + # $ALLCONFFLAGS" >> $INFOFILE + #fi + #if [[ "$STRIP" == "-s" ]]; then + # echo "Debug info: + # no" >> $INFOFILE + #else + # echo "Debug info: + # yes" >> $INFOFILE + #fi +} + # Actions # ---------------------------------------------------------- if [[ "$BZRUPDATE" == "t" ]] then cd $SRCROOT - bzr pull + if [ -z "$(bzr info | grep "checkout")" ]; then + echo "repo is unbound (branch)" >&2 + bzr pull + else + echo "repo is bound (checkout)" >&2 + echo '... please update bound branch manually.' >&2 + false + fi status=$? if [[ $status -ne 0 ]]; then echo -e "\nBZR update failed" @@ -202,56 +432,9 @@ then cd $HERE fi -# Fetch some information -REVISION=`bzr version-info 2>/dev/null | grep revno | cut -d' ' -f2` -ARCH=`arch | tr [p,c] [P,C]` -OSXVERSION=`/usr/bin/sw_vers | grep ProductVersion | cut -d' ' -f2` - -if [[ "$OSXMINORVER" == "10.3" ]]; then - TARGETNAME="PANTHER" - TARGETVERSION="10.3" -elif [[ "$OSXMINORVER" == "10.4" ]]; then - TARGETNAME="TIGER" - TARGETVERSION="10.4" -elif [[ "$OSXMINORVER" == "10.5" ]]; then - TARGETNAME="LEOPARD+" - TARGETVERSION="10.5+" -fi - -TARGETARCH="$ARCH" -if [[ "$UNIVERSAL" == "t" ]]; then - TARGETARCH="UNIVERSAL" -fi - -NEWNAME="Inkscape-r$REVISION-$TARGETVERSION-$TARGETARCH" -DMGFILE="$NEWNAME.dmg" -INFOFILE="$NEWNAME-info.txt" - - -if [[ "$UPLOAD" == "t" ]] -then - # If we are uploading, we are probably building nightlies and don't - # need to build a new one if the repository hasn't changed since the - # last. Hence, if a dmg for this version already exists, then just - # exit here. - if [[ -f "$DMGFILE" ]]; then - echo -e "\nRepository hasn't changed: $DMGFILE already exists." - exit 0 - fi -fi - if [[ "$AUTOGEN" == "t" ]] then cd $SRCROOT - if [[ "$UNIVERSAL" == "t" ]] - then - # Universal builds have to be built with the option - # --disable-dependency-tracking. So they need to be - # started from scratch each time. - if [[ -f Makefile ]]; then - make distclean - fi - fi export NOCONFIGURE=true && ./autogen.sh status=$? if [[ $status -ne 0 ]]; then @@ -263,14 +446,19 @@ fi if [[ "$CONFIGURE" == "t" ]] then - ALLCONFFLAGS=`echo "$CONFFLAGS --prefix=$INSTALLPREFIX"` + ALLCONFFLAGS="$CONFFLAGS --prefix=$INSTALLPREFIX --enable-localinstall" cd $SRCROOT - if [ ! -f configure ] + if [ ! -d $BUILDPREFIX ] + then + mkdir $BUILDPREFIX || exit 1 + fi + cd $BUILDPREFIX + if [ ! -f $SRCROOT/configure ] then echo "Configure script not found in $SRCROOT. Run '$0 autogen' first" exit 1 fi - ./configure $ALLCONFFLAGS + $SRCROOT/configure $ALLCONFFLAGS status=$? if [[ $status -ne 0 ]]; then echo -e "\nConfigure failed" @@ -281,7 +469,8 @@ fi if [[ "$BUILD" == "t" ]] then - cd $SRCROOT + cd $BUILDPREFIX || exit 1 + touch "$SRCROOT/src/main.cpp" "$SRCROOT/src/ui/dialog/aboutbox.cpp" make -j $NJOBS status=$? if [[ $status -ne 0 ]]; then @@ -291,9 +480,9 @@ then cd $HERE fi -if [[ "$INSTALL" == "t" ]] +if [[ "$INSTALL" == "t" ]] then - cd $SRCROOT + cd $BUILDPREFIX || exit 1 make install status=$? if [[ $status -ne 0 ]]; then @@ -305,19 +494,19 @@ fi if [[ "$PACKAGE" == "t" ]] then - + # Test the existence of required files if [ ! -e $INSTALLPREFIX/bin/inkscape ] then echo "The inkscape executable \"$INSTALLPREFIX/bin/inkscape\" cound not be found." exit 1 fi - if [ ! -e $SRCROOT/Info.plist ] + if [ ! -e $BUILDPREFIX/Info.plist ] then - echo "The file \"$SRCROOT/Info.plist\" could not be found, please re-run configure." + echo "The file \"$BUILDPREFIX/Info.plist\" could not be found, please re-run configure." exit 1 fi - + # Set python command line option (if PYTHON_MODULES location is not empty, then add the python call to the command line, otherwise, stay empty) if [[ "$PYTHON_MODULES" != "" ]]; then PYTHON_MODULES="-py $PYTHON_MODULES" @@ -325,25 +514,20 @@ then fi # Create app bundle - ./osx-app.sh $STRIP -b $INSTALLPREFIX/bin/inkscape -p $SRCROOT/Info.plist $PYTHON_MODULES + ./osx-app.sh $STRIP $VERBOSE -b $INSTALLPREFIX/bin/inkscape -p $BUILDPREFIX/Info.plist $PYTHON_MODULES status=$? if [[ $status -ne 0 ]]; then echo -e "\nApplication bundle creation failed" exit $status fi -fi - -function checkversion { - DEPVER=`pkg-config --modversion $1 2>/dev/null` - if [[ "$?" == "1" ]]; then - DEPVER="Not included" - fi - echo "$DEPVER" -} + # Prepare information file + BUILD_INFO="t" +fi if [[ "$DISTRIB" == "t" ]] then + getinkscapeinfo # Create dmg bundle ./osx-dmg.sh -p "Inkscape.app" status=$? @@ -353,61 +537,18 @@ then fi mv Inkscape.dmg $DMGFILE - + # Prepare information file - echo "Build information on `date` for `whoami`: - For OS X Ver $TARGETNAME ($TARGETVERSION) - Architecture $TARGETARCH -Build system information: - OS X Version $OSXVERSION - Architecture $ARCH - MacPorts Ver `port version | cut -f2 -d \ ` - GCC `$CXX --version | grep GCC` -Included dependency versions: - GTK `checkversion gtk+-2.0` - GTKmm `checkversion gtkmm-2.4` - Cairo `checkversion cairo` - Cairomm `checkversion cairomm-1.0` - CairoPDF `checkversion cairo-pdf` - Fontconfig `checkversion fontconfig` - Pango `checkversion pango` - LibXML2 `checkversion libxml-2.0` - LibXSLT `checkversion libxslt` - LibSigC++ `checkversion sigc++-2.0` - LibPNG `checkversion libpng` - GSL `checkversion gsl` - ImageMagick `checkversion ImageMagick` - Poppler `checkversion poppler-cairo` - LittleCMS `checkversion lcms` - GnomeVFS `checkversion gnome-vfs-2.0` - LibWPG `checkversion libwpg-0.1` -Configure options: - $CONFFLAGS" > $INFOFILE - if [[ "$STRIP" == "t" ]]; then - echo "Debug info - no" >> $INFOFILE - else - echo "Debug info - yes" >> $INFOFILE - fi + BUILD_INFO="t" fi -if [[ "$UPLOAD" == "t" ]] +if [[ "$BUILD_INFO" == "t" ]] then - # Provide default for user name on modevia - if [[ "$MODEVIA_NAME" == "" ]]; then - MODEVIA_NAME=$USER - fi - # Uploasd file - scp $DMGFILE $INFOFILE "$MODEVIA_NAME"@inkscape.modevia.com:inkscape/docs/macosx-snap/ - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nUpload failed" - exit $status - fi + buildinfofile fi -if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; then +if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; +then # open a Finder window here to admire what we just produced open . fi diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh index f1ce72132..95129b8cb 100755 --- a/packaging/macosx/osx-dmg.sh +++ b/packaging/macosx/osx-dmg.sh @@ -45,7 +45,7 @@ auto_open_opt= #---------------------------------------------------------- help() { -echo " +echo -e " Create a custom dmg file to distribute Inkscape \033[1mUSAGE\033[0m diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile new file mode 100644 index 000000000..9a2bf0cf1 --- /dev/null +++ b/packaging/macosx/ports/devel/inkscape-packaging/Portfile @@ -0,0 +1,124 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: $ + +PortSystem 1.0 + +name inkscape-packaging +version 0.91 +revision 100 + +categories devel graphics +platforms darwin +license GPL-2 +supported_archs noarch + +maintainers users.sf.net:suv-sf + +description Dependencies for Inkscape.app +long_description ${description} + +homepage http://inkscape.org + +# this is a metaport - no fetch, configure and build phases +master_sites +distfiles +use_configure no +build {} +destroot { + # Create a dummy file so the port can be successfully activated + xinstall -d ${destroot}${prefix}/share/doc/${name} + set docfile [open ${destroot}${prefix}/share/doc/${name}/README.txt "w"] + puts $docfile "Inkscape packaging ${version} (meta port for all dependencies)\n" + close $docfile +} + +# build dependencies +depends_build port:bzr \ + port:autoconf \ + port:automake \ + port:pkgconfig \ + port:libtool \ + port:intltool \ + port:perl5 + +# core dependencies +depends_build-append port:popt \ + port:boehmgc \ + port:gsl \ + port:lcms2 \ + port:gtkmm \ + port:boost \ + port:ImageMagick \ + port:gtkspell2 \ + port:aspell-dict-en \ + port:poppler + +# ports for Inkscape.app +depends_build-append port:gnome-icon-theme \ + port:gnome-icon-theme-symbolic \ + port:icon-naming-utils \ + port:gnome-themes-standard \ + port:gtk-engines2 \ + port:gtk2-murrine + +# ports for python extensions +depends_build-append port:py27-lxml \ + port:py27-numpy \ + port:py27-Pillow \ + port:py27-uniconvertor \ + port:py27-pygtk + +if {${os.major} <= 10} { + # ports for python extensions on Snow Leopard and Leopard + depends_build-append port:py26-lxml \ + port:py26-numpy \ + port:py26-Pillow \ + port:py26-uniconvertor +} +if {${os.major} == 9} { + # ports for python extensions build deps on Leopard + depends_build-append port:gawk \ + port:py25-lxml \ + port:py25-numpy \ + port:py25-Pillow \ + port:py25-uniconvertor +} +if {${os.major} < 9} { + # we don't support Tiger anymore + return -code error "Mac OS X <= 10.4 not supported." +} + +# optional features +variant libwpd conflicts librevenge description {use libpwd for WPG, CDR, VSD} { +depends_build-append port:libcdr \ + port:libvisio \ + port:libwpg +} + +variant librevenge conflicts libwpd description {use librevenge for WPG, CDR, VSD} { +depends_build-append port:libcdr-0.1 \ + port:libvisio-0.1 \ + port:libwpg-0.3 +} + +variant gnome_vfs description {with gnome-vfs (deprecated)} { + depends_build-append port:gnome-vfs +} + +variant gvfs description {with gvfs} { + depends_build-append port:gvfs +} + +variant dbus description {with dbus} { + depends_build-append port:dbus \ + port:dbus-glib \ + port:dbus-python27 +} + +# variants +universal_variant no + +default_variants-append +gnome_vfs + +# livecheck +livecheck.type none diff --git a/packaging/macosx/ports/lang/python25/Portfile b/packaging/macosx/ports/lang/python25/Portfile new file mode 100644 index 000000000..a27bdaf64 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/Portfile @@ -0,0 +1,214 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 104926 2013-04-05 04:43:09Z larryv@macports.org $ + +PortSystem 1.0 +PortGroup select 1.0 + +name python25 +version 2.5.6 +revision 100 + +set branch [join [lrange [split ${version} .] 0 1] .] +categories lang +license PSF +platforms darwin +maintainers nomaintainer + +description An interpreted, object-oriented programming language +long_description Python is an interpreted, interactive, object-oriented \ + programming language. + +homepage http://www.python.org/ +master_sites http://ftp.python.org/ftp/python/${version}/ + +distname Python-${version} +use_bzip2 yes + +checksums md5 5d45979c5f30fb2dd5f067c6b06b88e4 \ + sha1 29f6dd41bf09c5e04311b367cbb7604fa016e699 \ + rmd160 92f0a955971f187a7d50c6422168202ec551bf22 + +# patch-Lib-distutils-dist.py.diff comes from +# <http://bugs.python.org/issue1180> +patchfiles patch-Makefile.pre.in.diff \ + patch-Lib-cgi.py.diff \ + patch-Lib-distutils-dist.py.diff \ + patch-setup.py.diff \ + patch-configure.diff \ + patch-64bit.diff \ + patch-setup.py-disabled_modules.diff \ + patch-mac_ver.diff \ + patch-libedit.diff \ + patch-fwrapv.diff + +depends_lib port:gettext port:zlib port:openssl \ + port:sqlite3 port:db46 port:bzip2 \ + port:libedit port:ncurses +depends_run port:python_select + +configure.args --enable-shared \ + --enable-framework=${frameworks_dir} \ + --mandir=${prefix}/share/man \ + --enable-ipv6 \ + --with-cxx=${configure.cxx} + +post-patch { + reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \ + ${worksrcpath}/setup.py + reinplace "s|/Applications/MacPython|${applications_dir}/MacPython|g" \ + ${worksrcpath}/Mac/Makefile.in \ + ${worksrcpath}/Mac/IDLE/Makefile.in \ + ${worksrcpath}/Mac/Tools/Doc/setup.py \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in \ + ${worksrcpath}/Mac/BuildScript/build-installer.py + reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in + reinplace "s|__BUILD_ARCH__|${build_arch}|" ${worksrcpath}/configure + reinplace "s|__UNIVERSAL_CFLAGS__|${configure.universal_cflags}|" ${worksrcpath}/configure + reinplace "s|__UNIVERSAL_LDFLAGS__|${configure.universal_ldflags}|" \ + ${worksrcpath}/configure \ + ${worksrcpath}/Makefile.pre.in + + # http://trac.macports.org/ticket/21517 + system -W ${worksrcpath} "ed - Modules/_localemodule.c < ${filespath}/_localemodule.c.ed" + system -W ${worksrcpath} "ed - Lib/locale.py < ${filespath}/locale.py.ed" +} + +build.target all + +# TODO: From python24, do we still need this? +# Workaround for case-sensitive file systems +post-build { + if { ![file exists ${worksrcpath}/python.exe] } { + ln -s python ${worksrcpath}/python.exe + } +} + +test.run yes +test.target test + +destroot.target frameworkinstall maninstall + +# ensure that correct compiler is used +build.args-append MAKE="${build.cmd}" CC="${configure.cc}" +destroot.args-append MAKE="${destroot.cmd}" CC="${configure.cc}" + +select.group python +select.file ${filespath}/python[string map {. {}} ${branch}] + +notes " +To make python ${branch} the default (i.e. the version you get when you run\ +'python'), please run: + +sudo port select --set ${select.group} [file tail ${select.file}] +" + +platform macosx { +post-destroot { + + set framewpath ${frameworks_dir}/Python.framework + set framewdir ${framewpath}/Versions/${branch} + + # Without this, LINKFORSHARED is set to + # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) + # (this becomes Python.framework/Versions/2.5/Python) which doesn't + # quite work (see ticket #15099); instead specifically list the + # full path to the proper Python framework file (which becomes + # ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/Python) + reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile + + foreach dir { lib include } { + file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir} + ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch} + } + ln -s ${prefix}/share ${destroot}${framewdir}/share + + ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib + + file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1 + + # delete symlinks without version suffix, use python_select instead to choose version + foreach bin { python pythonw idle pydoc smtpd.py python-config } { + file delete ${destroot}${prefix}/bin/${bin} + } + foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] { + file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin + ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin} + } + + foreach dir { Headers Resources Python Versions/Current } { + file delete ${destroot}${framewpath}/${dir} + } + + # Fix incorrectly-pointed libpython2.5.a symlink, see + # http://trac.macports.org/ticket/19906 + set python_staticlink ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a + file delete ${python_staticlink} + ln -s ${framewdir}/Python ${python_staticlink} +} +} + +platform darwin { + post-configure { + # See http://trac.macports.org/ticket/18376 + system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed" + } + if {${os.major} >= 10} { + configure.cppflags-append -D_DARWIN_C_SOURCE + patchfiles-append patch-pyconfig.h.in.diff + } + post-patch { + if {![file exists /usr/lib/libSystemStubs.a]} { + reinplace s/-lSystemStubs//g ${worksrcpath}/configure + } + } + post-destroot { + # remove -arch flags from the config + reinplace -E {s|-arch [a-z0-9_]+||g} \ + ${destroot}${prefix}/lib/python${branch}/config/Makefile + } +} + +platform darwin 8 { + patchfiles-append patch-FSIORefNum.diff +} + +platform darwin 9 { + configure.cppflags-append -D__DARWIN_UNIX03 +} + +platform puredarwin { + patchfiles-append patch-Modules-posixmodule.c.diff + configure.args-delete --enable-framework=${frameworks_dir} + configure.args-append --disable-toolbox-glue --disable-framework + destroot.target install maninstall + +post-build { + # thin dynamic library to have the same arch as static lib, even after -lSystemStubs + system "lipo ${worksrcpath}/libpython${branch}.dylib -output ${worksrcpath}/libpython${branch}.dylib -thin `lipo -info ${worksrcpath}/libpython${branch}.a | tail -n 1 | sed -e 's/.*architecture: \\(.*\\)/\\1/'`" +} + +post-destroot { + # delete symlinks without version suffix, use python_select instead to choose version + foreach bin { python pythonw idle pydoc smtpd.py python-config } { + file delete ${destroot}${prefix}/bin/${bin} + } + + file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1 +} +} + +variant universal { + if {${configure.sdkroot} == ""} { + configure.args-append --enable-universalsdk=/ + } else { + configure.args-append --enable-universalsdk=${configure.sdkroot} + } + post-configure { + system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed" + } +} + +livecheck.type regex +livecheck.url ${homepage}download/releases/ +livecheck.regex Python (${branch}.\[0-9\]+) diff --git a/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed b/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed new file mode 100644 index 000000000..d4617a931 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed @@ -0,0 +1,2 @@ +g/defined(__APPLE__)/s//0/g +w diff --git a/packaging/macosx/ports/lang/python25/files/locale.py.ed b/packaging/macosx/ports/lang/python25/files/locale.py.ed new file mode 100644 index 000000000..0bdbf3ea0 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/locale.py.ed @@ -0,0 +1,2 @@ +g/'darwin', /s/// +w diff --git a/packaging/macosx/ports/lang/python25/files/patch-64bit.diff b/packaging/macosx/ports/lang/python25/files/patch-64bit.diff new file mode 100644 index 000000000..100617df6 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-64bit.diff @@ -0,0 +1,1234 @@ +--- Include/pymactoolbox.h.orig 2004-11-05 18:02:59.000000000 +1100 ++++ Include/pymactoolbox.h 2009-09-10 18:08:58.000000000 +1000 +@@ -8,7 +8,9 @@ + #endif + + #include <Carbon/Carbon.h> ++#ifndef __LP64__ + #include <QuickTime/QuickTime.h> ++#endif /* !__LP64__ */ + + /* + ** Helper routines for error codes and such. +@@ -18,8 +20,10 @@ + PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */ + PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */ + PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */ ++#ifndef __LP64__ + extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert + fsspec->path */ ++#endif /* !__LP64__ */ + /* + ** These conversion routines are defined in mactoolboxglue.c itself. + */ +@@ -83,9 +87,10 @@ + #endif /* USE_TOOLBOX_OBJECT_GLUE */ + + /* macfs exports */ ++#ifndef __LP64__ + int PyMac_GetFSSpec(PyObject *, FSSpec *); /* argument parser for FSSpec */ + PyObject *PyMac_BuildFSSpec(FSSpec *); /* Convert FSSpec to PyObject */ +- ++#endif /* !__LP64__ */ + int PyMac_GetFSRef(PyObject *, FSRef *); /* argument parser for FSRef */ + PyObject *PyMac_BuildFSRef(FSRef *); /* Convert FSRef to PyObject */ + +@@ -101,39 +106,54 @@ + extern int CmpInstObj_Convert(PyObject *, ComponentInstance *); + + /* Ctl exports */ ++#ifndef __LP64__ + extern PyObject *CtlObj_New(ControlHandle); + extern int CtlObj_Convert(PyObject *, ControlHandle *); ++#endif /* !__LP64__ */ + + /* Dlg exports */ ++#ifndef __LP64__ + extern PyObject *DlgObj_New(DialogPtr); + extern int DlgObj_Convert(PyObject *, DialogPtr *); + extern PyObject *DlgObj_WhichDialog(DialogPtr); ++#endif /* !__LP64__ */ + + /* Drag exports */ ++#ifndef __LP64__ + extern PyObject *DragObj_New(DragReference); + extern int DragObj_Convert(PyObject *, DragReference *); ++#endif /* !__LP64__ */ + + /* List exports */ ++#ifndef __LP64__ + extern PyObject *ListObj_New(ListHandle); + extern int ListObj_Convert(PyObject *, ListHandle *); ++#endif /* !__LP64__ */ + + /* Menu exports */ ++#ifndef __LP64__ + extern PyObject *MenuObj_New(MenuHandle); + extern int MenuObj_Convert(PyObject *, MenuHandle *); ++#endif /* !__LP64__ */ + + /* Qd exports */ ++#ifndef __LP64__ + extern PyObject *GrafObj_New(GrafPtr); + extern int GrafObj_Convert(PyObject *, GrafPtr *); + extern PyObject *BMObj_New(BitMapPtr); + extern int BMObj_Convert(PyObject *, BitMapPtr *); + extern PyObject *QdRGB_New(RGBColor *); + extern int QdRGB_Convert(PyObject *, RGBColor *); ++#endif /* !__LP64__ */ + + /* Qdoffs exports */ ++#ifndef __LP64__ + extern PyObject *GWorldObj_New(GWorldPtr); + extern int GWorldObj_Convert(PyObject *, GWorldPtr *); ++#endif /* !__LP64__ */ + + /* Qt exports */ ++#ifndef __LP64__ + extern PyObject *TrackObj_New(Track); + extern int TrackObj_Convert(PyObject *, Track *); + extern PyObject *MovieObj_New(Movie); +@@ -146,6 +166,7 @@ + extern int UserDataObj_Convert(PyObject *, UserData *); + extern PyObject *MediaObj_New(Media); + extern int MediaObj_Convert(PyObject *, Media *); ++#endif /* !__LP64__ */ + + /* Res exports */ + extern PyObject *ResObj_New(Handle); +@@ -154,13 +175,17 @@ + extern int OptResObj_Convert(PyObject *, Handle *); + + /* TE exports */ ++#ifndef __LP64__ + extern PyObject *TEObj_New(TEHandle); + extern int TEObj_Convert(PyObject *, TEHandle *); ++#endif /* !__LP64__ */ + + /* Win exports */ ++#ifndef __LP64__ + extern PyObject *WinObj_New(WindowPtr); + extern int WinObj_Convert(PyObject *, WindowPtr *); + extern PyObject *WinObj_WhichWindow(WindowPtr); ++#endif /* !__LP64__ */ + + /* CF exports */ + extern PyObject *CFObj_New(CFTypeRef); +--- Python/mactoolboxglue.c.orig 2006-07-12 02:44:25.000000000 +1000 ++++ Python/mactoolboxglue.c 2009-09-10 19:26:39.000000000 +1000 +@@ -105,7 +105,7 @@ + return PyErr_Mac(PyMac_GetOSErrException(), err); + } + +- ++#ifndef __LP64__ + OSErr + PyMac_GetFullPathname(FSSpec *fss, char *path, int len) + { +@@ -153,6 +153,7 @@ + Py_XDECREF(fs); + return err; + } ++#endif /* !__LP64__ */ + + /* Convert a 4-char string object argument to an OSType value */ + int +@@ -417,6 +418,7 @@ + GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs") + GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs") + ++#ifndef __LP64__ + GLUE_NEW(Track, TrackObj_New, "Carbon.Qt") + GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt") + GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt") +@@ -429,6 +431,7 @@ + GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt") + GLUE_NEW(Media, MediaObj_New, "Carbon.Qt") + GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt") ++#endif /* !__LP64__ */ + + GLUE_NEW(Handle, ResObj_New, "Carbon.Res") + GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res") +--- Modules/_ctypes/libffi/src/darwin/ffitarget.h.orig 2006-05-26 07:58:05.000000000 +1000 ++++ Modules/_ctypes/libffi/src/darwin/ffitarget.h 2009-09-10 20:15:39.000000000 +1000 +@@ -4,7 +4,7 @@ + * created by configure). This makes is possible to build a univeral binary + * of ctypes in one go. + */ +-#if defined(__i386__) ++#if defined(__i386__) || defined(__x86_64__) + + #ifndef X86_DARWIN + #define X86_DARWIN +@@ -13,7 +13,7 @@ + + #include "../src/x86/ffitarget.h" + +-#elif defined(__ppc__) ++#elif defined(__ppc__) || defined(__ppc64__) + + #ifndef POWERPC_DARWIN + #define POWERPC_DARWIN +--- Mac/Modules/res/_Resmodule.c.orig 2005-07-04 06:59:44.000000000 +1000 ++++ Mac/Modules/res/_Resmodule.c 2009-09-10 20:44:43.000000000 +1000 +@@ -414,6 +414,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -431,6 +432,7 @@ + return _res; + + } ++#endif /* !__LP64__ */ + + static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args) + { +@@ -501,10 +503,12 @@ + PyDoc_STR("(long newSize) -> None")}, + {"GetNextFOND", (PyCFunction)ResObj_GetNextFOND, 1, + PyDoc_STR("() -> (Handle _rv)")}, ++#ifndef __LP64__ + {"as_Control", (PyCFunction)ResObj_as_Control, 1, + PyDoc_STR("Return this resource/handle as a Control")}, + {"as_Menu", (PyCFunction)ResObj_as_Menu, 1, + PyDoc_STR("Return this resource/handle as a Menu")}, ++#endif /* !__LP64__ */ + {"LoadResource", (PyCFunction)ResObj_LoadResource, 1, + PyDoc_STR("() -> None")}, + {"AutoDispose", (PyCFunction)ResObj_AutoDispose, 1, +@@ -1152,6 +1156,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -1287,6 +1292,7 @@ + _res = Py_None; + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args) + { +@@ -1327,6 +1333,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -1413,6 +1420,7 @@ + nextRefNum); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args) + { +@@ -1438,6 +1446,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -1534,6 +1543,7 @@ + PyMac_BuildFSSpec, &newSpec); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args) + { +@@ -1637,6 +1647,7 @@ + PyDoc_STR("(short refNum) -> (short _rv)")}, + {"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1, + PyDoc_STR("(short refNum, short attrs) -> None")}, ++#ifndef __LP64__ + {"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1, + PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")}, + {"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1, +@@ -1647,10 +1658,12 @@ + PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")}, + {"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1, + PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")}, ++#endif /* !__LP64__ */ + {"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1, + PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")}, + {"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1, + PyDoc_STR("(SInt16 refNum) -> None")}, ++#ifndef __LP64__ + {"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1, + PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")}, + {"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1, +@@ -1659,14 +1672,17 @@ + PyDoc_STR("() -> (SInt16 refNum)")}, + {"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1, + PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")}, ++#endif /* !__LP64__ */ + {"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1, + PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")}, ++#ifndef __LP64__ + {"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1, + PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")}, + {"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1, + PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")}, + {"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1, + PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")}, ++#endif /* !__LP64__ */ + {"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1, + PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")}, + {"Handle", (PyCFunction)Res_Handle, 1, +--- Mac/Modules/MacOS.c.orig 2006-07-26 05:20:54.000000000 +1000 ++++ Mac/Modules/MacOS.c 2009-09-10 21:47:34.000000000 +1000 +@@ -54,7 +54,7 @@ + do_close(rfobject *self) + { + if (self->isclosed ) return; +- (void)FSClose(self->fRefNum); ++ (void)FSCloseFork(self->fRefNum); + self->isclosed = 1; + } + +@@ -68,6 +68,7 @@ + long n; + PyObject *v; + OSErr err; ++ ByteCount n2; + + if (self->isclosed) { + PyErr_SetString(PyExc_ValueError, "Operation on closed file"); +@@ -81,13 +82,13 @@ + if (v == NULL) + return NULL; + +- err = FSRead(self->fRefNum, &n, PyString_AsString(v)); ++ err = FSReadFork(self->fRefNum, fsAtMark, 0, n, PyString_AsString(v), &n2); + if (err && err != eofErr) { + PyMac_Error(err); + Py_DECREF(v); + return NULL; + } +- _PyString_Resize(&v, n); ++ _PyString_Resize(&v, n2); + return v; + } + +@@ -109,7 +110,7 @@ + } + if (!PyArg_ParseTuple(args, "s#", &buffer, &size)) + return NULL; +- err = FSWrite(self->fRefNum, &size, buffer); ++ err = FSWriteFork(self->fRefNum, fsAtMark, 0, size, buffer, NULL); + if (err) { + PyMac_Error(err); + return NULL; +@@ -126,9 +127,9 @@ + static PyObject * + rf_seek(rfobject *self, PyObject *args) + { +- long amount, pos; ++ long amount; + int whence = SEEK_SET; +- long eof; ++ int mode; + OSErr err; + + if (self->isclosed) { +@@ -138,35 +139,23 @@ + if (!PyArg_ParseTuple(args, "l|i", &amount, &whence)) + return NULL; + +- if ((err = GetEOF(self->fRefNum, &eof))) +- goto ioerr; +- + switch (whence) { + case SEEK_CUR: +- if ((err = GetFPos(self->fRefNum, &pos))) +- goto ioerr; ++ mode = fsFromMark; + break; + case SEEK_END: +- pos = eof; ++ mode = fsFromLEOF; + break; + case SEEK_SET: +- pos = 0; ++ mode = fsFromStart; + break; + default: + PyErr_BadArgument(); + return NULL; + } + +- pos += amount; +- +- /* Don't bother implementing seek past EOF */ +- if (pos > eof || pos < 0) { +- PyErr_BadArgument(); +- return NULL; +- } +- +- if ((err = SetFPos(self->fRefNum, fsFromStart, pos)) ) { +-ioerr: ++ err = FSSetForkPosition(self->fRefNum, mode, amount); ++ if (err != noErr) { + PyMac_Error(err); + return NULL; + } +@@ -182,7 +171,7 @@ + static PyObject * + rf_tell(rfobject *self, PyObject *args) + { +- long where; ++ long long where; + OSErr err; + + if (self->isclosed) { +@@ -191,11 +180,13 @@ + } + if (!PyArg_ParseTuple(args, "")) + return NULL; +- if ((err = GetFPos(self->fRefNum, &where)) ) { ++ ++ err = FSGetForkPosition(self->fRefNum, &where); ++ if (err != noErr) { + PyMac_Error(err); + return NULL; + } +- return PyInt_FromLong(where); ++ return PyLong_FromLongLong(where); + } + + static char rf_close__doc__[] = +@@ -292,17 +283,61 @@ + static PyObject * + MacOS_GetCreatorAndType(PyObject *self, PyObject *args) + { +- FSSpec fss; +- FInfo info; + PyObject *creator, *type, *res; + OSErr err; +- +- if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss)) ++ FSRef ref; ++ FSCatalogInfo cataloginfo; ++ FileInfo* finfo; ++ ++ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) { ++#ifndef __LP64__ ++ /* This function is documented to take an FSSpec as well, ++ * which only works in 32-bit mode. ++ */ ++ PyErr_Clear(); ++ FSSpec fss; ++ FInfo info; ++ ++ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss)) ++ return NULL; ++ ++ if ((err = FSpGetFInfo(&fss, &info)) != noErr) { ++ return PyErr_Mac(MacOS_Error, err); ++ } ++ creator = PyString_FromStringAndSize( ++ (char *)&info.fdCreator, 4); ++ type = PyString_FromStringAndSize((char *)&info.fdType, 4); ++ res = Py_BuildValue("OO", creator, type); ++ Py_DECREF(creator); ++ Py_DECREF(type); ++ return res; ++#else /* __LP64__ */ ++ return NULL; ++#endif /* __LP64__ */ ++ } ++ ++ err = FSGetCatalogInfo(&ref, ++ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo, ++ NULL, NULL, NULL); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, err); + return NULL; +- if ((err = FSpGetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); +- creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4); +- type = PyString_FromStringAndSize((char *)&info.fdType, 4); ++ } ++ ++ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) { ++ /* Directory: doesn't have type/creator info. ++ * ++ * The specific error code is for backward compatibility with ++ * earlier versions. ++ */ ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ ++ } ++ finfo = (FileInfo*)&(cataloginfo.finderInfo); ++ creator = PyString_FromStringAndSize((char*)&(finfo->fileCreator), 4); ++ type = PyString_FromStringAndSize((char*)&(finfo->fileType), 4); ++ + res = Py_BuildValue("OO", creator, type); + Py_DECREF(creator); + Py_DECREF(type); +@@ -314,20 +349,66 @@ + static PyObject * + MacOS_SetCreatorAndType(PyObject *self, PyObject *args) + { +- FSSpec fss; + ResType creator, type; +- FInfo info; ++ FSRef ref; ++ FileInfo* finfo; + OSErr err; +- ++ FSCatalogInfo cataloginfo; ++ + if (!PyArg_ParseTuple(args, "O&O&O&", ++ PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) { ++#ifndef __LP64__ ++ /* Try to handle FSSpec arguments, for backward compatibility */ ++ FSSpec fss; ++ FInfo info; ++ ++ if (!PyArg_ParseTuple(args, "O&O&O&", + PyMac_GetFSSpec, &fss, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) ++ return NULL; ++ ++ if ((err = FSpGetFInfo(&fss, &info)) != noErr) ++ return PyErr_Mac(MacOS_Error, err); ++ ++ info.fdCreator = creator; ++ info.fdType = type; ++ ++ if ((err = FSpSetFInfo(&fss, &info)) != noErr) ++ return PyErr_Mac(MacOS_Error, err); ++ Py_INCREF(Py_None); ++ return Py_None; ++#else /* __LP64__ */ ++ return NULL; ++#endif /* __LP64__ */ ++ } ++ ++ err = FSGetCatalogInfo(&ref, ++ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo, ++ NULL, NULL, NULL); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, err); + return NULL; +- if ((err = FSpGetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); +- info.fdCreator = creator; +- info.fdType = type; +- if ((err = FSpSetFInfo(&fss, &info)) != noErr) +- return PyErr_Mac(MacOS_Error, err); ++ } ++ ++ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) { ++ /* Directory: doesn't have type/creator info. ++ * ++ * The specific error code is for backward compatibility with ++ * earlier versions. ++ */ ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ ++ } ++ finfo = (FileInfo*)&(cataloginfo.finderInfo); ++ finfo->fileCreator = creator; ++ finfo->fileType = type; ++ ++ err = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &cataloginfo); ++ if (err != noErr) { ++ PyErr_Mac(MacOS_Error, fnfErr); ++ return NULL; ++ } ++ + Py_INCREF(Py_None); + return Py_None; + } +@@ -399,6 +480,7 @@ + return Py_BuildValue("s", buf); + } + ++#ifndef __LP64__ + static char splash_doc[] = "Open a splash-screen dialog by resource-id (0=close)"; + + static PyObject * +@@ -470,6 +552,7 @@ + Py_INCREF(Py_None); + return Py_None; + } ++#endif /* !__LP64__ */ + + static char WMAvailable_doc[] = + "True if this process can interact with the display." +@@ -530,17 +613,18 @@ + { + OSErr err; + char *mode = "r"; +- FSSpec fss; +- SignedByte permission = 1; ++ FSRef ref; ++ SInt8 permission = fsRdPerm; + rfobject *fp; ++ HFSUniStr255 name; + +- if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSSpec, &fss, &mode)) ++ if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSRef, &ref, &mode)) + return NULL; + while (*mode) { + switch (*mode++) { + case '*': break; +- case 'r': permission = 1; break; +- case 'w': permission = 2; break; ++ case 'r': permission = fsRdPerm; break; ++ case 'w': permission = fsWrPerm; break; + case 'b': break; + default: + PyErr_BadArgument(); +@@ -548,33 +632,18 @@ + } + } + +- if ( (fp = newrfobject()) == NULL ) ++ err = FSGetResourceForkName(&name); ++ if (err != noErr) { ++ PyMac_Error(err); + return NULL; ++ } + +- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum); ++ if ( (fp = newrfobject()) == NULL ) ++ return NULL; ++ + +- if ( err == fnfErr ) { +- /* In stead of doing complicated things here to get creator/type +- ** correct we let the standard i/o library handle it +- */ +- FILE *tfp; +- char pathname[PATHNAMELEN]; +- +- if ( (err=PyMac_GetFullPathname(&fss, pathname, PATHNAMELEN)) ) { +- PyMac_Error(err); +- Py_DECREF(fp); +- return NULL; +- } +- +- if ( (tfp = fopen(pathname, "w")) == NULL ) { +- PyMac_Error(fnfErr); /* What else... */ +- Py_DECREF(fp); +- return NULL; +- } +- fclose(tfp); +- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum); +- } +- if ( err ) { ++ err = FSOpenFork(&ref, name.length, name.unicode, permission, &fp->fRefNum); ++ if (err != noErr) { + Py_DECREF(fp); + PyMac_Error(err); + return NULL; +@@ -589,10 +658,12 @@ + {"SetCreatorAndType", MacOS_SetCreatorAndType, 1, setcrtp_doc}, + {"GetErrorString", MacOS_GetErrorString, 1, geterr_doc}, + {"openrf", MacOS_openrf, 1, openrf_doc}, ++#ifndef __LP64__ + {"splash", MacOS_splash, 1, splash_doc}, + {"DebugStr", MacOS_DebugStr, 1, DebugStr_doc}, +- {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc}, + {"SysBeep", MacOS_SysBeep, 1, SysBeep_doc}, ++#endif /* !__LP64__ */ ++ {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc}, + {"WMAvailable", MacOS_WMAvailable, 1, WMAvailable_doc}, + {NULL, NULL} /* Sentinel */ + }; +--- Mac/Modules/file/_Filemodule.c.orig 2006-05-29 07:57:35.000000000 +1000 ++++ Mac/Modules/file/_Filemodule.c 2009-09-10 22:48:47.000000000 +1000 +@@ -18,9 +18,11 @@ + #include <Carbon/Carbon.h> + + #ifdef USE_TOOLBOX_OBJECT_GLUE ++#ifndef __LP64__ + extern int _PyMac_GetFSSpec(PyObject *v, FSSpec *spec); +-extern int _PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *_PyMac_BuildFSSpec(FSSpec *spec); ++#endif /* !__LP64__ */ ++extern int _PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *_PyMac_BuildFSRef(FSRef *spec); + + #define PyMac_GetFSSpec _PyMac_GetFSSpec +@@ -28,20 +30,26 @@ + #define PyMac_BuildFSSpec _PyMac_BuildFSSpec + #define PyMac_BuildFSRef _PyMac_BuildFSRef + #else ++#ifndef __LP64__ + extern int PyMac_GetFSSpec(PyObject *v, FSSpec *spec); +-extern int PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *PyMac_BuildFSSpec(FSSpec *spec); ++#endif /* !__LP64__ */ ++extern int PyMac_GetFSRef(PyObject *v, FSRef *fsr); + extern PyObject *PyMac_BuildFSRef(FSRef *spec); + #endif + + /* Forward declarations */ ++#ifndef __LP64__ + static PyObject *FInfo_New(FInfo *itself); +-static PyObject *FSRef_New(FSRef *itself); + static PyObject *FSSpec_New(FSSpec *itself); ++#define FSSpec_Convert PyMac_GetFSSpec ++#endif /* !__LP64__ */ ++static PyObject *FSRef_New(FSRef *itself); + static PyObject *Alias_New(AliasHandle itself); ++#ifndef __LP64__ + static int FInfo_Convert(PyObject *v, FInfo *p_itself); ++#endif /* !__LP64__ */ + #define FSRef_Convert PyMac_GetFSRef +-#define FSSpec_Convert PyMac_GetFSSpec + static int Alias_Convert(PyObject *v, AliasHandle *p_itself); + + /* +@@ -62,6 +70,7 @@ + /* + ** Optional fsspec and fsref pointers. None will pass NULL + */ ++#ifndef __LP64__ + static int + myPyMac_GetOptFSSpecPtr(PyObject *v, FSSpec **spec) + { +@@ -71,6 +80,7 @@ + } + return PyMac_GetFSSpec(v, *spec); + } ++#endif /* !__LP64__ */ + + static int + myPyMac_GetOptFSRefPtr(PyObject *v, FSRef **ref) +@@ -92,6 +102,7 @@ + return Py_BuildValue("u#", itself->unicode, itself->length); + } + ++#ifndef __LP64__ + static OSErr + _PyMac_GetFullPathname(FSSpec *fss, char *path, int len) + { +@@ -135,6 +146,7 @@ + } + return 0; + } ++#endif /* !__LP64__ */ + + + static PyObject *File_Error; +@@ -282,12 +294,28 @@ + + static PyObject *FSCatalogInfo_get_permissions(FSCatalogInfoObject *self, void *closure) + { +- return Py_BuildValue("(llll)", self->ob_itself.permissions[0], self->ob_itself.permissions[1], self->ob_itself.permissions[2], self->ob_itself.permissions[3]); ++ FSPermissionInfo* info = (FSPermissionInfo*)&(self->ob_itself.permissions); ++ return Py_BuildValue("(llll)", info->userID, info->groupID, info->userAccess, info->mode); + } + + static int FSCatalogInfo_set_permissions(FSCatalogInfoObject *self, PyObject *v, void *closure) + { +- return PyArg_Parse(v, "(llll)", &self->ob_itself.permissions[0], &self->ob_itself.permissions[1], &self->ob_itself.permissions[2], &self->ob_itself.permissions[3])-1; ++ long userID; ++ long groupID; ++ long userAccess; ++ long mode; ++ int r; ++ ++ FSPermissionInfo* info = (FSPermissionInfo*)&(self->ob_itself.permissions); ++ ++ r = PyArg_Parse(v, "(llll)", &userID, &groupID, &userAccess, &mode); ++ if (!r) { ++ return -1; ++ } ++ info->userID = userID; ++ info->groupID = groupID; ++ info->userAccess = userAccess; ++ info->mode = mode; + return 0; + } + +@@ -501,6 +529,7 @@ + + /* ----------------------- Object type FInfo ------------------------ */ + ++#ifndef __LP64__ + static PyTypeObject FInfo_Type; + + #define FInfo_Check(x) ((x)->ob_type == &FInfo_Type || PyObject_TypeCheck((x), &FInfo_Type)) +@@ -682,6 +711,7 @@ + FInfo_tp_free, /* tp_free */ + }; + ++#endif /* !__LP64__ */ + /* --------------------- End object type FInfo ---------------------- */ + + +@@ -729,6 +759,7 @@ + self->ob_type->tp_free((PyObject *)self); + } + ++#ifndef __LP64__ + static PyObject *Alias_ResolveAlias(AliasObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -818,6 +849,7 @@ + wasChanged); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *Alias_FSResolveAliasWithMountFlags(AliasObject *_self, PyObject *_args) + { +@@ -891,6 +923,7 @@ + } + + static PyMethodDef Alias_methods[] = { ++#ifndef __LP64__ + {"ResolveAlias", (PyCFunction)Alias_ResolveAlias, 1, + PyDoc_STR("(FSSpec fromFile) -> (FSSpec target, Boolean wasChanged)")}, + {"GetAliasInfo", (PyCFunction)Alias_GetAliasInfo, 1, +@@ -899,6 +932,7 @@ + PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (FSSpec target, Boolean wasChanged)")}, + {"FollowFinderAlias", (PyCFunction)Alias_FollowFinderAlias, 1, + PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (FSSpec target, Boolean wasChanged)")}, ++#endif /* !__LP64__ */ + {"FSResolveAliasWithMountFlags", (PyCFunction)Alias_FSResolveAliasWithMountFlags, 1, + PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (FSRef target, Boolean wasChanged)")}, + {"FSResolveAlias", (PyCFunction)Alias_FSResolveAlias, 1, +@@ -1033,6 +1067,7 @@ + + + /* ----------------------- Object type FSSpec ----------------------- */ ++#ifndef __LP64__ + + static PyTypeObject FSSpec_Type; + +@@ -1488,6 +1523,7 @@ + FSSpec_tp_free, /* tp_free */ + }; + ++#endif /* !__LP64__ */ + /* --------------------- End object type FSSpec --------------------- */ + + +@@ -1568,7 +1604,9 @@ + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo catalogInfo; + FSRef newRef; ++#ifndef __LP64__ + FSSpec newSpec; ++#endif /* !__LP64__ */ + if (!PyArg_ParseTuple(_args, "u#lO&", + &nameLength__in__, &nameLength__in_len__, + &whichInfo, +@@ -1580,11 +1618,20 @@ + whichInfo, + &catalogInfo, + &newRef, +- &newSpec); ++#ifndef __LP64__ ++ &newSpec ++#else ++ NULL ++#endif /* !__LP64__ */ ++ ); + if (_err != noErr) return PyMac_Error(_err); ++#ifndef __LP64__ + _res = Py_BuildValue("O&O&", + FSRef_New, &newRef, + FSSpec_New, &newSpec); ++#else ++ _res = Py_BuildValue("O&O", FSRef_New, &newRef, Py_None); ++#endif /* !__LP64__ */ + return _res; + } + +@@ -1598,7 +1645,9 @@ + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo catalogInfo; + FSRef newRef; ++#ifndef __LP64__ + FSSpec newSpec; ++#endif /* !__LP64__ */ + UInt32 newDirID; + if (!PyArg_ParseTuple(_args, "u#lO&", + &nameLength__in__, &nameLength__in_len__, +@@ -1611,13 +1660,25 @@ + whichInfo, + &catalogInfo, + &newRef, ++#ifndef __LP64__ + &newSpec, ++#else ++ NULL, ++#endif /* !__LP64__ */ + &newDirID); + if (_err != noErr) return PyMac_Error(_err); ++ ++#ifndef __LP64__ + _res = Py_BuildValue("O&O&l", + FSRef_New, &newRef, + FSSpec_New, &newSpec, + newDirID); ++#else ++ _res = Py_BuildValue("O&Ol", ++ FSRef_New, &newRef, ++ Py_None, ++ newDirID); ++#endif /* !__LP64__ */ + return _res; + } + +@@ -1699,7 +1760,9 @@ + FSCatalogInfoBitmap whichInfo; + FSCatalogInfo catalogInfo; + HFSUniStr255 outName; ++#ifndef __LP64__ + FSSpec fsSpec; ++#endif /* !__LP64__ */ + FSRef parentRef; + if (!PyArg_ParseTuple(_args, "l", + &whichInfo)) +@@ -1708,14 +1771,26 @@ + whichInfo, + &catalogInfo, + &outName, ++#ifndef __LP64__ + &fsSpec, ++#else ++ NULL, ++#endif /* !__LP64__ */ + &parentRef); + if (_err != noErr) return PyMac_Error(_err); ++#ifndef __LP64__ + _res = Py_BuildValue("O&O&O&O&", + FSCatalogInfo_New, &catalogInfo, + PyMac_BuildHFSUniStr255, &outName, + FSSpec_New, &fsSpec, + FSRef_New, &parentRef); ++#else ++ _res = Py_BuildValue("O&O&OO&", ++ FSCatalogInfo_New, &catalogInfo, ++ PyMac_BuildHFSUniStr255, &outName, ++ Py_None, ++ FSRef_New, &parentRef); ++#endif /* !__LP64__ */ + return _res; + } + +@@ -1784,7 +1859,7 @@ + UniCharCount forkNameLength__len__; + int forkNameLength__in_len__; + SInt8 permissions; +- SInt16 forkRefNum; ++ FSIORefNum forkRefNum; + if (!PyArg_ParseTuple(_args, "u#b", + &forkNameLength__in__, &forkNameLength__in_len__, + &permissions)) +@@ -2034,7 +2109,7 @@ + + /* --------------------- End object type FSRef ---------------------- */ + +- ++#ifndef __LP64__ + static PyObject *File_UnmountVol(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -2562,6 +2637,7 @@ + FSSpec_New, &spec); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *File_FSGetForkPosition(PyObject *_self, PyObject *_args) + { +@@ -2785,6 +2861,7 @@ + return _res; + } + ++#ifndef __LP64__ + static PyObject *File_NewAlias(PyObject *_self, PyObject *_args) + { + PyObject *_res = NULL; +@@ -2933,6 +3010,7 @@ + wasAliased); + return _res; + } ++#endif /* !__LP64__ */ + + static PyObject *File_FSNewAlias(PyObject *_self, PyObject *_args) + { +@@ -3050,6 +3128,7 @@ + } + + static PyMethodDef File_methods[] = { ++#ifndef __LP64__ + {"UnmountVol", (PyCFunction)File_UnmountVol, 1, + PyDoc_STR("(Str63 volName, short vRefNum) -> None")}, + {"FlushVol", (PyCFunction)File_FlushVol, 1, +@@ -3100,6 +3179,7 @@ + PyDoc_STR("(short vRefNum, long dirID, Str255 oldName, long newDirID, Str255 newName) -> None")}, + {"FSMakeFSSpec", (PyCFunction)File_FSMakeFSSpec, 1, + PyDoc_STR("(short vRefNum, long dirID, Str255 fileName) -> (FSSpec spec)")}, ++#endif /* !__LP64__ */ + {"FSGetForkPosition", (PyCFunction)File_FSGetForkPosition, 1, + PyDoc_STR("(SInt16 forkRefNum) -> (SInt64 position)")}, + {"FSSetForkPosition", (PyCFunction)File_FSSetForkPosition, 1, +@@ -3124,6 +3204,7 @@ + PyDoc_STR("(UInt8 * path, FNMessage message, OptionBits flags) -> None")}, + {"FNNotifyAll", (PyCFunction)File_FNNotifyAll, 1, + PyDoc_STR("(FNMessage message, OptionBits flags) -> None")}, ++#ifndef __LP64__ + {"NewAlias", (PyCFunction)File_NewAlias, 1, + PyDoc_STR("(FSSpec fromFile, FSSpec target) -> (AliasHandle alias)")}, + {"NewAliasMinimalFromFullPath", (PyCFunction)File_NewAliasMinimalFromFullPath, 1, +@@ -3136,6 +3217,7 @@ + PyDoc_STR("(FSSpec fromFile, FSSpec target, AliasHandle alias) -> (Boolean wasChanged)")}, + {"ResolveAliasFileWithMountFlagsNoUI", (PyCFunction)File_ResolveAliasFileWithMountFlagsNoUI, 1, + PyDoc_STR("(FSSpec theSpec, Boolean resolveAliasChains, unsigned long mountFlags) -> (FSSpec theSpec, Boolean targetIsFolder, Boolean wasAliased)")}, ++#endif /* !__LP64__ */ + {"FSNewAlias", (PyCFunction)File_FSNewAlias, 1, + PyDoc_STR("(FSRef fromFile, FSRef target) -> (AliasHandle inAlias)")}, + {"FSResolveAliasFileWithMountFlags", (PyCFunction)File_FSResolveAliasFileWithMountFlags, 1, +@@ -3150,7 +3232,7 @@ + }; + + +- ++#ifndef __LP64__ + int + PyMac_GetFSSpec(PyObject *v, FSSpec *spec) + { +@@ -3188,12 +3270,15 @@ + } + return 0; + } ++#endif /* !__LP64__ */ + + int + PyMac_GetFSRef(PyObject *v, FSRef *fsr) + { + OSStatus err; ++#ifndef __LP64__ + FSSpec fss; ++#endif /* !__LP64__ */ + + if (FSRef_Check(v)) { + *fsr = ((FSRefObject *)v)->ob_itself; +@@ -3211,6 +3296,7 @@ + return !err; + } + /* XXXX Should try unicode here too */ ++#ifndef __LP64__ + /* Otherwise we try to go via an FSSpec */ + if (FSSpec_Check(v)) { + fss = ((FSSpecObject *)v)->ob_itself; +@@ -3219,15 +3305,18 @@ + PyMac_Error(err); + return 0; + } ++#endif /* !__LP64__ */ + PyErr_SetString(PyExc_TypeError, "FSRef, FSSpec or pathname required"); + return 0; + } + ++#ifndef __LP64__ + extern PyObject * + PyMac_BuildFSSpec(FSSpec *spec) + { + return FSSpec_New(spec); + } ++#endif /* !__LP64__ */ + + extern PyObject * + PyMac_BuildFSRef(FSRef *spec) +@@ -3242,10 +3331,11 @@ + PyObject *d; + + +- ++#ifndef __LP64__ + PyMac_INIT_TOOLBOX_OBJECT_NEW(FSSpec *, PyMac_BuildFSSpec); +- PyMac_INIT_TOOLBOX_OBJECT_NEW(FSRef *, PyMac_BuildFSRef); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(FSSpec, PyMac_GetFSSpec); ++#endif /* !__LP64__ */ ++ PyMac_INIT_TOOLBOX_OBJECT_NEW(FSRef *, PyMac_BuildFSRef); + PyMac_INIT_TOOLBOX_OBJECT_CONVERT(FSRef, PyMac_GetFSRef); + + +@@ -3262,6 +3352,7 @@ + /* Backward-compatible name */ + Py_INCREF(&FSCatalogInfo_Type); + PyModule_AddObject(m, "FSCatalogInfoType", (PyObject *)&FSCatalogInfo_Type); ++#ifndef __LP64__ + FInfo_Type.ob_type = &PyType_Type; + if (PyType_Ready(&FInfo_Type) < 0) return; + Py_INCREF(&FInfo_Type); +@@ -3269,6 +3360,7 @@ + /* Backward-compatible name */ + Py_INCREF(&FInfo_Type); + PyModule_AddObject(m, "FInfoType", (PyObject *)&FInfo_Type); ++#endif /* !__LP64__ */ + Alias_Type.ob_type = &PyType_Type; + if (PyType_Ready(&Alias_Type) < 0) return; + Py_INCREF(&Alias_Type); +@@ -3276,6 +3368,7 @@ + /* Backward-compatible name */ + Py_INCREF(&Alias_Type); + PyModule_AddObject(m, "AliasType", (PyObject *)&Alias_Type); ++#ifndef __LP64__ + FSSpec_Type.ob_type = &PyType_Type; + if (PyType_Ready(&FSSpec_Type) < 0) return; + Py_INCREF(&FSSpec_Type); +@@ -3283,6 +3376,7 @@ + /* Backward-compatible name */ + Py_INCREF(&FSSpec_Type); + PyModule_AddObject(m, "FSSpecType", (PyObject *)&FSSpec_Type); ++#endif /* !__LP64__ */ + FSRef_Type.ob_type = &PyType_Type; + if (PyType_Ready(&FSRef_Type) < 0) return; + Py_INCREF(&FSRef_Type); +Index: Lib/plat-mac/macresource.py +=================================================================== +--- Lib/plat-mac/macresource.py (revision 74680) ++++ Lib/plat-mac/macresource.py (revision 74681) +@@ -79,8 +79,8 @@ + AppleSingle file""" + try: + refno = Res.FSpOpenResFile(pathname, 1) +- except Res.Error, arg: +- if arg[0] in (-37, -39): ++ except (AttributeError, Res.Error), arg: ++ if isinstance(arg, AttributeError) or arg[0] in (-37, -39): + # No resource fork. We may be on OSX, and this may be either + # a data-fork based resource file or a AppleSingle file + # from the CVS repository. +@@ -106,8 +106,8 @@ + try: + refno = Res.FSpOpenResFile(pathname, 1) + Res.CloseResFile(refno) +- except Res.Error, arg: +- if arg[0] in (-37, -39): ++ except (AttributeError, Res.Error), arg: ++ if isinstance(arg, AttributeError) or arg[0] in (-37, -39): + # No resource fork. We may be on OSX, and this may be either + # a data-fork based resource file or a AppleSingle file + # from the CVS repository. +Index: Lib/plat-mac/applesingle.py +=================================================================== +--- Lib/plat-mac/applesingle.py (revision 74680) ++++ Lib/plat-mac/applesingle.py (revision 74681) +@@ -119,8 +119,13 @@ + if not hasattr(infile, 'read'): + if isinstance(infile, Carbon.File.Alias): + infile = infile.ResolveAlias()[0] +- if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)): +- infile = infile.as_pathname() ++ ++ if hasattr(Carbon.File, "FSSpec"): ++ if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)): ++ infile = infile.as_pathname() ++ else: ++ if isinstance(infile, Carbon.File.FSRef): ++ infile = infile.as_pathname() + infile = open(infile, 'rb') + + asfile = AppleSingle(infile, verbose=verbose) +Index: Mac/scripts/BuildApplet.py +=================================================================== +--- Mac/scripts/BuildApplet.py (revision 74680) ++++ Mac/scripts/BuildApplet.py (revision 74681) +@@ -12,7 +12,10 @@ + + import os + import MacOS +-import EasyDialogs ++try: ++ import EasyDialogs ++except ImportError: ++ EasyDialogs = None + import buildtools + import getopt + +@@ -32,7 +35,10 @@ + try: + buildapplet() + except buildtools.BuildError, detail: +- EasyDialogs.Message(detail) ++ if EasyDialogs is None: ++ print detail ++ else: ++ EasyDialogs.Message(detail) + + + def buildapplet(): +@@ -46,6 +52,10 @@ + # Ask for source text if not specified in sys.argv[1:] + + if not sys.argv[1:]: ++ if EasyDialogs is None: ++ usage() ++ sys.exit(1) ++ + filename = EasyDialogs.AskFileForOpen(message='Select Python source or applet:', + typeList=('TEXT', 'APPL')) + if not filename: +Index: Lib/plat-mac/buildtools.py +=================================================================== +--- Lib/plat-mac/buildtools.py (revision 74680) ++++ Lib/plat-mac/buildtools.py (revision 74681) +@@ -15,7 +15,10 @@ + import MacOS + import macostools + import macresource +-import EasyDialogs ++try: ++ import EasyDialogs ++except ImportError: ++ EasyDialogs = None + import shutil + + +@@ -67,9 +70,13 @@ + rsrcname=None, others=[], raw=0, progress="default", destroot=""): + + if progress == "default": +- progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) +- progress.label("Compiling...") +- progress.inc(0) ++ if EasyDialogs is None: ++ print "Compiling %s"%(os.path.split(filename)[1],) ++ process = None ++ else: ++ progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120) ++ progress.label("Compiling...") ++ progress.inc(0) + # check for the script name being longer than 32 chars. This may trigger a bug + # on OSX that can destroy your sourcefile. + if '#' in os.path.split(filename)[1]: +@@ -119,7 +126,11 @@ + if MacOS.runtimemodel == 'macho': + raise BuildError, "No updating yet for MachO applets" + if progress: +- progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120) ++ if EasyDialogs is None: ++ print "Updating %s"%(os.path.split(filename)[1],) ++ progress = None ++ else: ++ progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120) + else: + progress = None + if not output: diff --git a/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff b/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff new file mode 100644 index 000000000..6f8ac6608 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff @@ -0,0 +1,11 @@ +--- Mac/Modules/file/_Filemodule.c.orig 2009-09-12 15:55:59.000000000 +1000 ++++ Mac/Modules/file/_Filemodule.c 2009-09-12 16:12:07.000000000 +1000 +@@ -7,6 +7,8 @@ + + #include "pymactoolbox.h" + ++typedef SInt16 FSIORefNum; ++ + /* Macro to test whether a weak-loaded CFM function exists */ + #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\ + PyErr_SetString(PyExc_NotImplementedError, \ diff --git a/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff b/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff new file mode 100644 index 000000000..8153bebbd --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff @@ -0,0 +1,18 @@ +--- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200 ++++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200 +@@ -1,13 +1,6 @@ +-#! /usr/local/bin/python ++#! __PREFIX__/bin/python2.5 + +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is +-# intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is +-# installed, so /usr/bin/env would be unable to find python. Granted, +-# binary installations by Linux vendors often install Python in +-# /usr/bin. So let those vendors patch cgi.py to match their choice +-# of installation. ++# NOTE: The original #!/usr/local/bin/python patched for MacPorts installation + + """Support module for CGI (Common Gateway Interface) scripts. + diff --git a/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff b/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff new file mode 100644 index 000000000..961a8ad28 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff @@ -0,0 +1,51 @@ +--- Lib/distutils/dist.py.orig 2005-03-23 11:54:36.000000000 -0700 ++++ Lib/distutils/dist.py 2008-07-25 21:27:15.000000000 -0600 +@@ -57,6 +57,7 @@ + ('quiet', 'q', "run quietly (turns verbosity off)"), + ('dry-run', 'n', "don't actually do anything"), + ('help', 'h', "show detailed help message"), ++ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'), + ] + + # 'common_usage' is a short (2-3 line) string describing the common +@@ -264,6 +265,12 @@ + else: + sys.stderr.write(msg + "\n") + ++ # no-user-cfg is handled before other command line args ++ # because other args override the config files, and this ++ # one is needed before we can load the config files. ++ # If attrs['script_args'] wasn't passed, assume false. ++ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or []) ++ + self.finalize_options() + + # __init__ () +@@ -324,6 +331,9 @@ + Distutils __inst__.py file lives), a file in the user's home + directory named .pydistutils.cfg on Unix and pydistutils.cfg + on Windows/Mac, and setup.cfg in the current directory. ++ ++ The file in the user's home directory can be disabled with the ++ --no-user-cfg option. + """ + files = [] + check_environ() +@@ -343,7 +353,7 @@ + user_filename = "pydistutils.cfg" + + # And look for the user config file +- if os.environ.has_key('HOME'): ++ if self.want_user_cfg and os.environ.has_key('HOME'): + user_file = os.path.join(os.environ.get('HOME'), user_filename) + if os.path.isfile(user_file): + files.append(user_file) +@@ -353,6 +363,8 @@ + if os.path.isfile(local_file): + files.append(local_file) + ++ if DEBUG: ++ print "using config files: %s" % ', '.join(files) + return files + + # find_config_files () diff --git a/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff b/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff new file mode 100644 index 000000000..e99a24741 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff @@ -0,0 +1,49 @@ +--- Makefile.pre.in.orig 2008-09-22 10:22:44.000000000 +1000 ++++ Makefile.pre.in 2011-10-27 06:47:17.000000000 +1100 +@@ -348,8 +348,8 @@ + # Build the shared modules + sharedmods: $(BUILDPYTHON) + case $$MAKEFLAGS in \ +- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \ + esac + + # Build static library +@@ -387,7 +387,7 @@ + $(RESSRCDIR)/English.lproj/InfoPlist.strings + $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION) + if test "${UNIVERSALSDK}"; then \ +- $(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \ ++ $(CC) -o $(LDLIBRARY) __UNIVERSAL_LDFLAGS__ -dynamiclib \ + -isysroot "${UNIVERSALSDK}" \ + -all_load $(LIBRARY) -Wl,-single_module \ + -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \ +@@ -458,7 +458,7 @@ + $(SIGNAL_OBJS) \ + $(MODOBJS) \ + $(srcdir)/Modules/getbuildinfo.c +- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c ++ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c + + Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile + $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ +@@ -894,7 +894,7 @@ + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -968,7 +968,7 @@ + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ++ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=/$(DESTDIR) diff --git a/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff b/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff new file mode 100644 index 000000000..0fee9e791 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff @@ -0,0 +1,16 @@ +--- Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004 ++++ Misc/setuid-prog.c Sat Dec 11 14:30:13 2004 +@@ -70,6 +70,12 @@ + #define environ _environ + #endif + ++#if defined(__APPLE__) ++#include <sys/time.h> ++#include <crt_externs.h> ++#define environ (*_NSGetEnviron()) ++#endif ++ + /* don't change def_IFS */ + char def_IFS[] = "IFS= \t\n"; + /* you may want to change def_PATH, but you should really change it in */ + diff --git a/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff b/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff new file mode 100644 index 000000000..c14913cf7 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff @@ -0,0 +1,21 @@ +--- Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004 ++++ Modules/posixmodule.c Sat Dec 11 14:28:17 2004 +@@ -339,7 +339,7 @@ + #endif + + /* Return a dictionary corresponding to the POSIX environment table */ +-#ifdef WITH_NEXT_FRAMEWORK ++#ifdef __APPLE__ + /* On Darwin/MacOSX a shared library or framework has no access to + ** environ directly, we must obtain it with _NSGetEnviron(). + */ +@@ -357,7 +357,7 @@ + d = PyDict_New(); + if (d == NULL) + return NULL; +-#ifdef WITH_NEXT_FRAMEWORK ++#ifdef __APPLE__ + if (environ == NULL) + environ = *_NSGetEnviron(); + #endif + diff --git a/packaging/macosx/ports/lang/python25/files/patch-configure.diff b/packaging/macosx/ports/lang/python25/files/patch-configure.diff new file mode 100644 index 000000000..22d260047 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-configure.diff @@ -0,0 +1,45 @@ +--- configure.orig 2008-12-14 01:13:52.000000000 +1100 ++++ configure 2011-05-10 16:25:02.000000000 +1000 +@@ -4534,9 +4534,11 @@ + ;; + # is there any other compiler on Darwin besides gcc? + Darwin*) +- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd" ++ BASECFLAGS="$BASECFLAGS -mno-fused-madd" + if test "${enable_universalsdk}"; then +- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" ++ BASECFLAGS="__UNIVERSAL_CFLAGS__ -isysroot ${UNIVERSALSDK} ${BASECFLAGS}" ++ else ++ BASECFLAGS="-arch __BUILD_ARCH__ ${BASECFLAGS}" + fi + + ;; +@@ -11362,7 +11364,7 @@ + if test "${enable_universalsdk}"; then + : + else +- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`" ++ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only __BUILD_ARCH__" + fi + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; +@@ -11374,7 +11376,7 @@ + else + LIBTOOL_CRUFT="" + fi +- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`" ++ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only __BUILD_ARCH__" + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)' + LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';; + esac +@@ -11524,7 +11526,9 @@ + if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2 + then + if test "${enable_universalsdk}"; then +- LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}" ++ LDFLAGS="__UNIVERSAL_LDFLAGS__ -isysroot ${UNIVERSALSDK} ${LDFLAGS}" ++ else ++ LDFLAGS="-arch __BUILD_ARCH__ ${LDFLAGS}" + fi + LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup' + BLDSHARED="$LDSHARED" diff --git a/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff b/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff new file mode 100644 index 000000000..130a3ad5d --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff @@ -0,0 +1,12 @@ +--- configure.orig 2011-11-22 09:08:58.000000000 +1100 ++++ configure 2011-11-22 09:10:56.000000000 +1100 +@@ -4428,9 +4428,7 @@ + STRICT_PROTO="-Wstrict-prototypes" + fi + # For gcc 4.x we need to use -fwrapv so lets check if its supported +- if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then + WRAP="-fwrapv" +- fi + case $ac_cv_prog_cc_g in + yes) + if test "$Py_DEBUG" = 'true' ; then diff --git a/packaging/macosx/ports/lang/python25/files/patch-libedit.diff b/packaging/macosx/ports/lang/python25/files/patch-libedit.diff new file mode 100644 index 000000000..99da7a9c4 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-libedit.diff @@ -0,0 +1,132 @@ +--- configure.orig 2011-10-31 13:23:35.000000000 +1100 ++++ configure 2011-10-31 13:28:19.000000000 +1100 +@@ -20985,9 +20985,9 @@ + echo $ECHO_N "checking how to link readline libs... $ECHO_C" >&6; } + for py_libtermcap in "" ncursesw ncurses curses termcap; do + if test -z "$py_libtermcap"; then +- READLINE_LIBS="-lreadline" ++ READLINE_LIBS="-ledit" + else +- READLINE_LIBS="-lreadline -l$py_libtermcap" ++ READLINE_LIBS="-ledit -l$py_libtermcap" + fi + LIBS="$READLINE_LIBS $LIBS_no_readline" + cat >conftest.$ac_ext <<_ACEOF +@@ -21060,13 +21060,13 @@ + fi + + # check for readline 2.1 +-{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5 +-echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -ledit" >&5 ++echo $ECHO_N "checking for rl_callback_handler_install in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $READLINE_LIBS $LIBS" ++LIBS="-ledit $READLINE_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21137,7 +21137,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -21172,7 +21172,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +@@ -21188,13 +21188,13 @@ + fi + + # check for readline 4.0 +-{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -lreadline" >&5 +-echo $ECHO_N "checking for rl_pre_input_hook in -lreadline... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -ledit" >&5 ++echo $ECHO_N "checking for rl_pre_input_hook in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $READLINE_LIBS $LIBS" ++LIBS="-ledit $READLINE_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21259,13 +21259,13 @@ + + + # check for readline 4.2 +-{ echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5 +-echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6; } ++{ echo "$as_me:$LINENO: checking for rl_completion_matches in -ledit" >&5 ++echo $ECHO_N "checking for rl_completion_matches in -ledit... $ECHO_C" >&6; } + if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lreadline $READLINE_LIBS $LIBS" ++LIBS="-ledit $READLINE_LIBS $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -21336,7 +21336,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -21371,7 +21371,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <readline/readline.h> ++#include <editline/readline.h> + + _ACEOF + if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | +--- setup.py.orig 2011-10-31 13:23:35.000000000 +1100 ++++ setup.py 2011-10-31 13:32:40.000000000 +1100 +@@ -488,7 +488,7 @@ + else: + readline_extra_link_args = () + +- readline_libs = ['readline'] ++ readline_libs = ['edit'] + if self.compiler.find_library_file(lib_dirs, + 'ncursesw'): + readline_libs.append('ncursesw') +--- Modules/readline.c.orig 2007-01-23 03:10:27.000000000 +1100 ++++ Modules/readline.c 2011-10-31 14:00:36.000000000 +1100 +@@ -28,8 +28,7 @@ + + /* GNU readline definitions */ + #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */ +-#include <readline/readline.h> +-#include <readline/history.h> ++#include <editline/readline.h> + + #ifdef HAVE_RL_COMPLETION_MATCHES + #define completion_matches(x, y) \ +@@ -794,7 +793,6 @@ readline_until_enter_or_signal(char *pro + PyEval_SaveThread(); + #endif + if (s < 0) { +- rl_free_line_state(); + rl_cleanup_after_signal(); + rl_callback_handler_remove(); + *signal = 1; diff --git a/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff b/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff new file mode 100644 index 000000000..5350dee29 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff @@ -0,0 +1,114 @@ + +# HG changeset patch +# User Ronald Oussoren <ronaldoussoren@mac.com> +# Date 1279889153 0 +# Node ID e267ee9760bd14a8b4270e12af982c941fa7a67d +# Parent bdc069a1a721b28ad21849232bd5426dda871506 +Merged revisions 83085 via svnmerge from +svn+ssh://pythondev@svn.python.org/python/branches/release27-maint + +................ + r83085 | ronald.oussoren | 2010-07-23 13:41:00 +0100 (Fri, 23 Jul 2010) | 12 lines + + Merged revisions 83075 via svnmerge from + svn+ssh://pythondev@svn.python.org/python/branches/py3k + + ........ + r83075 | ronald.oussoren | 2010-07-23 12:54:59 +0100 (Fri, 23 Jul 2010) | 5 lines + + Fix for issue 7895. Avoid crashing the interpreter + when calling platform.mac_ver after calling os.fork by + reading from a system configuration file instead of + using OSX APIs. + ........ +................ + +diff --git a/Lib/platform.py b/Lib/platform.py +--- Lib/platform.py ++++ Lib/platform.py +@@ -562,28 +562,20 @@ def _bcd2str(bcd): + + return hex(bcd)[2:] + +-def mac_ver(release='',versioninfo=('','',''),machine=''): +- +- """ Get MacOS version information and return it as tuple (release, +- versioninfo, machine) with versioninfo being a tuple (version, +- dev_stage, non_release_version). +- +- Entries which cannot be determined are set to the paramter values +- which default to ''. All tuple entries are strings. +- ++def _mac_ver_gestalt(): ++ """ + Thanks to Mark R. Levinson for mailing documentation links and + code examples for this function. Documentation for the + gestalt() API is available online at: + + http://www.rgaros.nl/gestalt/ +- + """ + # Check whether the version info module is available + try: + import gestalt + import MacOS + except ImportError: +- return release,versioninfo,machine ++ return None + # Get the infos + sysv,sysu,sysa = _mac_ver_lookup(('sysv','sysu','sysa')) + # Decode the infos +@@ -619,6 +611,53 @@ def mac_ver(release='',versioninfo=('',' + machine = {0x1: '68k', + 0x2: 'PowerPC', + 0xa: 'i386'}.get(sysa,'') ++ ++ return release,versioninfo,machine ++ ++def _mac_ver_xml(): ++ fn = '/System/Library/CoreServices/SystemVersion.plist' ++ if not os.path.exists(fn): ++ return None ++ ++ try: ++ import plistlib ++ except ImportError: ++ return None ++ ++ pl = plistlib.readPlist(fn) ++ release = pl['ProductVersion'] ++ versioninfo=('', '', '') ++ machine = os.uname()[4] ++ if machine == 'ppc': ++ # for compatibility with the gestalt based code ++ machine = 'PowerPC' ++ ++ return release,versioninfo,machine ++ ++ ++def mac_ver(release='',versioninfo=('','',''),machine=''): ++ ++ """ Get MacOS version information and return it as tuple (release, ++ versioninfo, machine) with versioninfo being a tuple (version, ++ dev_stage, non_release_version). ++ ++ Entries which cannot be determined are set to the paramter values ++ which default to ''. All tuple entries are strings. ++ """ ++ ++ # First try reading the information from an XML file which should ++ # always be present ++ info = _mac_ver_xml() ++ if info is not None: ++ return info ++ ++ # If that doesn't work for some reason fall back to reading the ++ # information using gestalt calls. ++ info = _mac_ver_gestalt() ++ if info is not None: ++ return info ++ ++ # If that also doesn't work return the default values + return release,versioninfo,machine + + def _java_getprop(name,default): diff --git a/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff b/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff new file mode 100644 index 000000000..bd0ecd803 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff @@ -0,0 +1,13 @@ +--- pyconfig.h.in.orig 2009-08-16 10:22:50.000000000 -0700 ++++ pyconfig.h.in 2009-08-16 10:23:24.000000000 -0700 +@@ -4,6 +4,10 @@ + #ifndef Py_PYCONFIG_H + #define Py_PYCONFIG_H + ++// Required on Darwin 10+ ++#ifndef _DARWIN_C_SOURCE ++#define _DARWIN_C_SOURCE ++#endif + + /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want + support for AIX C++ shared extension modules. */ diff --git a/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff b/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff new file mode 100644 index 000000000..14d3bc582 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff @@ -0,0 +1,11 @@ +--- setup.py.orig 2009-03-31 12:20:48.000000000 -0600 ++++ setup.py 2009-09-17 00:33:12.000000000 -0600 +@@ -17,7 +17,7 @@ + from distutils.command.install_lib import install_lib + + # This global variable is used to hold the list of modules to be disabled. +-disabled_module_list = [] ++disabled_module_list = ["_tkinter", "gdbm"] + + def add_dir_to_list(dirlist, dir): + """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff b/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff new file mode 100644 index 000000000..2649594c8 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff @@ -0,0 +1,80 @@ +--- setup.py.orig 2008-10-16 12:58:19.000000000 -0600 ++++ setup.py 2009-06-07 20:55:17.000000000 -0600 +@@ -609,7 +609,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 5) ++ max_db_ver = (4, 6) + # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x + # we leave that version disabled by default as it has proven to be + # quite a buggy library release on many platforms. +@@ -636,6 +636,7 @@ + db_inc_paths.append('/usr/local/include/db4%d' % x) + db_inc_paths.append('/pkg/db-4.%d/include' % x) + db_inc_paths.append('/opt/db-4.%d/include' % x) ++ db_inc_paths.append('__PREFIX__/include/db4%d' % x) + # 3.x minor number specific paths + for x in (3,): + db_inc_paths.append('/usr/include/db3%d' % x) +@@ -711,6 +712,7 @@ + + # check lib directories parallel to the location of the header + db_dirs_to_check = [ ++ os.path.join('__PREFIX__', 'lib', 'db46'), + os.path.join(db_incdir, '..', 'lib64'), + os.path.join(db_incdir, '..', 'lib'), + os.path.join(db_incdir, '..', '..', 'lib64'), +@@ -1212,13 +1214,7 @@ + def detect_tkinter(self, inc_dirs, lib_dirs): + # The _tkinter module. + +- # Rather than complicate the code below, detecting and building +- # AquaTk is a separate method. Only one Tkinter will be built on +- # Darwin - either AquaTk, if it is found, or X11 based Tk. + platform = self.get_platform() +- if (platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without +--- setup.py.orig 2009-09-10 19:41:32.000000000 +1000 ++++ setup.py 2009-09-10 19:48:30.000000000 +1000 +@@ -1197,7 +1197,7 @@ + # For 8.4a2, the X11 headers are not included. Rather than include a + # complicated search, this is a hard-coded path. It could bail out + # if X11 libs are not found... +- include_dirs.append('/usr/X11R6/include') ++ #include_dirs.append('/usr/X11R6/include') + frameworks = ['-framework', 'Tcl', '-framework', 'Tk'] + + ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'], +@@ -1262,17 +1262,17 @@ + if platform == 'sunos5': + include_dirs.append('/usr/openwin/include') + added_lib_dirs.append('/usr/openwin/lib') +- elif os.path.exists('/usr/X11R6/include'): +- include_dirs.append('/usr/X11R6/include') +- added_lib_dirs.append('/usr/X11R6/lib64') +- added_lib_dirs.append('/usr/X11R6/lib') +- elif os.path.exists('/usr/X11R5/include'): +- include_dirs.append('/usr/X11R5/include') +- added_lib_dirs.append('/usr/X11R5/lib') +- else: ++ #elif os.path.exists('/usr/X11R6/include'): ++ # include_dirs.append('/usr/X11R6/include') ++ # added_lib_dirs.append('/usr/X11R6/lib64') ++ # added_lib_dirs.append('/usr/X11R6/lib') ++ #elif os.path.exists('/usr/X11R5/include'): ++ # include_dirs.append('/usr/X11R5/include') ++ # added_lib_dirs.append('/usr/X11R5/lib') ++ #else: + # Assume default location for X11 +- include_dirs.append('/usr/X11/include') +- added_lib_dirs.append('/usr/X11/lib') ++ # include_dirs.append('/usr/X11/include') ++ # added_lib_dirs.append('/usr/X11/lib') + + # If Cygwin, then verify that X is installed before proceeding + if platform == 'cygwin': diff --git a/packaging/macosx/ports/lang/python25/files/pyconfig.ed b/packaging/macosx/ports/lang/python25/files/pyconfig.ed new file mode 100644 index 000000000..671d0d560 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/pyconfig.ed @@ -0,0 +1,2 @@ +g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */, +w diff --git a/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed b/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed new file mode 100644 index 000000000..67ecc11a1 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed @@ -0,0 +1,50 @@ +/HAVE_LARGEFILE_SUPPORT/c +#ifdef __LP64__ +/* #undef HAVE_LARGEFILE_SUPPORT */ +#else +#define HAVE_LARGEFILE_SUPPORT 1 +#endif +. +/SIZEOF_LONG/c +#ifdef __LP64__ +#define SIZEOF_LONG 8 +#else +#define SIZEOF_LONG 4 +#endif +. +/SIZEOF_PTHREAD_T/c +#ifdef __LP64__ +#define SIZEOF_PTHREAD_T 8 +#else +#define SIZEOF_PTHREAD_T 4 +#endif +. +/SIZEOF_SIZE_T/c +#ifdef __LP64__ +#define SIZEOF_SIZE_T 8 +#else +#define SIZEOF_SIZE_T 4 +#endif +. +/SIZEOF_TIME_T/c +#ifdef __LP64__ +#define SIZEOF_TIME_T 8 +#else +#define SIZEOF_TIME_T 4 +#endif +. +/SIZEOF_UINTPTR_T/c +#ifdef __LP64__ +#define SIZEOF_UINTPTR_T 8 +#else +#define SIZEOF_UINTPTR_T 4 +#endif +. +/SIZEOF_VOID_P/c +#ifdef __LP64__ +#define SIZEOF_VOID_P 8 +#else +#define SIZEOF_VOID_P 4 +#endif +. +w diff --git a/packaging/macosx/ports/lang/python25/files/python25 b/packaging/macosx/ports/lang/python25/files/python25 new file mode 100644 index 000000000..e7ca5aed2 --- /dev/null +++ b/packaging/macosx/ports/lang/python25/files/python25 @@ -0,0 +1,13 @@ +bin/python2.5 +bin/pythonw2.5 +bin/python2.5-config +bin/idle2.5 +bin/pydoc2.5 +bin/smtpd2.5.py +- +- +share/man/man1/python2.5.1.gz +${frameworks_dir}/Python.framework/Versions/2.5 +${frameworks_dir}/Python.framework/Versions/2.5/Headers +${frameworks_dir}/Python.framework/Versions/2.5/Resources +${frameworks_dir}/Python.framework/Versions/2.5/Python diff --git a/packaging/macosx/ports/lang/python26/Portfile b/packaging/macosx/ports/lang/python26/Portfile new file mode 100644 index 000000000..c72cd28d5 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/Portfile @@ -0,0 +1,158 @@ +# $Id: Portfile 49077 2009-04-03 07:13:13Z erickt@macports.org $ + +PortSystem 1.0 +PortGroup select 1.0 + +name python26 +version 2.6.1 +revision 100 +set major [lindex [split $version .] 0] +set branch [join [lrange [split ${version} .] 0 1] .] +categories lang +platforms darwin +maintainers blb mcalhoun + +description An interpreted, object-oriented programming language +long_description Python is an interpreted, interactive, object-oriented \ + programming language. + +homepage http://www.python.org/ +master_sites ${homepage}/ftp/python/${version}/ \ + ftp://ftp.python.org/pub/python/${version}/ + +distname Python-${version} +use_bzip2 yes + +checksums md5 e81c2f0953aa60f8062c05a4673f2be0 \ + sha1 419f0cb29e9713ea861dde8c43d107c51329e57b \ + rmd160 497dafaca9c150fca611b0175eeb13c2fc4d3e2d + +# patch-Lib-distutils-dist.py.diff comes from +# <http://bugs.python.org/issue1180> +patchfiles patch-Makefile.pre.in.diff \ + patch-setup.py.diff \ + patch-Lib-cgi.py.diff \ + patch-Lib-distutils-dist.py.diff \ + patch-Mac-IDLE-Makefile.in.diff \ + patch-Mac-Makefile.in.diff \ + patch-Mac-PythonLauncher-Makefile.in.diff \ + patch-Mac-Tools-Doc-setup.py.diff + +depends_lib port:gettext port:zlib port:openssl port:tk \ + port:sqlite3 port:db46 port:ncurses port:gdbm \ + port:bzip2 port:readline + +configure.args --enable-framework=${frameworks_dir} \ + --enable-ipv6 + +use_parallel_build no + +post-patch { + reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Lib/cgi.py + reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|g" \ + ${worksrcpath}/Mac/Makefile.in ${worksrcpath}/Mac/IDLE/Makefile.in \ + ${worksrcpath}/Mac/Tools/Doc/setup.py \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in + + # See http://trac.macports.org/changeset/37861 + reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \ + ${worksrcpath}/Mac/PythonLauncher/Makefile.in +} + +build.target all + +test.run yes +test.target test + +destroot.target frameworkinstall maninstall + +# ensure that correct compiler is used +build.args-append MAKE="${build.cmd} CC=${configure.cc}" +destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}" + +select.group python +select.file ${filespath}/python[string map {. {}} ${branch}] + +post-destroot { + set framewpath ${frameworks_dir}/Python.framework + set framewdir ${framewpath}/Versions/${branch} + + foreach dir { Headers Resources Python Versions/Current } { + file delete ${destroot}${framewpath}/${dir} + } + + ln -s ${framewdir}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1 + + # Without this, LINKFORSHARED is set to + # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) + # (this becomes Python.framework/Versions/2.6/Python) which doesn't + # quite work (see ticket #15099); instead specifically list the + # full path to the proper Python framework file (which becomes + # ${prefix}/Library/Frameworks/Python.framework/Versions/2.6/Python) + reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile + + # The framework version.plist isn't currently being installed so + # we'll copy ours for now (see http://trac.macports.org/ticket/18773 and + # http://bugs.python.org/issue4937) + xinstall -m 644 ${filespath}/version.plist \ + ${destroot}${framewdir}/Resources/version.plist +} + +post-activate { + ui_msg "\nTo fully complete your installation and make python $branch the default, please run +\n\tsudo port install python_select \ +\n\tsudo python_select $name\n" +} + +platform darwin { + post-configure { + # See http://trac.macports.org/ticket/18376 + system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed" + } +} + +platform darwin 7 { + # there is no SystemStubs on 10.3 + post-patch { + reinplace "s|-lSystemStubs||g" ${worksrcpath}/configure \ + ${worksrcpath}/configure.in + } + post-configure { + reinplace "s|-lSystemStubs||g" ${worksrcpath}/Makefile.pre.in \ + ${worksrcpath}/Makefile.pre ${worksrcpath}/Makefile + } + # To avoid GCC incompatibility issue. See http://nxg.me.uk/note/2004/restFP/ (by ebgssth at gmail.com, ticket #13322) + configure.ldflags-append "-lcc_dynamic" +} + +platform darwin 10 { + configure.compiler gcc-4.2 +} + +variant universal { + post-patch { + set universal_arch_flags {} + set arch_run_32bit {} + foreach arch ${universal_archs} { + lappend universal_arch_flags -arch ${arch} + if { ${arch}=="i386" || ${arch}=="ppc" } { + lappend arch_run_32bit -${arch} + } + } + reinplace \ + "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \ + ${worksrcpath}/configure + reinplace \ + "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \ + ${worksrcpath}/configure + } + configure.args-append --enable-universalsdk=${universal_sysroot} +} + +variant ucs4 description {Enable support for UCS4} { + configure.args-append --enable-unicode=ucs4 +} + +#livecheck.check regex +#livecheck.url ${homepage}download/releases/ +#livecheck.regex Python (${branch}(?:\\.\\d+)*) diff --git a/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff b/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff new file mode 100644 index 000000000..fb861bc82 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff @@ -0,0 +1,18 @@ +--- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200 ++++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200 +@@ -1,13 +1,6 @@ +-#! /usr/local/bin/python ++#! @@PREFIX@@/bin/python2.6 + +-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is +-# intentionally NOT "/usr/bin/env python". On many systems +-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI +-# scripts, and /usr/local/bin is the default directory where Python is +-# installed, so /usr/bin/env would be unable to find python. Granted, +-# binary installations by Linux vendors often install Python in +-# /usr/bin. So let those vendors patch cgi.py to match their choice +-# of installation. ++# NOTE: /usr/local/bin/python patched for MacPorts installation + + """Support module for CGI (Common Gateway Interface) scripts. + diff --git a/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff b/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff new file mode 100644 index 000000000..45276c555 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff @@ -0,0 +1,51 @@ +--- Lib/distutils/dist.py.orig 2008-09-03 05:13:56.000000000 -0600 ++++ Lib/distutils/dist.py 2008-10-03 18:33:47.000000000 -0600 +@@ -60,6 +60,7 @@ + ('quiet', 'q', "run quietly (turns verbosity off)"), + ('dry-run', 'n', "don't actually do anything"), + ('help', 'h', "show detailed help message"), ++ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'), + ] + + # 'common_usage' is a short (2-3 line) string describing the common +@@ -267,6 +268,12 @@ + else: + sys.stderr.write(msg + "\n") + ++ # no-user-cfg is handled before other command line args ++ # because other args override the config files, and this ++ # one is needed before we can load the config files. ++ # If attrs['script_args'] wasn't passed, assume false. ++ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or []) ++ + self.finalize_options() + + # __init__ () +@@ -327,6 +334,9 @@ + Distutils __inst__.py file lives), a file in the user's home + directory named .pydistutils.cfg on Unix and pydistutils.cfg + on Windows/Mac, and setup.cfg in the current directory. ++ ++ The file in the user's home directory can be disabled with the ++ --no-user-cfg option. + """ + files = [] + check_environ() +@@ -347,7 +357,7 @@ + + # And look for the user config file + user_file = os.path.join(os.path.expanduser('~'), user_filename) +- if os.path.isfile(user_file): ++ if self.want_user_cfg and os.path.isfile(user_file): + files.append(user_file) + + # All platforms support local setup.cfg +@@ -355,6 +365,8 @@ + if os.path.isfile(local_file): + files.append(local_file) + ++ if DEBUG: ++ print "using config files: %s" % ', '.join(files) + return files + + # find_config_files () diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff new file mode 100644 index 000000000..bafcf4715 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff @@ -0,0 +1,11 @@ +--- Mac/IDLE/Makefile.in.orig 2008-07-17 23:48:03.000000000 -0600 ++++ Mac/IDLE/Makefile.in 2008-10-04 19:50:50.000000000 -0600 +@@ -22,7 +22,7 @@ + + BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py + +-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) ++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION) + + all: IDLE.app + diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff new file mode 100644 index 000000000..cfa5f88ff --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff @@ -0,0 +1,11 @@ +--- Mac/Makefile.in.orig 2008-07-22 01:06:33.000000000 -0600 ++++ Mac/Makefile.in 2008-10-04 19:51:40.000000000 -0600 +@@ -18,7 +18,7 @@ + + # These are normally glimpsed from the previous set + bindir=$(prefix)/bin +-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) ++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION) + APPINSTALLDIR=$(prefix)/Resources/Python.app + + # Variables for installing the "normal" unix binaries diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff new file mode 100644 index 000000000..be74da903 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff @@ -0,0 +1,11 @@ +--- Mac/PythonLauncher/Makefile.in.orig 2008-05-02 13:58:56.000000000 -0600 ++++ Mac/PythonLauncher/Makefile.in 2008-10-04 19:52:27.000000000 -0600 +@@ -21,7 +21,7 @@ + + BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py + +-PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION) ++PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION) + OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o + + all: Python\ Launcher.app diff --git a/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff b/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff new file mode 100644 index 000000000..63e4e11d2 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff @@ -0,0 +1,11 @@ +--- Mac/Tools/Doc/setup.py.diff 2008-03-29 09:24:25.000000000 -0600 ++++ Mac/Tools/Doc/setup.py 2008-10-04 19:53:40.000000000 -0600 +@@ -30,7 +30,7 @@ + + MAJOR_VERSION='2.4' + MINOR_VERSION='2.4.1' +-DESTDIR='/Applications/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION ++DESTDIR='@@APPLICATIONS_DIR@@/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION + + class DocBuild(build): + def initialize_options(self): diff --git a/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff b/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff new file mode 100644 index 000000000..60cd69706 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff @@ -0,0 +1,31 @@ +--- Makefile.pre.in.orig 2008-06-19 20:47:03.000000000 -0600 ++++ Makefile.pre.in 2008-07-28 19:57:15.000000000 -0600 +@@ -394,8 +394,8 @@ + # Build the shared modules + sharedmods: $(BUILDPYTHON) + @case $$MAKEFLAGS in \ +- *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \ +- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ ++ *s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \ ++ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \ + esac + + # Build static library +@@ -993,7 +993,7 @@ + # Install the dynamically loadable modules + # This goes into $(exec_prefix) + sharedinstall: +- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ ++ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --install-platlib=$(DESTSHARED) \ +@@ -1073,7 +1073,7 @@ + # This installs a few of the useful scripts in Tools/scripts + scriptsinstall: + SRCDIR=$(srcdir) $(RUNSHARED) \ +- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ ++ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \ + --prefix=$(prefix) \ + --install-scripts=$(BINDIR) \ + --root=/$(DESTDIR) diff --git a/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff b/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff new file mode 100644 index 000000000..3acb4ac2b --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff @@ -0,0 +1,16 @@ +--- setup.py.orig 2008-09-29 18:15:45.000000000 -0600 ++++ setup.py 2008-11-30 23:13:09.000000000 -0700 +@@ -1506,13 +1506,7 @@ + def detect_tkinter(self, inc_dirs, lib_dirs): + # The _tkinter module. + +- # Rather than complicate the code below, detecting and building +- # AquaTk is a separate method. Only one Tkinter will be built on +- # Darwin - either AquaTk, if it is found, or X11 based Tk. + platform = self.get_platform() +- if (platform == 'darwin' and +- self.detect_tkinter_darwin(inc_dirs, lib_dirs)): +- return + + # Assume we haven't found any of the libraries or include files + # The versions with dots are used on Unix, and the versions without diff --git a/packaging/macosx/ports/lang/python26/files/pyconfig.ed b/packaging/macosx/ports/lang/python26/files/pyconfig.ed new file mode 100644 index 000000000..671d0d560 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/pyconfig.ed @@ -0,0 +1,2 @@ +g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */, +w diff --git a/packaging/macosx/ports/lang/python26/files/python26 b/packaging/macosx/ports/lang/python26/files/python26 new file mode 100644 index 000000000..5be5fa655 --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/python26 @@ -0,0 +1,12 @@ +bin/python2.6 +bin/pythonw2.6 +bin/python2.6-config +bin/idle2.6 +bin/pydoc2.6 +bin/smtpd2.6.py +- +share/man/man1/python2.6.1.gz +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6 +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Headers +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Resources +${frameworks_dir}/Library/Frameworks/Python.framework/Versions/2.6/Python diff --git a/packaging/macosx/ports/lang/python26/files/version.plist b/packaging/macosx/ports/lang/python26/files/version.plist new file mode 100644 index 000000000..acdfe5bac --- /dev/null +++ b/packaging/macosx/ports/lang/python26/files/version.plist @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildVersion</key> + <string>1</string> + <key>CFBundleShortVersionString</key> + <string>2.6.1</string> + <key>CFBundleVersion</key> + <string>2.6.1</string> + <key>ProjectName</key> + <string>Python</string> + <key>SourceVersion</key> + <string>2.6.1</string> +</dict> +</plist> diff --git a/packaging/macosx/ports/python/py-Pillow/Portfile b/packaging/macosx/ports/python/py-Pillow/Portfile new file mode 100644 index 000000000..6935fab95 --- /dev/null +++ b/packaging/macosx/ports/python/py-Pillow/Portfile @@ -0,0 +1,74 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 124123 2014-08-19 13:57:18Z stromnov@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py-Pillow +version 2.5.3 +revision 100 +categories-append devel +platforms darwin +license BSD + +python.versions 26 27 32 33 34 + +maintainers stromnov openmaintainer + +description Python Imaging Library (fork) + +long_description ${description} + +homepage http://github.com/python-imaging/Pillow +master_sites http://pypi.python.org/packages/source/P/Pillow/ + +distname Pillow-${version} + +checksums rmd160 f10cda34a62022edf3bfe626096b6bc009a74dc8 \ + sha256 62ff6c6cb88d4a1d6e856315b1691186b06cb923f18fde86d6abac9eeb9096d1 + +if {${name} ne ${subport}} { + use_zip yes + + conflicts py${python.version}-pil + + depends_build port:py${python.version}-setuptools + depends_lib-append \ + port:zlib \ + port:jpeg \ + port:tiff \ + port:lcms \ + port:webp \ + port:openjpeg \ + port:freetype + + patchfiles patch-setup.py.diff + + post-patch { + reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py + } + + livecheck.type none +} else { + livecheck.type regex + livecheck.url ${master_sites} + livecheck.regex {Pillow-(\d+(?:\.\d+)*)\.[tz]} +} + +variant quartz conflicts x11 tkinter { + # tkinter doesn't build +} + +variant x11 conflicts quartz { + # tkinter does build +} + +variant tkinter description {with tkinter support} { + if {$subport != $name} { + depends_lib-append port:py${python.version}-tkinter + } +} + +if { ![variant_isset quartz] } { + default_variants-append +tkinter +} diff --git a/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff b/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff new file mode 100644 index 000000000..fe300cfe5 --- /dev/null +++ b/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff @@ -0,0 +1,120 @@ +--- setup.py.orig 2014-07-04 17:25:36.000000000 +0200 ++++ setup.py 2014-07-04 17:33:05.000000000 +0200 +@@ -19,7 +19,7 @@ + from setuptools import Extension, setup, find_packages + + # monkey patch import hook. Even though flake8 says it's not used, it is. +-# comment this out to disable multi threaded builds. ++# comment this out to disable multi threaded builds. + import mp_compile + + _IMAGING = ( +@@ -200,44 +200,8 @@ + "/usr/lib", "python%s" % sys.version[:3], "config")) + + elif sys.platform == "darwin": +- # attempt to make sure we pick freetype2 over other versions +- _add_directory(include_dirs, "/sw/include/freetype2") +- _add_directory(include_dirs, "/sw/lib/freetype2/include") +- # fink installation directories +- _add_directory(library_dirs, "/sw/lib") +- _add_directory(include_dirs, "/sw/include") +- # darwin ports installation directories +- _add_directory(library_dirs, "/opt/local/lib") +- _add_directory(include_dirs, "/opt/local/include") +- +- # if Homebrew is installed, use its lib and include directories +- import subprocess +- try: +- prefix = subprocess.check_output( +- ['brew', '--prefix'] +- ).strip().decode('latin1') +- except: +- # Homebrew not installed +- prefix = None +- +- ft_prefix = None +- +- if prefix: +- # add Homebrew's include and lib directories +- _add_directory(library_dirs, os.path.join(prefix, 'lib')) +- _add_directory(include_dirs, os.path.join(prefix, 'include')) +- ft_prefix = os.path.join(prefix, 'opt', 'freetype') +- +- if ft_prefix and os.path.isdir(ft_prefix): +- # freetype might not be linked into Homebrew's prefix +- _add_directory(library_dirs, os.path.join(ft_prefix, 'lib')) +- _add_directory( +- include_dirs, os.path.join(ft_prefix, 'include')) +- else: +- # fall back to freetype from XQuartz if +- # Homebrew's freetype is missing +- _add_directory(library_dirs, "/usr/X11/lib") +- _add_directory(include_dirs, "/usr/X11/include") ++ _add_directory(library_dirs, "@prefix@/lib") ++ _add_directory(include_dirs, "@prefix@/include") + + elif sys.platform.startswith("linux"): + arch_tp = (plat.processor(), plat.architecture()[0]) +@@ -337,21 +301,6 @@ + else: + TCL_ROOT = None + +- # add standard directories +- +- # look for tcl specific subdirectory (e.g debian) +- if _tkinter: +- tcl_dir = "/usr/include/tcl" + TCL_VERSION +- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): +- _add_directory(include_dirs, tcl_dir) +- +- # standard locations +- _add_directory(library_dirs, "/usr/local/lib") +- _add_directory(include_dirs, "/usr/local/include") +- +- _add_directory(library_dirs, "/usr/lib") +- _add_directory(include_dirs, "/usr/include") +- + # on Windows, look for the OpenJPEG libraries in the location that + # the official installer puts them + if sys.platform == "win32": +@@ -410,7 +359,7 @@ + for directory in self.compiler.include_dirs: + try: + listdir = os.listdir(directory) +- except Exception: ++ except Exception: + # WindowsError, FileNotFoundError + continue + for name in listdir: +@@ -570,29 +519,7 @@ + exts.append(Extension( + "PIL._webp", ["_webp.c"], libraries=libs, define_macros=defs)) + +- if sys.platform == "darwin": +- # locate Tcl/Tk frameworks +- frameworks = [] +- framework_roots = [ +- "/Library/Frameworks", +- "/System/Library/Frameworks"] +- for root in framework_roots: +- if ( +- os.path.exists(os.path.join(root, "Tcl.framework")) and +- os.path.exists(os.path.join(root, "Tk.framework"))): +- print("--- using frameworks at %s" % root) +- frameworks = ["-framework", "Tcl", "-framework", "Tk"] +- dir = os.path.join(root, "Tcl.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 0) +- dir = os.path.join(root, "Tk.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 1) +- break +- if frameworks: +- exts.append(Extension( +- "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], +- extra_compile_args=frameworks, extra_link_args=frameworks)) +- feature.tcl = feature.tk = 1 # mark as present +- elif feature.tcl and feature.tk: ++ if feature.tcl and feature.tk: + exts.append(Extension( + "PIL._imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], + libraries=[feature.tcl, feature.tk])) diff --git a/packaging/macosx/ports/python/py-sk1libs/Portfile b/packaging/macosx/ports/python/py-sk1libs/Portfile new file mode 100644 index 000000000..0c152ce8c --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/Portfile @@ -0,0 +1,64 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup python 1.0 + +name py-sk1libs +version 0.9.1 +revision 101 +license LGPL-2 +maintainers nomaintainer +categories python graphics +platforms darwin +homepage http://sk1project.org/ + +description Set of python non-GUI extensions for sK1 Project + +long_description \ + sk1libs is a set of python non-GUI extensions for sK1 Project. \ + The package includes multiplatform non-GUI extensions which are \ + usually native extensions. + +distname sk1libs-${version} +# MacPorts does not properly support URLs with a get parameter. +# Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams +master_sites http://sk1project.org/dc.php?target=${distfiles}&dummy= + +checksums md5 e18088bbc8a105e7535a96f40b80f284 \ + sha1 dd948558128bb6547b1f277087bf3066104912da \ + rmd160 38f22205e0b5b6078e31ec6dc4c1d93845533046 + +python.versions 25 26 27 + +if {$subport != $name} { + + depends_lib-append \ + port:freetype \ + port:jpeg \ + port:lcms \ + port:zlib + + depends_run-append \ + port:py${python.version}-pil + + variant Pillow { + depends_run-delete port:py${python.version}-pil + depends_run-append port:py${python.version}-Pillow + } + + patchfiles \ + patch-src-utils-fs.py.diff \ + patch-src-imaging-libimagingft-_imagingft.c.diff + + post-patch { + reinplace "s|'/usr/include/freetype2'|'${prefix}/include/freetype2'|g" ${worksrcpath}/setup.py + reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/src/utils/fs.py + } +} + +default_variants +Pillow + +livecheck.type regex +livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download +livecheck.regex "sk1libs-(\\d+(?:\\.\\d+)*)${extract.suffix}" diff --git a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff new file mode 100644 index 000000000..1d69461a3 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff @@ -0,0 +1,16 @@ +--- src/imaging/libimagingft/_imagingft.c.orig 2014-07-13 00:37:57.000000000 +0200 ++++ src/imaging/libimagingft/_imagingft.c 2014-07-13 00:41:08.000000000 +0200 +@@ -70,7 +70,13 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++/* freetype 2.1 and newer */ ++#include FT_ERRORS_H ++#else ++/* freetype 2.0 */ + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff new file mode 100644 index 000000000..541935e71 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff @@ -0,0 +1,26 @@ +--- src/utils/fs.py.orig 2010-05-23 12:46:21.000000000 +0200 ++++ src/utils/fs.py 2013-01-18 15:40:02.000000000 +0100 +@@ -220,8 +220,14 @@ + finally: + _winreg.CloseKey( k ) + if system.get_os_family()==system.MACOSX: +- #FIXME: It's a stub. The paths should be more exact. +- return ['/',] ++ return ['__PREFIX__/share/fonts', ++ '/usr/share/fonts', ++ '/opt/X11/lib/X11/fonts', ++ '/System/Library/Fonts', ++ '/Network/Library/Fonts', ++ '/Library/Fonts', ++ os.path.expanduser("~/Library/Fonts"), ++ os.path.expanduser("~/.fonts")] + + + DIRECTORY_OBJECT=0 +@@ -311,4 +317,4 @@ + if __name__ == '__main__': + _test() + +- +\ No newline at end of file ++ diff --git a/packaging/macosx/ports/python/py-uniconvertor/Portfile b/packaging/macosx/ports/python/py-uniconvertor/Portfile new file mode 100644 index 000000000..2c4a22ca0 --- /dev/null +++ b/packaging/macosx/ports/python/py-uniconvertor/Portfile @@ -0,0 +1,46 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id$ + +PortSystem 1.0 +PortGroup python 1.0 + +name py-uniconvertor +version 1.1.5 +revision 100 +license LGPL-2 GPL-2 +maintainers nomaintainer +categories python graphics +platforms darwin +homepage http://sk1project.org/modules.php?name=Products&product=uniconvertor + +description universal vector graphics translator. + +long_description \ + UniConvertor is a universal vector graphics translator. It is a command \ + line tool which uses sK1 object model to convert one format to another. \ + Supported input formats include CorelDraw v7-X4 (CDR/CDT/CCX/CDRX/CMX), \ + Adobe Illustrator v5-9 (AI), PS, EPS, CGM, WMF, XFIG, SVG, SK, SK1, AFF. \ + Supported output formats include Adobe Illustrator AI, PS, CGM, WMF, \ + SVG, SK, SK1, PDF. + +distname uniconvertor-${version} +# MacPorts does not properly support URLs with a get parameter. +# Workaround for this bug: https://trac.macports.org/wiki/PortfileRecipes#fetchwithgetparams +master_sites http://sk1project.org/dc.php?target=${distfiles}&dummy= + +checksums md5 d1272315a58304ece2ff588834e23f72 \ + sha1 51ec7c4487048c3357ed95cdb4ab3524018a2c9e \ + rmd160 86211bdb7b7af7611a9db4a2e2f6101995af6850 + +python.versions 25 26 27 + +if {$subport != $name} { + + depends_lib-append \ + port:py${python.version}-sk1libs + +} + +livecheck.type regex +livecheck.url http://sk1project.org/modules.php?name=Products&product=uniconvertor&op=download +livecheck.regex "uniconvertor-(\\d+(?:\\.\\d+)*)${extract.suffix}" diff --git a/packaging/macosx/ports/python/py25-Pillow/Portfile b/packaging/macosx/ports/python/py25-Pillow/Portfile new file mode 100644 index 000000000..aa74a06ad --- /dev/null +++ b/packaging/macosx/ports/python/py25-Pillow/Portfile @@ -0,0 +1,77 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 104088 2013-03-15 14:39:56Z stromnov@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py25-Pillow +set real_name py-Pillow +version 1.7.8 +revision 100 +categories-append devel +platforms darwin +license BSD + +python.versions 25 +python.version 25 + +maintainers stromnov openmaintainer + +description Python Imaging Library (fork) + +long_description ${description} + +homepage http://github.com/python-imaging/Pillow +master_sites http://pypi.python.org/packages/source/P/Pillow/ + +distname Pillow-${version} +use_zip yes + +checksums rmd160 e52cec02d943951a80d30b32b1764cb3ae87b283 \ + sha256 907f5342b1df1d277dcc10df2aeabc61099e5a07e0676b9fcd1bb7379890c0ee + +if {$subport == $name} { + conflicts py${python.version}-pil + + depends_build port:py${python.version}-setuptools + depends_lib-append \ + port:zlib \ + port:jpeg \ + port:tiff \ + port:lcms \ + port:webp \ + port:freetype + + patchfiles patch-setup.py-v1.7.8.diff \ + patch-_imagingft.c.diff + + post-patch { + reinplace "s|@prefix@|${prefix}|g" ${worksrcpath}/setup.py + } + + livecheck.type none +#} else { +# livecheck.type regex +# livecheck.url ${master_sites} +# livecheck.regex "Pillow-(\\d+(?:\\.\\d+)*)${extract.suffix}" +} + +variant quartz conflicts x11 tkinter { + # tkinter doesn't build +} + +variant x11 conflicts quartz { + # tkinter does build +} + +variant tkinter description {with tkinter support} { + if {$subport == $name} { + depends_lib-append port:py${python.version}-tkinter + } +} + +#if { ![variant_isset quartz] } { +# default_variants-append +tkinter +#} + +default_variants -tkinter diff --git a/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff b/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff new file mode 100644 index 000000000..99f72a8c9 --- /dev/null +++ b/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff @@ -0,0 +1,14 @@ +--- _imagingft.c.orig 2013-11-27 16:07:53.000000000 +0400 ++++ _imagingft.c 2013-11-27 16:12:01.000000000 +0400 +@@ -70,7 +70,11 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++#include FT_ERRORS_H ++#else + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff b/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff new file mode 100644 index 000000000..2f4b797f6 --- /dev/null +++ b/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff @@ -0,0 +1,83 @@ +--- setup.py.orig 2014-09-02 02:51:22.000000000 +0200 ++++ setup.py 2014-09-02 02:53:51.000000000 +0200 +@@ -100,18 +100,9 @@ + "/usr/lib", "python%s" % sys.version[:3], "config")) + + elif sys.platform == "darwin": +- # attempt to make sure we pick freetype2 over other versions +- _add_directory(include_dirs, "/sw/include/freetype2") +- _add_directory(include_dirs, "/sw/lib/freetype2/include") +- # fink installation directories +- _add_directory(library_dirs, "/sw/lib") +- _add_directory(include_dirs, "/sw/include") + # darwin ports installation directories +- _add_directory(library_dirs, "/opt/local/lib") +- _add_directory(include_dirs, "/opt/local/include") +- # freetype2 ships with X11 +- _add_directory(library_dirs, "/usr/X11/lib") +- _add_directory(include_dirs, "/usr/X11/include") ++ _add_directory(library_dirs, "@prefix@/lib") ++ _add_directory(include_dirs, "@prefix@/include") + + elif sys.platform.startswith("linux"): + if platform.processor() == "x86_64": +@@ -126,9 +117,6 @@ + # work ;-) + self.add_multiarch_paths() + +- _add_directory(library_dirs, "/usr/local/lib") +- # FIXME: check /opt/stuff directories here? +- + prefix = sysconfig.get_config_var("prefix") + if prefix: + _add_directory(library_dirs, os.path.join(prefix, "lib")) +@@ -180,19 +168,6 @@ + # + # add standard directories + +- # look for tcl specific subdirectory (e.g debian) +- if _tkinter: +- tcl_dir = "/usr/include/tcl" + TCL_VERSION +- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): +- _add_directory(include_dirs, tcl_dir) +- +- # standard locations +- _add_directory(library_dirs, "/usr/local/lib") +- _add_directory(include_dirs, "/usr/local/include") +- +- _add_directory(library_dirs, "/usr/lib") +- _add_directory(include_dirs, "/usr/include") +- + # + # insert new dirs *before* default libs, to avoid conflicts + # between Python PYD stub libs and real libraries +@@ -307,28 +282,7 @@ + exts.append(Extension( + "_imagingcms", ["_imagingcms.c"], libraries=["lcms"] + extra)) + +- if sys.platform == "darwin": +- # locate Tcl/Tk frameworks +- frameworks = [] +- framework_roots = [ +- "/Library/Frameworks", +- "/System/Library/Frameworks"] +- for root in framework_roots: +- if (os.path.exists(os.path.join(root, "Tcl.framework")) and +- os.path.exists(os.path.join(root, "Tk.framework"))): +- print("--- using frameworks at %s" % root) +- frameworks = ["-framework", "Tcl", "-framework", "Tk"] +- dir = os.path.join(root, "Tcl.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 0) +- dir = os.path.join(root, "Tk.framework", "Headers") +- _add_directory(self.compiler.include_dirs, dir, 1) +- break +- if frameworks: +- exts.append(Extension( +- "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], +- extra_compile_args=frameworks, extra_link_args=frameworks)) +- feature.tcl = feature.tk = 1 # mark as present +- elif feature.tcl and feature.tk: ++ if feature.tcl and feature.tk: + exts.append(Extension( + "_imagingtk", ["_imagingtk.c", "Tk/tkImaging.c"], + libraries=[feature.tcl, feature.tk])) diff --git a/packaging/macosx/ports/python/py25-lxml/Portfile b/packaging/macosx/ports/python/py25-lxml/Portfile new file mode 100644 index 000000000..49a753cd1 --- /dev/null +++ b/packaging/macosx/ports/python/py25-lxml/Portfile @@ -0,0 +1,51 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 121661 2014-07-03 17:50:11Z mf2k@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py25-lxml +version 3.3.5 +revision 0 +categories-append devel +platforms darwin +license BSD + +python.versions 25 + +maintainers gmail.com:dbraband openmaintainer + +description Powerful and Pythonic XML processing library + +long_description lxml is a Pythonic binding for the libxml2 and \ + libxslt libraries. It is unique in that it \ + combines the speed and feature completeness of \ + these libraries with the simplicity of a native \ + Python API, mostly compatible but superior to \ + the well-known ElementTree API. + +homepage http://lxml.de/ +master_sites http://pypi.python.org/packages/source/l/lxml/ + +checksums rmd160 c7ccece50f8d20f5fac44ac1bf8dc0d8a85aa0f9 \ + sha256 6ad6949dc7eea744a30fba77a968dd5910f545220e58bcc813b9df5c793e318a + +distname lxml-${version} + +if {${name} eq ${subport}} { + + revision 100 + + depends_build-append \ + port:py${python.version}-setuptools + + depends_lib-append port:zlib \ + port:libxml2 \ + port:libxslt + + livecheck.type none +} else { + livecheck.type regex + livecheck.url ${master_sites} + livecheck.regex "lxml-(\\d+(?:\\.\\d+)*)${extract.suffix}" +} diff --git a/packaging/macosx/ports/python/py25-nose/Portfile b/packaging/macosx/ports/python/py25-nose/Portfile new file mode 100644 index 000000000..62a60eec5 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/Portfile @@ -0,0 +1,86 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 121661 2014-07-03 17:50:11Z mf2k@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 +PortGroup select 1.0 + +set my_name nose +name py25-${my_name} +version 1.3.1 +categories-append www +license LGPL-2+ +maintainers mcalhoun openmaintainer +description A Python unittest extension. +long_description \ + A unittest extension offering automatic test \ + suite discovery, simplified test authoring, \ + and output capture. Nose provides an alternate \ + test discovery and running process for \ + unittest, one that is intended to mimic the \ + behavior of py.test as much as is reasonably \ + possible without resorting to magic. + +platforms darwin +supported_archs noarch + +homepage http://somethingaboutorange.com/mrl/projects/${my_name} +master_sites http://pypi.python.org/packages/source/n/${my_name}/ +distname ${my_name}-${version} + +checksums md5 672398801ddf5ba745c55c6eed79c5aa \ + rmd160 7bf311d3d54f2ccb372dea331708c475b992ccec \ + sha256 85273b87ab3db9307e3b1452b071e25c1db1cc812bc337d2a97ea0b0cf2ab6ba + +python.versions 25 + +# already installs version-suffixed executables +python.link_binaries no +python.move_binaries no + +depends_run-append port:nosetests_select +if {${name} eq ${subport}} { + + revision 100 + + select.group nosetests + select.file ${filespath}/nosetests${python.version} + + depends_lib port:py${python.version}-setuptools + + post-patch { + reinplace "s|man/man|share/man/man|" ${worksrcpath}/setup.py + + # One of the tests fails if this directory does not exist + file mkdir ${worksrcpath}/functional_tests/support/empty + } + + post-destroot { + if {${python.version} == "24" || ${python.version} == "25"} { + move ${destroot}${prefix}/share/man/man1/nosetests.1 ${destroot}${prefix}/share/man/man1/nosetests${python.branch}.1 + delete ${destroot}${prefix}/bin/nosetests + } else { + ln -s ${python.prefix}/bin/nosetests-${python.branch} ${destroot}${prefix}/bin/ + ln -s ${python.prefix}/share/man/man1/nosetests.1 ${destroot}${prefix}/share/man/man1/nosetests${python.branch}.1 + } + + xinstall -m 644 -W ${worksrcpath} \ + AUTHORS CHANGELOG NEWS README.txt \ + ${destroot}${prefix}/share/doc/${subport} + + file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/${subport}/html + + file delete ${destroot}${prefix}/share/doc/${subport}/examples + file copy ${worksrcpath}/examples ${destroot}${prefix}/share/doc/${subport} + } + + test.run yes + test.cmd ${python.bin} setup.py test + + livecheck.type none + +#} else { +# livecheck.type regex +# livecheck.url ${master_sites} +# livecheck.regex "${my_name}-(\\d+(?:\\.\\d+)*)${extract.suffix}" +} diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests24 b/packaging/macosx/ports/python/py25-nose/files/nosetests24 new file mode 100644 index 000000000..d9a8f4034 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests24 @@ -0,0 +1 @@ +bin/nosetests-2.4 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests25 b/packaging/macosx/ports/python/py25-nose/files/nosetests25 new file mode 100644 index 000000000..95864c283 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests25 @@ -0,0 +1 @@ +bin/nosetests-2.5 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests26 b/packaging/macosx/ports/python/py25-nose/files/nosetests26 new file mode 100644 index 000000000..bb670776f --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests26 @@ -0,0 +1 @@ +bin/nosetests-2.6 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests27 b/packaging/macosx/ports/python/py25-nose/files/nosetests27 new file mode 100644 index 000000000..28c7bfe8c --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests27 @@ -0,0 +1 @@ +bin/nosetests-2.7 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests31 b/packaging/macosx/ports/python/py25-nose/files/nosetests31 new file mode 100644 index 000000000..5ba27a4d5 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests31 @@ -0,0 +1 @@ +bin/nosetests-3.1 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests32 b/packaging/macosx/ports/python/py25-nose/files/nosetests32 new file mode 100644 index 000000000..07bfb86a1 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests32 @@ -0,0 +1 @@ +bin/nosetests-3.2 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests33 b/packaging/macosx/ports/python/py25-nose/files/nosetests33 new file mode 100644 index 000000000..b750d806b --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests33 @@ -0,0 +1 @@ +bin/nosetests-3.3 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests34 b/packaging/macosx/ports/python/py25-nose/files/nosetests34 new file mode 100644 index 000000000..542ffc949 --- /dev/null +++ b/packaging/macosx/ports/python/py25-nose/files/nosetests34 @@ -0,0 +1 @@ +bin/nosetests-3.4 diff --git a/packaging/macosx/ports/python/py25-numpy/Portfile b/packaging/macosx/ports/python/py25-numpy/Portfile new file mode 100644 index 000000000..4575d6293 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/Portfile @@ -0,0 +1,209 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4 +# $Id: Portfile 113172 2013-11-11 10:24:44Z jeremyhu@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 +PortGroup github 1.0 + +github.setup numpy numpy 1.7.1 v +name py25-numpy +revision 1 +dist_subdir ${name}/${version}_1 + +categories-append math +license BSD +platforms darwin +maintainers dh michaelld openmaintainer +description The core utilities for the scientific library scipy for Python +long_description ${description} + +checksums rmd160 16df4216f40b22077e1f14cc41b8c8ae486b45af \ + sha256 14964724915e5fa1ed34d2cdb93eed5a86bc16edd4a1203cf521ad8bbbcb5215 + +python.versions 25 + +if {$subport == $name} { + + revision 100 + + patchfiles patch-f2py_setup.py.diff \ + patch-numpy_distutils_fcompiler___init__.py.diff \ + patch-fcompiler_g95.diff + + depends_lib-append port:fftw-3 \ + port:py${python.version}-nose + + # http://trac.macports.org/ticket/34562 + destroot.env-append \ + CC="${configure.cc}" \ + CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \ + CXX="${configure.cxx}" \ + CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \ + OBJC="${configure.objc}" \ + OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \ + LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]" + + build.env-append ARCHFLAGS="[get_canonical_archflags ld]" + destroot.env-append ARCHFLAGS="[get_canonical_archflags ld]" + + variant atlas description {Use the MacPorts' ATLAS libraries \ + instead of Apple's Accelerate framework} { + build.env-append ATLAS=${prefix}/lib \ + LAPACK=${prefix}/lib \ + BLAS=${prefix}/lib + destroot.env-append ATLAS=${prefix}/lib \ + LAPACK=${prefix}/lib \ + BLAS=${prefix}/lib + depends_lib-append port:atlas + + if {[variant_isset universal]} { + python.set_compiler no + } + } + + # when using ATLAS (whether by default or specified by the user via + # the +atlas variant) ... + set gcc_version "" + if {[variant_isset atlas]} { + + # see if the user has set -gcc4X to disable using MacPorts' + # compiler; if not, either use what the user set (as +gcc4X) or + # default to gcc47. + + variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 \ + description {Use the gcc43 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.3 + } + + variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 gcc48 \ + description {Use the gcc44 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.4 + } + + variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 gcc48 \ + description {Use the gcc45 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.5 + } + + variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 gcc48 \ + description {Use the gcc46 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.6 + } + + variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 gcc48 \ + description {Use the gcc47 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.7 + } + + variant gcc48 conflicts gcc43 gcc44 gcc45 gcc46 gcc47 \ + description {Use the gcc48 compiler (enables fortran linking)} { + configure.compiler macports-gcc-4.8 + } + + if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc48]} { + default_variants +gcc47 + } + + if {[variant_isset gcc43]} { + set gcc_version "4.3" + } elseif {[variant_isset gcc44]} { + set gcc_version "4.4" + } elseif {[variant_isset gcc45]} { + set gcc_version "4.5" + } elseif {[variant_isset gcc46]} { + set gcc_version "4.6" + } elseif {[variant_isset gcc47]} { + set gcc_version "4.7" + } elseif {[variant_isset gcc48]} { + set gcc_version "4.8" + } + + # when using non-Apple GCC for universal install, it can + # create binaries only for the native OS architecture, at + # either 32 or 64 bits. Restrict the supported archs + # accordingly. + if {${os.arch} == "i386"} { + supported_archs i386 x86_64 + } elseif {${os.arch} == "powerpc"} { + supported_archs ppc ppc64 + } + + # include all the correct GCC4X port + depends_lib-append port:gcc[join [split ${gcc_version} "."] ""] + + # force LDFLAGS for correct linking of the linalg module + # for non-Apple GCC compilers + patchfiles-append patch-numpy_linalg_setup.py.diff + + if {${gcc_version} == ""} { + # user specified -gcc4X but +atlas (either as default or + # explicitly); do not allow since it might lead to + # undetermined runtime execution. + return -code error \ +"\n\nWhen using the +atlas variant (either as the default or setting +explicitly), one of the +gcc4X variants must be selected.\n" + } + + } else { + variant universal { + patchfiles-append patch-setup.py.diff + } + } + + post-patch { + reinplace "s|@@MPORTS_PYTHON@@|${python.bin}|" \ + ${worksrcpath}/numpy/f2py/setup.py + + if {[variant_isset universal] && [variant_isset atlas]} { + # Prepare wrappers + file copy -force ${filespath}/wrapper-template \ + ${worksrcpath}/c-wrapper + file copy -force ${filespath}/wrapper-template \ + ${worksrcpath}/f-wrapper + file copy -force ${filespath}/wrapper-template \ + ${worksrcpath}/cxx-wrapper + + reinplace "s|@@@|${configure.cc}|" ${worksrcpath}/c-wrapper + reinplace "s|---|\\\\.c|" ${worksrcpath}/c-wrapper + reinplace "s|&&&|${prefix}|" ${worksrcpath}/c-wrapper + + reinplace "s|@@@|${configure.cxx}|" ${worksrcpath}/cxx-wrapper + reinplace "s#---#(\\\\.C|\\\\.cpp|\\\\.cc)#" \ + ${worksrcpath}/cxx-wrapper + reinplace "s|&&&|${prefix}|" ${worksrcpath}/cxx-wrapper + + reinplace "s|@@@|${configure.f90}|" ${worksrcpath}/f-wrapper + reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper + reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper + + build.env-append CC="${worksrcpath}/c-wrapper" \ + CXX="${worksrcpath}/cxx-wrapper" \ + F77="${worksrcpath}/f-wrapper" \ + F90="${worksrcpath}/f-wrapper" + + destroot.env-append CC="${worksrcpath}/c-wrapper" \ + CXX="${worksrcpath}/cxx-wrapper" \ + F77="${worksrcpath}/f-wrapper" \ + F90="${worksrcpath}/f-wrapper" + } + + if {[variant_isset atlas]} { + # We must link against libSatlas or libTatlas, not libAtlas + if {[file exists ${prefix}/lib/libtatlas.dylib]} { + reinplace -E \ + "s|_lib_atlas = \\\['atlas'\\\]|_lib_atlas = \\\['tatlas'\\\]|" \ + ${worksrcpath}/numpy/distutils/system_info.py + } elseif {[file exists ${prefix}/lib/libsatlas.dylib]} { + reinplace -E \ + "s|_lib_atlas = \\\['atlas'\\\]|_lib_atlas = \\\['satlas'\\\]|" \ + ${worksrcpath}/numpy/distutils/system_info.py + } else { + return -code error "Unable to find Atlas dylibs. Bailing out." + } + } + } + + livecheck.type none +#} else { +# livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}" +} diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff new file mode 100644 index 000000000..5b8f2a28f --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff @@ -0,0 +1,29 @@ +--- numpy/f2py/setup.py.orig 2013-02-10 00:51:36.000000000 +0400 ++++ numpy/f2py/setup.py 2013-03-19 15:27:15.000000000 +0400 +@@ -41,7 +41,7 @@ + config.make_svn_version_py() + + def generate_f2py_py(build_dir): +- f2py_exe = 'f2py'+os.path.basename(sys.executable)[6:] ++ f2py_exe = 'f2py' + if f2py_exe[-4:]=='.exe': + f2py_exe = f2py_exe[:-4] + '.py' + if 'bdist_wininst' in sys.argv and f2py_exe[-3:] != '.py': +@@ -51,7 +51,7 @@ + log.info('Creating %s', target) + f = open(target,'w') + f.write('''\ +-#!/usr/bin/env %s ++#!@@MPORTS_PYTHON@@ + # See http://cens.ioc.ee/projects/f2py2e/ + import os, sys + for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: +@@ -75,7 +75,7 @@ + sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") + sys.exit(1) + main() +-'''%(os.path.basename(sys.executable))) ++''') + f.close() + return target + diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff new file mode 100644 index 000000000..2640a530b --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff @@ -0,0 +1,11 @@ +--- numpy/distutils/fcompiler/__init__.py.orig 2013-03-19 13:35:03.000000000 +0400 ++++ numpy/distutils/fcompiler/__init__.py 2013-03-19 13:35:27.000000000 +0400 +@@ -708,7 +708,7 @@ + ('cygwin.*', ('gnu','intelv','absoft','compaqv','intelev','gnu95','g95')), + ('linux.*', ('gnu95','intel','lahey','pg','absoft','nag','vast','compaq', + 'intele','intelem','gnu','g95','pathf95')), +- ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'g95', 'pg')), ++ ('darwin.*', ('gnu95', 'nag', 'absoft', 'ibm', 'intel', 'gnu', 'pg')), + ('sunos.*', ('sun','gnu','gnu95','g95')), + ('irix.*', ('mips','gnu','gnu95',)), + ('aix.*', ('ibm','gnu','gnu95',)), diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff new file mode 100644 index 000000000..4f73dcfc9 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff @@ -0,0 +1,30 @@ +--- numpy/distutils/fcompiler/__init__.py.orig 2013-10-31 13:24:12.000000000 +0400 ++++ numpy/distutils/fcompiler/__init__.py 2013-10-31 13:45:03.000000000 +0400 +@@ -815,7 +815,7 @@ + return compiler_type + + # Flag to avoid rechecking for Fortran compiler every time +-failed_fcompiler = False ++failed_fcompilers = [] + + def new_fcompiler(plat=None, + compiler=None, +@@ -828,7 +828,8 @@ + platform/compiler combination. + """ + global failed_fcompiler +- if failed_fcompiler: ++ fcompiler_key = (plat, compiler) ++ if fcompiler_key in failed_fcompilers: + return None + + load_all_fcompiler_classes() +@@ -848,7 +849,7 @@ + msg = msg + " Supported compilers are: %s)" \ + % (','.join(fcompiler_class.keys())) + log.warn(msg) +- failed_fcompiler = True ++ failed_fcompilers.append(fcompiler_key) + return None + + compiler = klass(verbose=verbose, dry_run=dry_run, force=force) diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff new file mode 100644 index 000000000..0b06883a4 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff @@ -0,0 +1,10 @@ +--- numpy/linalg/setup.py.orig 2010-09-14 11:44:21.000000000 -0400 ++++ numpy/linalg/setup.py 2010-09-14 11:45:01.000000000 -0400 +@@ -27,6 +27,7 @@ + 'zlapack_lite.c', 'dlapack_lite.c', + 'blas_lite.c', 'dlamch.c', + 'f2c_lite.c','f2c.h'], ++ extra_link_args=['-undefined dynamic_lookup -bundle'], + extra_info = lapack_info + ) + diff --git a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff new file mode 100644 index 000000000..04e3cdd7a --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff @@ -0,0 +1,34 @@ +--- numpy/core/setup.py.orig 2009-04-05 04:09:20.000000000 -0400 ++++ numpy/core/setup.py 2009-04-08 19:53:45.000000000 -0400 +@@ -309,7 +309,14 @@ + if isinstance(d,str): + target_f.write('#define %s\n' % (d)) + else: +- target_f.write('#define %s %s\n' % (d[0],d[1])) ++ if d[0]!='SIZEOF_LONG' and d[0]!='SIZEOF_PY_INTPTR_T': ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++ else: ++ target_f.write('#ifdef __LP64__\n') ++ target_f.write('#define %s %s\n' % (d[0],8)) ++ target_f.write('#else\n') ++ target_f.write('#define %s %s\n' % (d[0],4)) ++ target_f.write('#endif\n') + + # define inline to our keyword, or nothing + target_f.write('#ifndef __cplusplus\n') +@@ -393,7 +393,14 @@ + if isinstance(d,str): + target_f.write('#define %s\n' % (d)) + else: +- target_f.write('#define %s %s\n' % (d[0],d[1])) ++ if d[0]!='NPY_SIZEOF_LONG' and d[0]!='NPY_SIZEOF_PY_INTPTR_T': ++ target_f.write('#define %s %s\n' % (d[0],d[1])) ++ else: ++ target_f.write('#ifdef __LP64__\n') ++ target_f.write('#define %s %s\n' % (d[0],8)) ++ target_f.write('#else\n') ++ target_f.write('#define %s %s\n' % (d[0],4)) ++ target_f.write('#endif\n') + + # define NPY_INLINE to recognized keyword + target_f.write('#define NPY_INLINE %s\n' % inline) diff --git a/packaging/macosx/ports/python/py25-numpy/files/wrapper-template b/packaging/macosx/ports/python/py25-numpy/files/wrapper-template new file mode 100755 index 000000000..48936d107 --- /dev/null +++ b/packaging/macosx/ports/python/py25-numpy/files/wrapper-template @@ -0,0 +1,143 @@ +#!/bin/sh +COMPILER='@@@' +SUFFIX='---' +PREFIX='&&&' +OUTPUT_O='NO' +OUTPUT='' +NAMED_OUTPUT='' +LASTFILE='' +INTEL='NO' +SIZE32='NO' +SIZE64='NO' +NEWARGS='' + +SKIP='NO' + +for arg in $@ +do + if [ $SKIP = 'ARCH' ]; then + # intercept -arch option and set SIZEXX + SKIP='NO' + if [ $arg = 'x86_64' ] || [ $arg = 'ppc64' ]; then + SIZE64='YES' + else + SIZE32='YES' + fi + + # which architecture are we compiling for? + if [ $arg = 'x86_64' ] || [ $arg = 'i386' ]; then + INTEL='YES' + fi + + elif [ $arg = '-arch' ]; then + SKIP='ARCH' + + elif [ $arg = '--version' ]; then + ${COMPILER} --version + exit 0 + + else + NEWARGS+="$arg " + + # if the -c option is given, the output is .o + if [ $arg = '-c' ]; then + OUTPUT_O='YES' + fi + + # if the output file is given by a -o option, record it + if [ $SKIP = 'O' ]; then + SKIP='NO' + NAMED_OUTPUT=$arg + fi + + if [ $arg = '-o' ]; then + SKIP='O' + fi + + # Note each file ending by ${SUFFIX} and remember the last one + # Transform them in .o + if `echo $arg | grep -q "${SUFFIX}$"`; then + LASTFILE=$arg + OUTPUT+=`echo $arg | sed "s/${SUFFIX}/\.o/"` + OUTPUT+=' ' + fi + fi +done + +# What is the output? + +if [ ${NAMED_OUTPUT}"X" != "X" ]; then + OUTPUT=$NAMED_OUTPUT + +elif [ $OUTPUT_O = 'NO' ]; then + # It is an executable whose is name is the LASTFILE without suffix + OUTPUT=`echo ${LASTFILE} | sed "s/${SUFFIX}//"` +fi + +# Othewise, the output is just the ${OUTPUT} variable as computed before + +# For some reason, -dynamiclib and -lpython2.6 are missing when linking +# .so files. Add them, except if -bundle is set (incompatible switches) +if [ `echo $OUTPUT | sed -E 's|.*\.||'` = "so" ] && \ + ! `echo $NEWARGS | grep -q bundle`; then + NEWARGS="${NEWARGS} ${PREFIX}/lib/libpython2.6.dylib -dynamiclib" +fi + +# Now, compile + +if [ $SIZE32 = 'NO' ] && [ $SIZE64 = 'NO' ]; then + # No size indication given, just proceed with default + if `${COMPILER} $NEWARGS`; then + exit 0 + else + exit 1 + fi + +elif [ $SIZE32 = 'YES' ] && [ $SIZE64 = 'NO' ]; then + # 32-bit + if `${COMPILER} -m32 $NEWARGS`; then + exit 0 + else + exit 1 + fi + +elif [ $SIZE32 = 'NO' ] && [ $SIZE64 = 'YES' ]; then + # 64-bit + if `${COMPILER} -m64 $NEWARGS`; then + exit 0 + else + exit 1 + fi + +else + # Universal case + if `${COMPILER} -m32 $NEWARGS`; then + for filename in ${OUTPUT} + do + mv ${filename} ${filename}.32 + done + + if `${COMPILER} -m64 $NEWARGS`; then + for filename in ${OUTPUT} + do + mv ${filename} ${filename}.64 + if [ $INTEL = 'YES' ]; then + lipo -create -arch x86_64 ${filename}.64 \ + -arch i386 ${filename}.32 \ + -output ${filename} + else + lipo -create -arch ppc64 ${filename}.64 \ + -arch ppc ${filename}.32 \ + -output ${filename} + fi + + rm -f ${filename}.32 ${filename}.64 + done + else + exit 1 + fi + else + exit 1 + fi +fi +exit 0 diff --git a/packaging/macosx/ports/python/py25-setuptools/Portfile b/packaging/macosx/ports/python/py25-setuptools/Portfile new file mode 100644 index 000000000..35c528500 --- /dev/null +++ b/packaging/macosx/ports/python/py25-setuptools/Portfile @@ -0,0 +1,58 @@ +# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4 +# $Id: Portfile 123950 2014-08-16 14:24:07Z jmr@macports.org $ + +PortSystem 1.0 +PortGroup python 1.0 + +name py25-setuptools +version 5.7 +categories-append devel +license {PSF ZPL} +maintainers jmr openmaintainer +description distutils enhancement for build and distribution +long_description \ + setuptools is a collection of enhancements to the Python distutils that \ + allow you to more easily build and distribute Python packages, \ + especially ones that have dependencies on other packages. + +platforms darwin +supported_archs noarch + +homepage https://pypi.python.org/pypi/setuptools/ +master_sites https://pypi.python.org/packages/source/s/setuptools/ +distname setuptools-${version} + +checksums md5 81f980854a239d60d074d6ba052e21ed \ + rmd160 ee9eff6c77e6f27e22e2049a6685bb0e624f94b0 \ + sha256 a8bbdb2d67532c5b5cef5ba09553cea45d767378e42c7003347e53ebbe70f482 + +python.versions 25 +python.link_binaries no +python.move_binaries no + +if {$subport eq $name} { + if {${python.version} == 25} { + version 1.4.2 + revision 100 + distname setuptools-${version} + checksums md5 13951be6711438073fbe50843e7f141f \ + rmd160 b48086a2aae718fe433a8c882d2d9209aa157b0a \ + sha256 263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd + } + + post-destroot { + xinstall -m 755 -d ${destroot}${prefix}/share/doc/${subport} + xinstall -m 644 -W ${worksrcpath} CHANGES.txt \ + DEVGUIDE.txt README.txt ${destroot}${prefix}/share/doc/${subport} + if {${python.version} <= 25} { + delete "${destroot}${prefix}/bin/easy_install" + } else { + ln -s "${python.prefix}/bin/easy_install-${python.branch}" "${destroot}${prefix}/bin/" + } + } + livecheck.type none +#} else { +# livecheck.type regex +# livecheck.url ${homepage} +# livecheck.regex setuptools/(\\d+(\\.\\d+)+) +} diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 63581bd8a..cbdaf9d20 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -647,7 +647,31 @@ PdfInput::open(::Inkscape::Extension::Input * /*mod*/, const gchar * uri) { // Initialize the globalParams variable for poppler if (!globalParams) { +#ifdef ENABLE_OSX_APP_LOCATIONS + // + // data files for poppler are not relocatable (loaded from + // path defined at build time). This fails to work with relocatable + // application bundles for OS X. + // + // Workaround: + // 1. define $POPPLER_DATADIR env variable in app launcher script + // 2. pass custom $POPPLER_DATADIR via poppler's GlobalParams() + // + // relevant poppler commit: + // <http://cgit.freedesktop.org/poppler/poppler/commit/?id=869584a84eed507775ff1c3183fe484c14b6f77b> + // + // FIXES: Inkscape bug #956282, #1264793 + // TODO: report RFE upstream (full relocation support for OS X packaging) + // + gchar const *poppler_datadir = g_getenv("POPPLER_DATADIR"); + if (poppler_datadir != NULL) { + globalParams = new GlobalParams(poppler_datadir); + } else { + globalParams = new GlobalParams(); + } +#else globalParams = new GlobalParams(); +#endif // ENABLE_OSX_APP_LOCATIONS } // poppler does not use glib g_open. So on win32 we must use unicode call. code was copied from glib gstdio.c #ifndef WIN32 diff --git a/src/path-prefix.h b/src/path-prefix.h index be57ae354..4c31b629c 100644 --- a/src/path-prefix.h +++ b/src/path-prefix.h @@ -66,23 +66,23 @@ extern "C" { # define CREATE_PALETTESDIR WIN32_DATADIR("create\\swatches") # define CREATE_PATTERNSDIR WIN32_DATADIR("create\\patterns\\vector") # elif defined ENABLE_OSX_APP_LOCATIONS -# define INKSCAPE_APPICONDIR "Contents/Resources/pixmaps" -# define INKSCAPE_ATTRRELDIR "Contents/Resources/attributes" -# define INKSCAPE_BINDDIR "Contents/Resources/bind" -# define INKSCAPE_EXAMPLESDIR "Contents/Resources/examples" -# define INKSCAPE_EXTENSIONDIR "Contents/Resources/extensions" -# define INKSCAPE_FILTERDIR "Contents/Resources/filters" -# define INKSCAPE_GRADIENTSDIR "Contents/Resources/gradients" -# define INKSCAPE_KEYSDIR "Contents/Resources/keys" -# define INKSCAPE_PIXMAPDIR "Contents/Resources/icons" -# define INKSCAPE_MARKERSDIR "Contents/Resources/markers" -# define INKSCAPE_PALETTESDIR "Contents/Resources/palettes" -# define INKSCAPE_PATTERNSDIR "Contents/Resources/patterns" -# define INKSCAPE_SCREENSDIR "Contents/Resources/screens" -# define INKSCAPE_SYMBOLSDIR "Contents/Resources/symbols" -# define INKSCAPE_TUTORIALSDIR "Contents/Resources/tutorials" -# define INKSCAPE_TEMPLATESDIR "Contents/Resources/templates" -# define INKSCAPE_UIDIR "Contents/Resources/ui" +# define INKSCAPE_APPICONDIR "Contents/Resources/share/pixmaps" +# define INKSCAPE_ATTRRELDIR "Contents/Resources/share/inkscape/attributes" +# define INKSCAPE_BINDDIR "Contents/Resources/share/inkscape/bind" +# define INKSCAPE_EXAMPLESDIR "Contents/Resources/share/inkscape/examples" +# define INKSCAPE_EXTENSIONDIR "Contents/Resources/share/inkscape/extensions" +# define INKSCAPE_FILTERDIR "Contents/Resources/share/inkscape/filters" +# define INKSCAPE_GRADIENTSDIR "Contents/Resources/share/inkscape/gradients" +# define INKSCAPE_KEYSDIR "Contents/Resources/share/inkscape/keys" +# define INKSCAPE_PIXMAPDIR "Contents/Resources/share/inkscape/icons" +# define INKSCAPE_MARKERSDIR "Contents/Resources/share/inkscape/markers" +# define INKSCAPE_PALETTESDIR "Contents/Resources/share/inkscape/palettes" +# define INKSCAPE_PATTERNSDIR "Contents/Resources/share/inkscape/patterns" +# define INKSCAPE_SCREENSDIR "Contents/Resources/share/inkscape/screens" +# define INKSCAPE_SYMBOLSDIR "Contents/Resources/share/inkscape/symbols" +# define INKSCAPE_TUTORIALSDIR "Contents/Resources/share/inkscape/tutorials" +# define INKSCAPE_TEMPLATESDIR "Contents/Resources/share/inkscape/templates" +# define INKSCAPE_UIDIR "Contents/Resources/share/inkscape/ui" //CREATE V0.1 support # define CREATE_GRADIENTSDIR "/Library/Application Support/create/gradients/gimp" # define CREATE_PALETTESDIR "/Library/Application Support/create/swatches" |
