diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
| commit | 20124f96375afdfbf8ab58b6090db95ba0d2687b (patch) | |
| tree | 0f7e003dd9707b751c3b51e7b8133a21437ead95 /packaging | |
| parent | Merged. (diff) | |
| parent | Fix build on Windows (see http://inkscape.13.x6.nabble.com/compile-error-on-W... (diff) | |
| download | inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.tar.gz inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.zip | |
Merged.
(bzr r15369.1.5)
Diffstat (limited to 'packaging')
398 files changed, 0 insertions, 11421 deletions
diff --git a/packaging/macosx/README.txt b/packaging/macosx/README.txt deleted file mode 100644 index 463188c06..000000000 --- a/packaging/macosx/README.txt +++ /dev/null @@ -1,31 +0,0 @@ -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 sed -e '$a\'$'\n''+x11 -quartz -no_x11 +rsvg +Pillow -tkinter +gnome_vfs' -i "" "$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 differdeleted file mode 100644 index d070809f1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/application-exit.png +++ /dev/null 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 differdeleted file mode 100644 index df87def2f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/dialog-information.png +++ /dev/null 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 differdeleted file mode 100644 index 7cd94435a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-new.png +++ /dev/null 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 differdeleted file mode 100644 index 61543990d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open-recent.png +++ /dev/null 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 differdeleted file mode 100644 index 476185370..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-open.png +++ /dev/null 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 differdeleted file mode 100644 index 45b44f324..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print-preview.png +++ /dev/null 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 differdeleted file mode 100644 index 5997b9222..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-print.png +++ /dev/null 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 differdeleted file mode 100644 index 65d22e4fb..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-properties.png +++ /dev/null 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 differdeleted file mode 100644 index 026014ca3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index aaea1ff39..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-revert-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 3409adc7a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save-as.png +++ /dev/null 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 differdeleted file mode 100644 index 18b7d2419..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/document-save.png +++ /dev/null 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 differdeleted file mode 100644 index b714d86e2..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/drive-harddisk.png +++ /dev/null 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 differdeleted file mode 100644 index 49ae8db9c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-clear.png +++ /dev/null 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 differdeleted file mode 100644 index 8dd48c494..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-copy.png +++ /dev/null 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 differdeleted file mode 100644 index ff87558fc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-cut.png +++ /dev/null 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 differdeleted file mode 100644 index 2c5a46733..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-delete.png +++ /dev/null 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 differdeleted file mode 100644 index fca34f52a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find-replace.png +++ /dev/null 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 differdeleted file mode 100644 index e9a40950b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-find.png +++ /dev/null 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 differdeleted file mode 100644 index 24588a3a4..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-paste.png +++ /dev/null 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 differdeleted file mode 100644 index f7923083b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 7c6c250b6..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-redo-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index e3bd4ba72..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-select-all.png +++ /dev/null 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 differdeleted file mode 100644 index b0c8a48d7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 13e061e09..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/edit-undo-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 14ed14a12..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder-remote.png +++ /dev/null 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 differdeleted file mode 100644 index 14ed14a12..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/folder.png +++ /dev/null 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 differdeleted file mode 100644 index 776f5767e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 18ededbfc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-less-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index b00e21840..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 015c495ef..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-indent-more-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 57d6a0e35..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-center.png +++ /dev/null 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 differdeleted file mode 100644 index a416b25ab..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-fill.png +++ /dev/null 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 differdeleted file mode 100644 index 9a7abf7ff..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-left.png +++ /dev/null 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 differdeleted file mode 100644 index 15b507332..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-justify-right.png +++ /dev/null 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 differdeleted file mode 100644 index 7e2c5dba9..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-bold.png +++ /dev/null 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 differdeleted file mode 100644 index 867df5ded..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-italic.png +++ /dev/null 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 differdeleted file mode 100644 index 8a844a3a9..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-strikethrough.png +++ /dev/null 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 differdeleted file mode 100644 index 35bcc8127..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/format-text-underline.png +++ /dev/null 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 differdeleted file mode 100644 index 69aaafc2c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-bottom.png +++ /dev/null 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 differdeleted file mode 100644 index dcde30f02..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-down.png +++ /dev/null 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 differdeleted file mode 100644 index 689ba0a96..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index a653e10ed..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-first-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index fadd43dc3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-home.png +++ /dev/null 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 differdeleted file mode 100644 index 0f0f57a1a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 0f03be58d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-jump-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index a653e10ed..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 689ba0a96..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-last-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 5b9e3f0d1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 9e77ac2ea..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-next-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 9e77ac2ea..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 5b9e3f0d1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-previous-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 0a3b1bfba..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-top.png +++ /dev/null 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 differdeleted file mode 100644 index 432225f51..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/go-up.png +++ /dev/null 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 differdeleted file mode 100644 index 0dfa41876..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-caps-lock-warning.png +++ /dev/null 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 differdeleted file mode 100644 index 24233cde0..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-color-picker.png +++ /dev/null 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 differdeleted file mode 100644 index 097969a7c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-connect.png +++ /dev/null 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 differdeleted file mode 100644 index e4d912579..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-convert.png +++ /dev/null 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 differdeleted file mode 100644 index 3dece1068..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-disconnect.png +++ /dev/null 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 differdeleted file mode 100644 index c5da3f9fb..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-edit.png +++ /dev/null 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 differdeleted file mode 100644 index 2514b6167..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-font.png +++ /dev/null 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 differdeleted file mode 100644 index 0967a61c3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-index.png +++ /dev/null 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 differdeleted file mode 100644 index 748bb502d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-landscape.png +++ /dev/null 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 differdeleted file mode 100644 index 94f078d91..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-portrait.png +++ /dev/null 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 differdeleted file mode 100644 index 2a732a6ee..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-landscape.png +++ /dev/null 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 differdeleted file mode 100644 index c79cea355..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-orientation-reverse-portrait.png +++ /dev/null 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 differdeleted file mode 100644 index 61b46d998..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-page-setup.png +++ /dev/null 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 differdeleted file mode 100644 index 9703a40df..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-preferences.png +++ /dev/null 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 differdeleted file mode 100644 index 2c764b374..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-color.png +++ /dev/null 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 differdeleted file mode 100644 index 2514b6167..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-select-font.png +++ /dev/null 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 differdeleted file mode 100644 index cc58d0fb5..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index a312dd854..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/gtk-undelete-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 010d294a7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-about.png +++ /dev/null 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 differdeleted file mode 100644 index 20ae955c3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/help-contents.png +++ /dev/null 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 differdeleted file mode 100644 index 84b26afd6..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/image-missing.png +++ /dev/null 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 differdeleted file mode 100644 index 9cd9e5cf2..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-add.png +++ /dev/null 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 differdeleted file mode 100644 index 0ed9c2210..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/list-remove.png +++ /dev/null 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 differdeleted file mode 100644 index 18b7d2419..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-floppy.png +++ /dev/null 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 differdeleted file mode 100644 index 922f452f1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-optical.png +++ /dev/null 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 differdeleted file mode 100644 index 8b70f471a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-pause.png +++ /dev/null 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 differdeleted file mode 100644 index e7e2584db..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index e3cb29165..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-start-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index c844e8322..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-playback-stop.png +++ /dev/null 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 differdeleted file mode 100644 index 93b2ec100..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-record.png +++ /dev/null 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 differdeleted file mode 100644 index 4972cb7ba..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index a02022474..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-backward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index a02022474..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 4972cb7ba..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-seek-forward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 67dbb2e16..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 08ad0b69a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-backward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 08ad0b69a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 67dbb2e16..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/media-skip-forward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index e74e060ea..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/network-idle.png +++ /dev/null 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 differdeleted file mode 100644 index 934ee68d3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-error.png +++ /dev/null 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 differdeleted file mode 100644 index 8e2ab7487..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-info.png +++ /dev/null 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 differdeleted file mode 100644 index ebd5ac60c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-paused.png +++ /dev/null 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 differdeleted file mode 100644 index 52410c38d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/printer-warning.png +++ /dev/null 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 differdeleted file mode 100644 index d88fed703..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/process-stop.png +++ /dev/null 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 differdeleted file mode 100644 index c9c48d6a3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/system-run.png +++ /dev/null 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 differdeleted file mode 100644 index 7cd94435a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/text-x-generic.png +++ /dev/null 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 differdeleted file mode 100644 index 32dcc2e63..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/tools-check-spelling.png +++ /dev/null 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 differdeleted file mode 100644 index 14ed14a12..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-desktop.png +++ /dev/null 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 differdeleted file mode 100644 index 14ed14a12..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/user-home.png +++ /dev/null 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 differdeleted file mode 100644 index b9e9ea632..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-fullscreen.png +++ /dev/null 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 differdeleted file mode 100644 index e9ea8c4e5..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-refresh.png +++ /dev/null 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 differdeleted file mode 100644 index 49966a996..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-restore.png +++ /dev/null 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 differdeleted file mode 100644 index 3f8fd257f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-ascending.png +++ /dev/null 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 differdeleted file mode 100644 index a8aa70584..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/view-sort-descending.png +++ /dev/null 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 differdeleted file mode 100644 index 52f58630f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/window-close.png +++ /dev/null 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 differdeleted file mode 100644 index adbf7f3a2..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-fit-best.png +++ /dev/null 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 differdeleted file mode 100644 index 6b1b94336..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-in.png +++ /dev/null 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 differdeleted file mode 100644 index 92dddd2ea..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-original.png +++ /dev/null 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 differdeleted file mode 100644 index ddc1eb136..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/16/zoom-out.png +++ /dev/null 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 differdeleted file mode 100644 index afca0732a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-apply.png +++ /dev/null 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 differdeleted file mode 100644 index 0a395c099..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-cancel.png +++ /dev/null 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 differdeleted file mode 100644 index 2a7da6e2a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-no.png +++ /dev/null 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 differdeleted file mode 100644 index c08115f62..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-ok.png +++ /dev/null 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 differdeleted file mode 100644 index e56236638..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/gtk-yes.png +++ /dev/null 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 differdeleted file mode 100644 index a13d1984b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/20/window-close.png +++ /dev/null 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 differdeleted file mode 100644 index 0c9de64ba..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/application-exit.png +++ /dev/null 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 differdeleted file mode 100644 index 7de1e0e4f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-high.png +++ /dev/null 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 differdeleted file mode 100644 index 4152b6c9f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-low.png +++ /dev/null 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 differdeleted file mode 100644 index 8d899cfa5..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-medium.png +++ /dev/null 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 differdeleted file mode 100644 index 6902efdc6..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/audio-volume-muted.png +++ /dev/null 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 differdeleted file mode 100644 index b66871a94..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/dialog-information.png +++ /dev/null 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 differdeleted file mode 100644 index c89e797b7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-new.png +++ /dev/null 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 differdeleted file mode 100644 index 5edf531e3..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open-recent.png +++ /dev/null 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 differdeleted file mode 100644 index 312e1187f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-open.png +++ /dev/null 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 differdeleted file mode 100644 index 7f405de58..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print-preview.png +++ /dev/null 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 differdeleted file mode 100644 index 05d22d7a8..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-print.png +++ /dev/null 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 differdeleted file mode 100644 index 297c86b0c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-properties.png +++ /dev/null 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 differdeleted file mode 100644 index 3046794e7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 46435e1a0..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-revert-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 5da8a02dc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save-as.png +++ /dev/null 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 differdeleted file mode 100644 index 7ef7685f4..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/document-save.png +++ /dev/null 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 differdeleted file mode 100644 index 1be6b6c88..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/drive-harddisk.png +++ /dev/null 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 differdeleted file mode 100644 index 590f673db..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-clear.png +++ /dev/null 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 differdeleted file mode 100644 index a1178e64f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-copy.png +++ /dev/null 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 differdeleted file mode 100644 index 82b105f80..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-cut.png +++ /dev/null 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 differdeleted file mode 100644 index e375b894e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-delete.png +++ /dev/null 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 differdeleted file mode 100644 index ed81e5a82..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find-replace.png +++ /dev/null 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 differdeleted file mode 100644 index 5c83fb689..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-find.png +++ /dev/null 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 differdeleted file mode 100644 index e938c3e99..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-paste.png +++ /dev/null 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 differdeleted file mode 100644 index 3da43f0c0..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index f2c1a50a1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-redo-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 1fc5b8282..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-select-all.png +++ /dev/null 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 differdeleted file mode 100644 index 3b12a233a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 3ba7d6240..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/edit-undo-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 28b68f338..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder-remote.png +++ /dev/null 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 differdeleted file mode 100644 index 28b68f338..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/folder.png +++ /dev/null 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 differdeleted file mode 100644 index 36d231434..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index a6f7dc19b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-less-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 7e3656dc4..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 5527663fd..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-indent-more-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 35579d553..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-center.png +++ /dev/null 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 differdeleted file mode 100644 index eaf9a460b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-fill.png +++ /dev/null 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 differdeleted file mode 100644 index 07db84109..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-left.png +++ /dev/null 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 differdeleted file mode 100644 index 9bbd47ca0..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-justify-right.png +++ /dev/null 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 differdeleted file mode 100644 index 9869fb8b1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-bold.png +++ /dev/null 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 differdeleted file mode 100644 index 8842b5aa7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-italic.png +++ /dev/null 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 differdeleted file mode 100644 index 04d464e28..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-strikethrough.png +++ /dev/null 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 differdeleted file mode 100644 index be0906d8a..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/format-text-underline.png +++ /dev/null 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 differdeleted file mode 100644 index 79994416e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-bottom.png +++ /dev/null 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 differdeleted file mode 100644 index 2a0a8ea2c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-down.png +++ /dev/null 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 differdeleted file mode 100644 index e44f9b612..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 3ba5c4ba7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-first-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index a2e0b3c96..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-home.png +++ /dev/null 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 differdeleted file mode 100644 index 9b639939f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 80068face..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-jump-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 3ba5c4ba7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index e44f9b612..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-last-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 727ff37f2..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 23b89b761..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-next-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 23b89b761..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 727ff37f2..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-previous-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 9b98fd26f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-top.png +++ /dev/null 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 differdeleted file mode 100644 index 3df5fe511..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/go-up.png +++ /dev/null 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 differdeleted file mode 100644 index ca76d509b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-caps-lock-warning.png +++ /dev/null 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 differdeleted file mode 100644 index fd97f343c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-color-picker.png +++ /dev/null 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 differdeleted file mode 100644 index 97f2143fb..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-connect.png +++ /dev/null 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 differdeleted file mode 100644 index da8194fa8..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-convert.png +++ /dev/null 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 differdeleted file mode 100644 index 883a003bc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-disconnect.png +++ /dev/null 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 differdeleted file mode 100644 index f429e1015..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-edit.png +++ /dev/null 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 differdeleted file mode 100644 index cde0e8698..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-font.png +++ /dev/null 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 differdeleted file mode 100644 index 9ddbe9b8e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-index.png +++ /dev/null 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 differdeleted file mode 100644 index fcf7f2a49..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-landscape.png +++ /dev/null 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 differdeleted file mode 100644 index cb7b760bc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-portrait.png +++ /dev/null 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 differdeleted file mode 100644 index 69ade2524..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-landscape.png +++ /dev/null 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 differdeleted file mode 100644 index c309a6d82..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-orientation-reverse-portrait.png +++ /dev/null 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 differdeleted file mode 100644 index 9acf0d5ff..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-page-setup.png +++ /dev/null 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 differdeleted file mode 100644 index 2596f3cc5..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-preferences.png +++ /dev/null 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 differdeleted file mode 100644 index 0e71c35d7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-color.png +++ /dev/null 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 differdeleted file mode 100644 index cde0e8698..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-select-font.png +++ /dev/null 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 differdeleted file mode 100644 index bccc39e7c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 22023b853..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/gtk-undelete-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 063d0df43..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-about.png +++ /dev/null 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 differdeleted file mode 100644 index b00fbd8c1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/help-contents.png +++ /dev/null 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 differdeleted file mode 100644 index 90e26e5bc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/image-missing.png +++ /dev/null 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 differdeleted file mode 100644 index 2f8b70d9c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-add.png +++ /dev/null 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 differdeleted file mode 100644 index 0bd69c92c..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/list-remove.png +++ /dev/null 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 differdeleted file mode 100644 index 7ef7685f4..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-floppy.png +++ /dev/null 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 differdeleted file mode 100644 index c4358f5f8..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-optical.png +++ /dev/null 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 differdeleted file mode 100644 index 6187ba6d2..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-pause.png +++ /dev/null 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 differdeleted file mode 100644 index 0f5348900..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 036f05f55..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-start-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 9e54ef3f5..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-playback-stop.png +++ /dev/null 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 differdeleted file mode 100644 index d1b25c2f1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-record.png +++ /dev/null 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 differdeleted file mode 100644 index 508808285..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 4a1bdf89b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-backward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 4a1bdf89b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 508808285..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-seek-forward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index c3a649f4e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index 3da34257d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-backward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index 3da34257d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-ltr.png +++ /dev/null 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 differdeleted file mode 100644 index c3a649f4e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/media-skip-forward-rtl.png +++ /dev/null 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 differdeleted file mode 100644 index a6f14418b..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/network-idle.png +++ /dev/null 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 differdeleted file mode 100644 index 28517473d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-error.png +++ /dev/null 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 differdeleted file mode 100644 index 13304368e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-info.png +++ /dev/null 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 differdeleted file mode 100644 index da6df48a9..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-paused.png +++ /dev/null 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 differdeleted file mode 100644 index dd70e0be9..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/printer-warning.png +++ /dev/null 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 differdeleted file mode 100644 index 54e1cb3e9..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/process-stop.png +++ /dev/null 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 differdeleted file mode 100644 index 2b11b5075..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/system-run.png +++ /dev/null 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 differdeleted file mode 100644 index c89e797b7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/text-x-generic.png +++ /dev/null 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 differdeleted file mode 100644 index 2574c181f..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/tools-check-spelling.png +++ /dev/null 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 differdeleted file mode 100644 index 28b68f338..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-desktop.png +++ /dev/null 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 differdeleted file mode 100644 index 28b68f338..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/user-home.png +++ /dev/null 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 differdeleted file mode 100644 index 21462fe0e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-fullscreen.png +++ /dev/null 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 differdeleted file mode 100644 index 09b5df1d1..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-refresh.png +++ /dev/null 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 differdeleted file mode 100644 index ff9c2289d..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-restore.png +++ /dev/null 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 differdeleted file mode 100644 index 44c871133..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-ascending.png +++ /dev/null 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 differdeleted file mode 100644 index d498a59a5..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/view-sort-descending.png +++ /dev/null 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 differdeleted file mode 100644 index 312b84dae..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/window-close.png +++ /dev/null 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 differdeleted file mode 100644 index dfbdf9b6e..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-fit-best.png +++ /dev/null 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 differdeleted file mode 100644 index 3a386fae7..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-in.png +++ /dev/null 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 differdeleted file mode 100644 index 499cbd6c6..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-original.png +++ /dev/null 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 differdeleted file mode 100644 index 22afd1951..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/24/zoom-out.png +++ /dev/null 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 differdeleted file mode 100644 index dc09283f4..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd-multiple.png +++ /dev/null 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 differdeleted file mode 100644 index c58e5a6f4..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/32/gtk-dnd.png +++ /dev/null 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 differdeleted file mode 100644 index cb03e5420..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-error.png +++ /dev/null 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 differdeleted file mode 100644 index d73990ecc..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-information.png +++ /dev/null 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 differdeleted file mode 100644 index f81198437..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-password.png +++ /dev/null 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 differdeleted file mode 100644 index 14dbd9cac..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-question.png +++ /dev/null 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 differdeleted file mode 100644 index 827a33918..000000000 --- a/packaging/macosx/Resources-extras/src/icons/stock-icons/48/dialog-warning.png +++ /dev/null diff --git a/packaging/macosx/Resources/Inkscape-Generic.icns b/packaging/macosx/Resources/Inkscape-Generic.icns Binary files differdeleted file mode 100644 index 9843be9a6..000000000 --- a/packaging/macosx/Resources/Inkscape-Generic.icns +++ /dev/null diff --git a/packaging/macosx/Resources/Inkscape.icns b/packaging/macosx/Resources/Inkscape.icns Binary files differdeleted file mode 100644 index 72c0ceddf..000000000 --- a/packaging/macosx/Resources/Inkscape.icns +++ /dev/null diff --git a/packaging/macosx/Resources/MenuBar.nib/classes.nib b/packaging/macosx/Resources/MenuBar.nib/classes.nib deleted file mode 100644 index ea58db118..000000000 --- a/packaging/macosx/Resources/MenuBar.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/Resources/MenuBar.nib/info.nib b/packaging/macosx/Resources/MenuBar.nib/info.nib deleted file mode 100644 index c0f4643ef..000000000 --- a/packaging/macosx/Resources/MenuBar.nib/info.nib +++ /dev/null @@ -1,23 +0,0 @@ -<?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>IBDocumentLocation</key> - <string>99 362 356 240 0 0 1280 832 </string> - <key>IBEditorPositions</key> - <dict> - <key>187</key> - <string>340 374 240 44 0 0 1280 832 </string> - </dict> - <key>IBFramework Version</key> - <string>349.0</string> - <key>IBOpenObjects</key> - <array> - <integer>187</integer> - </array> - <key>IBSystem Version</key> - <string>7F44</string> - <key>targetFramework</key> - <string>IBCarbonFramework</string> -</dict> -</plist> diff --git a/packaging/macosx/Resources/MenuBar.nib/objects.xib b/packaging/macosx/Resources/MenuBar.nib/objects.xib deleted file mode 100644 index 78f0a0a01..000000000 --- a/packaging/macosx/Resources/MenuBar.nib/objects.xib +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<object class="NSIBObjectData"> - <string name="targetFramework">IBCarbonFramework</string> - <object name="rootObject" class="NSCustomObject" id="1"> - <string name="customClass">NSApplication</string> - </object> - <array count="4" name="allObjects"> - <object class="IBCarbonMenu" id="187"> - <string name="title">MenuBar</string> - <array count="1" name="items"> - <object class="IBCarbonMenuItem" id="195"> - <string name="title">ScriptExec</string> - <object name="submenu" class="IBCarbonMenu" id="193"> - <string name="title">ScriptExec</string> - <string name="name">_NSAppleMenu</string> - </object> - </object> - </array> - <string name="name">_NSMainMenu</string> - </object> - <reference idRef="193"/> - <reference idRef="195"/> - <object class="IBCarbonMenuItem" id="204"> - <string name="title">Window</string> - <object name="submenu" class="IBCarbonMenu"> - <string name="title">Window</string> - <array count="5" name="items"> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Minimize Window</string> - <string name="keyEquivalent">m</string> - <ostype name="command">mini</ostype> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Minimize All Windows</string> - <string name="keyEquivalent">m</string> - <int name="keyEquivalentModifier">1572864</int> - <ostype name="command">mini</ostype> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Bring All to Front</string> - <ostype name="command">frnt</ostype> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Bring in Front</string> - <int name="keyEquivalentModifier">1572864</int> - <ostype name="command">frnt</ostype> - </object> - </array> - <string name="name">_NSWindowsMenu</string> - </object> - </object> - </array> - <array count="4" name="allParents"> - <reference idRef="1"/> - <reference idRef="195"/> - <reference idRef="187"/> - <reference idRef="187"/> - </array> - <dictionary count="2" name="nameTable"> - <string>File's Owner</string> - <reference idRef="1"/> - <string>MenuBar</string> - <reference idRef="187"/> - </dictionary> - <unsigned_int name="nextObjectID">206</unsigned_int> -</object> diff --git a/packaging/macosx/Resources/ProgressWindow.nib/classes.nib b/packaging/macosx/Resources/ProgressWindow.nib/classes.nib deleted file mode 100644 index ea58db118..000000000 --- a/packaging/macosx/Resources/ProgressWindow.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/Resources/ProgressWindow.nib/info.nib b/packaging/macosx/Resources/ProgressWindow.nib/info.nib deleted file mode 100644 index 4e5156002..000000000 --- a/packaging/macosx/Resources/ProgressWindow.nib/info.nib +++ /dev/null @@ -1,18 +0,0 @@ -<?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>IBDocumentLocation</key> - <string>124 298 356 240 0 0 1280 832 </string> - <key>IBFramework Version</key> - <string>349.0</string> - <key>IBOpenObjects</key> - <array> - <integer>180</integer> - </array> - <key>IBSystem Version</key> - <string>7F44</string> - <key>targetFramework</key> - <string>IBCarbonFramework</string> -</dict> -</plist> diff --git a/packaging/macosx/Resources/ProgressWindow.nib/objects.xib b/packaging/macosx/Resources/ProgressWindow.nib/objects.xib deleted file mode 100644 index 6eaacc43e..000000000 --- a/packaging/macosx/Resources/ProgressWindow.nib/objects.xib +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<object class="NSIBObjectData"> - <string name="targetFramework">IBCarbonFramework</string> - <object name="rootObject" class="NSCustomObject" id="1"> - <string name="customClass">NSApplication</string> - </object> - <array count="4" name="allObjects"> - <object class="IBCarbonWindow" id="180"> - <string name="windowRect">404 523 457 899 </string> - <string name="title">Caching Fonts...</string> - <object name="rootControl" class="IBCarbonRootControl" id="183"> - <string name="bounds">0 0 53 376 </string> - <array count="2" name="subviews"> - <object class="IBCarbonProgressBar" id="181"> - <string name="bounds">19 17 32 270 </string> - <boolean name="small">TRUE</boolean> - <int name="controlSize">1</int> - <int name="initialValue">50</int> - </object> - <object class="IBCarbonButton" id="185"> - <string name="bounds">16 284 34 356 </string> - <boolean name="small">TRUE</boolean> - <int name="controlSize">1</int> - <string name="title">Cancel</string> - <ostype name="command">quit</ostype> - </object> - </array> - </object> - <boolean name="hasCloseBox">FALSE</boolean> - <boolean name="hasHorizontalZoom">FALSE</boolean> - <boolean name="isResizable">FALSE</boolean> - <boolean name="hasVerticalZoom">FALSE</boolean> - <int name="themeBrush">51</int> - <int name="windowPosition">1</int> - </object> - <reference idRef="181"/> - <reference idRef="183"/> - <reference idRef="185"/> - </array> - <array count="4" name="allParents"> - <reference idRef="1"/> - <reference idRef="183"/> - <reference idRef="180"/> - <reference idRef="183"/> - </array> - <dictionary count="2" name="nameTable"> - <string>File's Owner</string> - <reference idRef="1"/> - <string>Window</string> - <reference idRef="180"/> - </dictionary> - <unsigned_int name="nextObjectID">186</unsigned_int> -</object> diff --git a/packaging/macosx/Resources/alert_fccache.sh b/packaging/macosx/Resources/alert_fccache.sh deleted file mode 100644 index e39971def..000000000 --- a/packaging/macosx/Resources/alert_fccache.sh +++ /dev/null @@ -1,26 +0,0 @@ -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/application-gimp-gradient.icns b/packaging/macosx/Resources/application-gimp-gradient.icns Binary files differdeleted file mode 100644 index ebd4b2a61..000000000 --- a/packaging/macosx/Resources/application-gimp-gradient.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-illustrator-svg.icns b/packaging/macosx/Resources/application-illustrator-svg.icns Binary files differdeleted file mode 100644 index b666dccb1..000000000 --- a/packaging/macosx/Resources/application-illustrator-svg.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-illustrator.icns b/packaging/macosx/Resources/application-illustrator.icns Binary files differdeleted file mode 100644 index c44d46582..000000000 --- a/packaging/macosx/Resources/application-illustrator.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-pdf.icns b/packaging/macosx/Resources/application-pdf.icns Binary files differdeleted file mode 100644 index 1eb670fb0..000000000 --- a/packaging/macosx/Resources/application-pdf.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns b/packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns Binary files differdeleted file mode 100644 index ad5dad981..000000000 --- a/packaging/macosx/Resources/application-vnd.corel-draw-compressed.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-vnd.corel-draw-template.icns b/packaging/macosx/Resources/application-vnd.corel-draw-template.icns Binary files differdeleted file mode 100644 index 475c3fc3c..000000000 --- a/packaging/macosx/Resources/application-vnd.corel-draw-template.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-vnd.corel-draw.icns b/packaging/macosx/Resources/application-vnd.corel-draw.icns Binary files differdeleted file mode 100644 index 5907b7e9d..000000000 --- a/packaging/macosx/Resources/application-vnd.corel-draw.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-vnd.ms.xaml.icns b/packaging/macosx/Resources/application-vnd.ms.xaml.icns Binary files differdeleted file mode 100644 index 6a44b4af2..000000000 --- a/packaging/macosx/Resources/application-vnd.ms.xaml.icns +++ /dev/null diff --git a/packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns b/packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns Binary files differdeleted file mode 100644 index 9ee499309..000000000 --- a/packaging/macosx/Resources/application-vnd.wordperfect-graphic.icns +++ /dev/null diff --git a/packaging/macosx/Resources/bin/gimp-wrapper.sh b/packaging/macosx/Resources/bin/gimp-wrapper.sh deleted file mode 100755 index bbb4d6c6a..000000000 --- a/packaging/macosx/Resources/bin/gimp-wrapper.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/bash -# -# simple gimp wrapper script for Inkscape.app -# - -#_DEBUG=true - -# --- unset environment inherited from inkscape.app -get_env_current () -{ - env | awk -F= '/[a-zA-Z_][a-zA-Z_0-9]*=/ {if (!system("[ -n \"${" $1 "+y}\" ]")) print $1 }' | sort | uniq -} - -if [ ! -z "$_env_orig" ]; then - keep_env=$_env_orig - for i in $(get_env_current); do - if [ -z "$(printf %s "$keep_env" | grep $i)" ]; then - unset $i - fi - done -fi - - -# --- 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" - - -# --- 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 deleted file mode 100755 index 85c9f8eba..000000000 --- a/packaging/macosx/Resources/bin/inkscape +++ /dev/null @@ -1,174 +0,0 @@ -#!/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> -# - -get_env_current () -{ - env | awk -F= '/[a-zA-Z_][a-zA-Z_0-9]*=/ {if (!system("[ -n \"${" $1 "+y}\" ]")) print $1 }' | sort | uniq -} -[ -z "$_env_orig" ] && export _env_orig="$(get_env_current)" - -[ -n "$INK_DEBUG_LAUNCHER" ] && set -x - -CMD="$(readlink $0 || echo $0)" -CWD="$(cd "$(dirname "$CMD")" && pwd -P)" -# e.g. /Applications/Inkscape.app/Contents/Resources/bin -TOP="$(dirname "$CWD")" -# e.g. /Applications/Inkscape.app/Contents/Resources -BASE="$(echo "$TOP" | sed -e 's/\/Contents\/Resources.*$//')" -# e.g. /Applications/Inkscape.app - -# FIXME: Inkscape needs better relocation support for OS X (get rid of the relative -# path hack in src/path-prefix.h for osxapp-enabled builds). Until then, below change -# of working directory is required: -# -# Due to changes after 0.48, we have to 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="/Library/TeX/texbin:/usr/texbin:/opt/local/bin:/sw/bin/:/usr/local/bin" - - # Put /usr/bin at beginning of path so we make sure we use Apple's python - # over one that may be installed be Macports, Fink or some other means. - PATH_PYTHON="/usr/bin" - - # Put $TOP/bin at beginning of path so we make sure that recursive calls - # to inkscape don't pull in other inkscape binaries with different setup. - # Also allows to override system python with custom wrapper script, and - # e.g. to support GIMP.app or gimp for external editing and GIMP XCF export. - PATH_pkgbin="$TOP/bin" - - # save orig, new PATH - export INK_PATH_ORIG="$PATH" - export PATH="$PATH_pkgbin:$PATH_PYTHON:$PATH_OTHER:$INK_PATH_ORIG" -fi - -# Setup PYTHONPATH to use python modules shipped with Inkscape -OSXMINORNO="$(/usr/bin/sw_vers -productVersion | cut -d. -f2)" -build_arch=__build_arch__ -if [ $OSXMINORNO -gt "5" ]; then - if [ $OSXMINORNO -eq "6" ]; then - export VERSIONER_PYTHON_VERSION=2.6 - else # if [ $OSXMINORNO -ge "7" ]; then - export VERSIONER_PYTHON_VERSION=2.7 - fi - if [ $build_arch = "i386" ]; then - export VERSIONER_PYTHON_PREFER_32_BIT=yes - else # build & runtime arch x86_64 - export VERSIONER_PYTHON_PREFER_32_BIT=no - fi -fi -PYTHON_VERS="$(python -V 2>&1 | cut -c 8-10)" -export PYTHONPATH="$TOP/lib/python$PYTHON_VERS/site-packages/" - -export FONTCONFIG_PATH="$TOP/etc/fonts" -export PANGO_RC_FILE="$TOP/etc/pango/pangorc" -export PANGO_SYSCONFDIR="$TOP/etc" -export GTK_IM_MODULE_FILE="$TOP/lib/gtk-2.0/__gtk_version__/immodules.cache" -export GDK_PIXBUF_MODULE_FILE="$TOP/lib/gdk-pixbuf-2.0/__gtk_version__/loaders.cache" -export GTK_DATA_PREFIX="$TOP" -export GTK_EXE_PREFIX="$TOP" -export GTK_PATH="$TOP" -export GNOME_VFS_MODULE_CONFIG_PATH="$TOP/etc/gnome-vfs-2.0/modules" -export GNOME_VFS_MODULE_PATH="$TOP/lib/gnome-vfs-2.0/modules" -export GIO_USE_VFS="local" -export GVFS_REMOTE_VOLUME_MONITOR_IGNORE=1 -export GVFS_DISABLE_FUSE=1 -export XDG_DATA_DIRS="$TOP/share" -export ASPELL_CONF="prefix $TOP;" -export POPPLER_DATADIR="$TOP/share/poppler" - -# no DBUS for now -unset DBUS_LAUNCHD_SESSION_BUS_SOCKET -unset DBUS_SESSION_BUS_ADDRESS - -# Note: This requires the path with the exact ImageMagic version number. -# The actual version is inserted by the packaging script. -export MAGICK_CONFIGURE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/config:$TOP/share/ImageMagick-IMAGEMAGICKVER_MAJOR/config" -export MAGICK_CODER_FILTER_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/filters" -export MAGICK_CODER_MODULE_PATH="$TOP/lib/ImageMagick-IMAGEMAGICKVER/modules-Q16/coders" - -export INKSCAPE_SHAREDIR="$TOP/share/inkscape" -export INKSCAPE_PLUGINDIR="$TOP/lib/inkscape" -export INKSCAPE_LOCALEDIR="$TOP/share/locale" - -# Handle the case where the directory storing Inkscape has special characters -# ('#', '&', '|') in the name. These need to be escaped to work properly for -# various configuration files. -ESCAPEDTOP=`echo "$TOP" | sed 's/#/\\\\\\\\#/' | sed 's/&/\\\\\\&/g' | sed 's/|/\\\\\\|/g'` - -# Set GTK theme (only if there is no .gtkrc-2.0 in the user's home) -if [[ ! -e "$HOME/.gtkrc-2.0" ]]; then - export GTK2_RC_FILES="$ESCAPEDTOP/etc/gtk-2.0/gtkrc" -fi - -# If the AppleCollationOrder preference doesn't exist, we fall back to using -# the AppleLocale preference. -LANGSTR=`defaults read .GlobalPreferences AppleCollationOrder 2>/dev/null` -if [ "x$LANGSTR" == "x" -o "x$LANGSTR" == "xroot" ] -then - LANGSTR=`defaults read .GlobalPreferences AppleLocale 2>/dev/null | \ - sed 's/_.*//'` - [ $_DEBUG ] && echo "Setting LANGSTR from AppleLocale: $LANGSTR" 1>&2 -else - [ $_DEBUG ] && echo "Setting LANGSTR from AppleCollationOrder: $LANGSTR" 1>&2 -fi - -# NOTE: Have to add ".UTF-8" to the LANG since omitting causes Inkscape -# to crash on startup in locale_from_utf8(). -if [ "x$LANGSTR" == "x" ] -then - # override broken script - [ $_DEBUG ] && echo "Overriding empty LANGSTR" 1>&2 - export LANG="en_US.UTF-8" -else - tmpLANG="`grep \"\`echo $LANGSTR\`_\" /usr/share/locale/locale.alias | \ - tail -n1 | sed 's/\./ /' | awk '{print $2}'`" - if [ "x$tmpLANG" == "x" ] - then - # override broken script - [ $_DEBUG ] && echo "Overriding empty LANG from /usr/share/locale/locale.alias" 1>&2 - export LANG="en_US.UTF-8" - else - [ $_DEBUG ] && echo "Setting LANG from /usr/share/locale/locale.alias" 1>&2 - export LANG="$tmpLANG.UTF-8" - fi -fi -[ $_DEBUG ] && echo "Setting Language: $LANG" 1>&2 -export LC_ALL="$LANG" - -case "$INK_DEBUG" in - gdb) - EXEC="gdb --args" ;; - lldb) - EXEC="lldb -- " ;; - dtruss) - EXEC="dtruss" ;; - *) - EXEC="exec" ;; -esac -unset INK_DEBUG # ignore for recursive calls - -if [ "x$INK_DEBUG_SHELL" != "x" ]; then - unset INK_DEBUG_SHELL # ignore for recursive calls - exec bash -else - $EXEC "$CWD/inkscape-bin" "$@" -fi diff --git a/packaging/macosx/Resources/etc/fonts/fonts.conf b/packaging/macosx/Resources/etc/fonts/fonts.conf deleted file mode 100644 index 316043814..000000000 --- a/packaging/macosx/Resources/etc/fonts/fonts.conf +++ /dev/null @@ -1,159 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE fontconfig SYSTEM "fonts.dtd"> -<!-- /etc/fonts/fonts.conf file to configure system font access --> -<fontconfig> - -<!-- - DO NOT EDIT THIS FILE. - IT WILL BE REPLACED WHEN FONTCONFIG IS UPDATED. - LOCAL CHANGES BELONG IN 'local.conf'. - - The intent of this standard configuration file is to be adequate for - most environments. If you have a reasonably normal environment and - have found problems with this configuration, they are probably - things that others will also want fixed. Please submit any - problems to the fontconfig bugzilla system located at fontconfig.org - - Note that the normal 'make install' procedure for fontconfig is to - replace any existing fonts.conf file with the new version. Place - any local customizations in local.conf which this file references. - - Keith Packard ---> - -<!-- Font directory list --> - - <dir>/usr/share/fonts</dir> - <dir>/usr/X11/lib/X11/fonts</dir> - <dir>/opt/local/share/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> - -<!-- - Accept deprecated 'mono' alias, replacing it with 'monospace' ---> - <match target="pattern"> - <test qual="any" name="family"> - <string>mono</string> - </test> - <edit name="family" mode="assign" binding="same"> - <string>monospace</string> - </edit> - </match> - -<!-- - Accept alternate 'sans serif' spelling, replacing it with 'sans-serif' ---> - <match target="pattern"> - <test qual="any" name="family"> - <string>sans serif</string> - </test> - <edit name="family" mode="assign" binding="same"> - <string>sans-serif</string> - </edit> - </match> - -<!-- - Accept deprecated 'sans' alias, replacing it with 'sans-serif' ---> - <match target="pattern"> - <test qual="any" name="family"> - <string>sans</string> - </test> - <edit name="family" mode="assign" binding="same"> - <string>sans-serif</string> - </edit> - </match> - -<!-- - Load local system customization file ---> - <include ignore_missing="yes">conf.d</include> - -<!-- Font cache directory list --> - - <cachedir prefix="xdg">fontconfig</cachedir> - <!-- the following element will be removed in the future --> - <cachedir>~/.fontconfig</cachedir> - - <config> -<!-- - These are the default Unicode chars that are expected to be blank - in fonts. All other blank chars are assumed to be broken and - won't appear in the resulting charsets - --> - <blank> - <int>0x0020</int> <!-- SPACE --> - <int>0x00A0</int> <!-- NO-BREAK SPACE --> - <int>0x00AD</int> <!-- SOFT HYPHEN --> - <int>0x034F</int> <!-- COMBINING GRAPHEME JOINER --> - <int>0x0600</int> <!-- ARABIC NUMBER SIGN --> - <int>0x0601</int> <!-- ARABIC SIGN SANAH --> - <int>0x0602</int> <!-- ARABIC FOOTNOTE MARKER --> - <int>0x0603</int> <!-- ARABIC SIGN SAFHA --> - <int>0x06DD</int> <!-- ARABIC END OF AYAH --> - <int>0x070F</int> <!-- SYRIAC ABBREVIATION MARK --> - <int>0x115F</int> <!-- HANGUL CHOSEONG FILLER --> - <int>0x1160</int> <!-- HANGUL JUNGSEONG FILLER --> - <int>0x1680</int> <!-- OGHAM SPACE MARK --> - <int>0x17B4</int> <!-- KHMER VOWEL INHERENT AQ --> - <int>0x17B5</int> <!-- KHMER VOWEL INHERENT AA --> - <int>0x180E</int> <!-- MONGOLIAN VOWEL SEPARATOR --> - <int>0x2000</int> <!-- EN QUAD --> - <int>0x2001</int> <!-- EM QUAD --> - <int>0x2002</int> <!-- EN SPACE --> - <int>0x2003</int> <!-- EM SPACE --> - <int>0x2004</int> <!-- THREE-PER-EM SPACE --> - <int>0x2005</int> <!-- FOUR-PER-EM SPACE --> - <int>0x2006</int> <!-- SIX-PER-EM SPACE --> - <int>0x2007</int> <!-- FIGURE SPACE --> - <int>0x2008</int> <!-- PUNCTUATION SPACE --> - <int>0x2009</int> <!-- THIN SPACE --> - <int>0x200A</int> <!-- HAIR SPACE --> - <int>0x200B</int> <!-- ZERO WIDTH SPACE --> - <int>0x200C</int> <!-- ZERO WIDTH NON-JOINER --> - <int>0x200D</int> <!-- ZERO WIDTH JOINER --> - <int>0x200E</int> <!-- LEFT-TO-RIGHT MARK --> - <int>0x200F</int> <!-- RIGHT-TO-LEFT MARK --> - <int>0x2028</int> <!-- LINE SEPARATOR --> - <int>0x2029</int> <!-- PARAGRAPH SEPARATOR --> - <int>0x202A</int> <!-- LEFT-TO-RIGHT EMBEDDING --> - <int>0x202B</int> <!-- RIGHT-TO-LEFT EMBEDDING --> - <int>0x202C</int> <!-- POP DIRECTIONAL FORMATTING --> - <int>0x202D</int> <!-- LEFT-TO-RIGHT OVERRIDE --> - <int>0x202E</int> <!-- RIGHT-TO-LEFT OVERRIDE --> - <int>0x202F</int> <!-- NARROW NO-BREAK SPACE --> - <int>0x205F</int> <!-- MEDIUM MATHEMATICAL SPACE --> - <int>0x2060</int> <!-- WORD JOINER --> - <int>0x2061</int> <!-- FUNCTION APPLICATION --> - <int>0x2062</int> <!-- INVISIBLE TIMES --> - <int>0x2063</int> <!-- INVISIBLE SEPARATOR --> - <int>0x206A</int> <!-- INHIBIT SYMMETRIC SWAPPING --> - <int>0x206B</int> <!-- ACTIVATE SYMMETRIC SWAPPING --> - <int>0x206C</int> <!-- INHIBIT ARABIC FORM SHAPING --> - <int>0x206D</int> <!-- ACTIVATE ARABIC FORM SHAPING --> - <int>0x206E</int> <!-- NATIONAL DIGIT SHAPES --> - <int>0x206F</int> <!-- NOMINAL DIGIT SHAPES --> - <int>0x2800</int> <!-- BRAILLE PATTERN BLANK --> - <int>0x3000</int> <!-- IDEOGRAPHIC SPACE --> - <int>0x3164</int> <!-- HANGUL FILLER --> - <int>0xFEFF</int> <!-- ZERO WIDTH NO-BREAK SPACE --> - <int>0xFFA0</int> <!-- HALFWIDTH HANGUL FILLER --> - <int>0xFFF9</int> <!-- INTERLINEAR ANNOTATION ANCHOR --> - <int>0xFFFA</int> <!-- INTERLINEAR ANNOTATION SEPARATOR --> - <int>0xFFFB</int> <!-- INTERLINEAR ANNOTATION TERMINATOR --> - </blank> -<!-- - Rescan configuration every 30 seconds when FcFontSetList is called - --> - <rescan> - <int>30</int> - </rescan> - </config> - -</fontconfig> diff --git a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc b/packaging/macosx/Resources/etc/gtk-2.0/gtkrc deleted file mode 100644 index 46f5d2910..000000000 --- a/packaging/macosx/Resources/etc/gtk-2.0/gtkrc +++ /dev/null @@ -1,23 +0,0 @@ -# -# 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 = 1 -gtk-toolbar-style = 0 -#gtk-toolbar-icon-size = 2 - -# use OS X default PDF viewer for print preview -gtk-print-preview-command="open -a /Applications/Preview.app %f" - -# fix Adwaita theme for Inkscape's GimpSpinScale widgets -style "spinbutton" {} -widget_class "*GimpSpinScale*" style "spinbutton" - -# eof diff --git a/packaging/macosx/Resources/image-svg+xml-compressed.icns b/packaging/macosx/Resources/image-svg+xml-compressed.icns Binary files differdeleted file mode 100644 index 7d242061a..000000000 --- a/packaging/macosx/Resources/image-svg+xml-compressed.icns +++ /dev/null diff --git a/packaging/macosx/Resources/image-svg+xml.icns b/packaging/macosx/Resources/image-svg+xml.icns Binary files differdeleted file mode 100644 index 63419845a..000000000 --- a/packaging/macosx/Resources/image-svg+xml.icns +++ /dev/null diff --git a/packaging/macosx/Resources/image-vnd.dxf.icns b/packaging/macosx/Resources/image-vnd.dxf.icns Binary files differdeleted file mode 100644 index 3b18609f7..000000000 --- a/packaging/macosx/Resources/image-vnd.dxf.icns +++ /dev/null diff --git a/packaging/macosx/Resources/image-vnd.sk1.icns b/packaging/macosx/Resources/image-vnd.sk1.icns Binary files differdeleted file mode 100644 index 887cd1a8f..000000000 --- a/packaging/macosx/Resources/image-vnd.sk1.icns +++ /dev/null diff --git a/packaging/macosx/Resources/image-vnd.windows-metafile.icns b/packaging/macosx/Resources/image-vnd.windows-metafile.icns Binary files differdeleted file mode 100644 index fb0bfa9c6..000000000 --- a/packaging/macosx/Resources/image-vnd.windows-metafile.icns +++ /dev/null diff --git a/packaging/macosx/Resources/image-x-eps.icns b/packaging/macosx/Resources/image-x-eps.icns Binary files differdeleted file mode 100644 index ebb294022..000000000 --- a/packaging/macosx/Resources/image-x-eps.icns +++ /dev/null diff --git a/packaging/macosx/Resources/image-x-ps.icns b/packaging/macosx/Resources/image-x-ps.icns Binary files differdeleted file mode 100644 index 93fcf7348..000000000 --- a/packaging/macosx/Resources/image-x-ps.icns +++ /dev/null diff --git a/packaging/macosx/Resources/openDoc b/packaging/macosx/Resources/openDoc deleted file mode 100755 index b2e58c114..000000000 --- a/packaging/macosx/Resources/openDoc +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# -# Author: Aaron Voisine <aaron@voisine.org> -# Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> -# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> - -get_env_current () -{ - env | awk -F= '/[a-zA-Z_][a-zA-Z_0-9]*=/ {if (!system("[ -n \"${" $1 "+y}\" ]")) print $1 }' | sort | uniq -} -[ -z "$_env_orig" ] && export _env_orig="$(get_env_current)" - -CWD="$(cd "$(dirname "$0")" && pwd)" - -source "${CWD}/xdg_setup.sh" - -exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/script b/packaging/macosx/Resources/script deleted file mode 100755 index 2bfe1d9ba..000000000 --- a/packaging/macosx/Resources/script +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# -# Author: Aaron Voisine <aaron@voisine.org> -# Inkscape Modifications: Michael Wybrow <mjwybrow@users.sourceforge.net> -# Inkscape Modifications: ~suv <suv-sf@users.sourceforge.net> - -#export _DEBUG=true - -get_env_current () -{ - env | awk -F= '/[a-zA-Z_][a-zA-Z_0-9]*=/ {if (!system("[ -n \"${" $1 "+y}\" ]")) print $1 }' | sort | uniq -} -[ -z "$_env_orig" ] && export _env_orig="$(get_env_current)" - -CWD="$(cd "$(dirname "$0")" && pwd)" - -source "${CWD}/xdg_setup.sh" -source "${CWD}/alert_fccache.sh" - -# TODO examine whether it would be wisest to move the code from inkscape shell -# script and getdisplay.sh to here and only keep the real binary in bin. This -# may make things easier on Leopard and may also help using Inkscape on the -# command line. -# -# See related FIXME in bin/inkscape for requirements to merge the two scripts. - -exec "$CWD/bin/inkscape" "$@" diff --git a/packaging/macosx/Resources/xdg_setup.sh b/packaging/macosx/Resources/xdg_setup.sh deleted file mode 100644 index f37738210..000000000 --- a/packaging/macosx/Resources/xdg_setup.sh +++ /dev/null @@ -1,11 +0,0 @@ -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/English.lproj/InfoPlist.strings b/packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings Binary files differdeleted file mode 100644 index 0bb6ef503..000000000 --- a/packaging/macosx/ScriptExec/English.lproj/InfoPlist.strings +++ /dev/null diff --git a/packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib b/packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib deleted file mode 100644 index ea58db118..000000000 --- a/packaging/macosx/ScriptExec/English.lproj/main.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib b/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib deleted file mode 100644 index da8455c15..000000000 --- a/packaging/macosx/ScriptExec/English.lproj/main.nib/info.nib +++ /dev/null @@ -1,19 +0,0 @@ -<?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>IBFramework Version</key> - <string>345.0</string> - <key>IBOldestOS</key> - <integer>3</integer> - <key>IBOpenObjects</key> - <array> - <integer>29</integer> - <integer>166</integer> - </array> - <key>IBSystem Version</key> - <string>7B44</string> - <key>targetFramework</key> - <string>IBCarbonFramework</string> -</dict> -</plist> diff --git a/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib b/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib deleted file mode 100644 index 92ff05616..000000000 --- a/packaging/macosx/ScriptExec/English.lproj/main.nib/objects.xib +++ /dev/null @@ -1,271 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<object class="NSIBObjectData"> - <string name="targetFramework">IBCarbonFramework</string> - <object name="rootObject" class="NSCustomObject" id="1"> - <string name="customClass">NSApplication</string> - </object> - <array count="38" name="allObjects"> - <object class="IBCarbonMenu" id="29"> - <string name="title">main</string> - <array count="4" name="items"> - <object class="IBCarbonMenuItem" id="185"> - <string name="title">Foo</string> - <object name="submenu" class="IBCarbonMenu" id="184"> - <string name="title">Foo</string> - <array count="1" name="items"> - <object class="IBCarbonMenuItem" id="187"> - <string name="title">About Foo</string> - <int name="keyEquivalentModifier">0</int> - <ostype name="command">abou</ostype> - </object> - </array> - <string name="name">_NSAppleMenu</string> - </object> - </object> - <object class="IBCarbonMenuItem" id="127"> - <string name="title">File</string> - <object name="submenu" class="IBCarbonMenu" id="131"> - <string name="title">File</string> - <array count="10" name="items"> - <object class="IBCarbonMenuItem" id="139"> - <string name="title">New</string> - <string name="keyEquivalent">n</string> - <ostype name="command">new </ostype> - </object> - <object class="IBCarbonMenuItem" id="134"> - <string name="title">Open…</string> - <string name="keyEquivalent">o</string> - <ostype name="command">open</ostype> - </object> - <object class="IBCarbonMenuItem" id="133"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem" id="130"> - <string name="title">Close</string> - <string name="keyEquivalent">w</string> - <ostype name="command">clos</ostype> - </object> - <object class="IBCarbonMenuItem" id="138"> - <string name="title">Save</string> - <string name="keyEquivalent">s</string> - <ostype name="command">save</ostype> - </object> - <object class="IBCarbonMenuItem" id="137"> - <string name="title">Save As…</string> - <string name="keyEquivalent">S</string> - <ostype name="command">svas</ostype> - </object> - <object class="IBCarbonMenuItem" id="132"> - <string name="title">Revert</string> - <string name="keyEquivalent">r</string> - <ostype name="command">rvrt</ostype> - </object> - <object class="IBCarbonMenuItem" id="128"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem" id="135"> - <string name="title">Page Setup…</string> - <string name="keyEquivalent">P</string> - <ostype name="command">page</ostype> - </object> - <object class="IBCarbonMenuItem" id="136"> - <string name="title">Print…</string> - <string name="keyEquivalent">p</string> - <ostype name="command">prnt</ostype> - </object> - </array> - </object> - </object> - <object class="IBCarbonMenuItem" id="152"> - <string name="title">Edit</string> - <object name="submenu" class="IBCarbonMenu" id="147"> - <string name="title">Edit</string> - <array count="10" name="items"> - <object class="IBCarbonMenuItem" id="141"> - <string name="title">Undo</string> - <string name="keyEquivalent">z</string> - <ostype name="command">undo</ostype> - </object> - <object class="IBCarbonMenuItem" id="146"> - <string name="title">Redo</string> - <string name="keyEquivalent">Z</string> - <ostype name="command">redo</ostype> - </object> - <object class="IBCarbonMenuItem" id="142"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem" id="143"> - <string name="title">Cut</string> - <string name="keyEquivalent">x</string> - <ostype name="command">cut </ostype> - </object> - <object class="IBCarbonMenuItem" id="149"> - <string name="title">Copy</string> - <string name="keyEquivalent">c</string> - <ostype name="command">copy</ostype> - </object> - <object class="IBCarbonMenuItem" id="144"> - <string name="title">Paste</string> - <string name="keyEquivalent">v</string> - <ostype name="command">past</ostype> - </object> - <object class="IBCarbonMenuItem" id="151"> - <string name="title">Delete</string> - <ostype name="command">clea</ostype> - </object> - <object class="IBCarbonMenuItem" id="148"> - <string name="title">Select All</string> - <string name="keyEquivalent">a</string> - <ostype name="command">sall</ostype> - </object> - <object class="IBCarbonMenuItem" id="199"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem" id="198"> - <string name="title">Special Characters…</string> - <ostype name="command">chrp</ostype> - </object> - </array> - </object> - </object> - <object class="IBCarbonMenuItem" id="192"> - <string name="title">Window</string> - <object name="submenu" class="IBCarbonMenu" id="195"> - <string name="title">Window</string> - <array count="6" name="items"> - <object class="IBCarbonMenuItem" id="197"> - <string name="title">Zoom Window</string> - <ostype name="command">zoom</ostype> - </object> - <object class="IBCarbonMenuItem" id="190"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Minimize Window</string> - <string name="keyEquivalent">m</string> - <ostype name="command">mini</ostype> - </object> - <object class="IBCarbonMenuItem" id="191"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Minimize All Windows</string> - <string name="keyEquivalent">m</string> - <int name="keyEquivalentModifier">1572864</int> - <ostype name="command">mina</ostype> - </object> - <object class="IBCarbonMenuItem" id="194"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem" id="196"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Bring All to Front</string> - <ostype name="command">bfrt</ostype> - </object> - <object class="IBCarbonMenuItem" id="193"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Arrange in Front</string> - <int name="keyEquivalentModifier">1572864</int> - <ostype name="command">frnt</ostype> - </object> - </array> - <string name="name">_NSWindowsMenu</string> - </object> - </object> - </array> - <string name="name">_NSMainMenu</string> - </object> - <reference idRef="127"/> - <reference idRef="128"/> - <reference idRef="130"/> - <reference idRef="131"/> - <reference idRef="132"/> - <reference idRef="133"/> - <reference idRef="134"/> - <reference idRef="135"/> - <reference idRef="136"/> - <reference idRef="137"/> - <reference idRef="138"/> - <reference idRef="139"/> - <reference idRef="141"/> - <reference idRef="142"/> - <reference idRef="143"/> - <reference idRef="144"/> - <reference idRef="146"/> - <reference idRef="147"/> - <reference idRef="148"/> - <reference idRef="149"/> - <reference idRef="151"/> - <reference idRef="152"/> - <object class="IBCarbonWindow" id="166"> - <string name="windowRect">204 300 564 780 </string> - <string name="title">Window</string> - <object name="rootControl" class="IBCarbonRootControl" id="167"> - <string name="bounds">0 0 360 480 </string> - <string name="viewFrame">0 0 480 360 </string> - </object> - <boolean name="receiveUpdates">FALSE</boolean> - <boolean name="liveResize">TRUE</boolean> - <boolean name="compositing">TRUE</boolean> - </object> - <reference idRef="167"/> - <reference idRef="184"/> - <reference idRef="185"/> - <reference idRef="187"/> - <reference idRef="190"/> - <reference idRef="191"/> - <reference idRef="192"/> - <reference idRef="193"/> - <reference idRef="194"/> - <reference idRef="195"/> - <reference idRef="196"/> - <reference idRef="197"/> - <reference idRef="198"/> - <reference idRef="199"/> - </array> - <array count="38" name="allParents"> - <reference idRef="1"/> - <reference idRef="29"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="127"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="131"/> - <reference idRef="147"/> - <reference idRef="147"/> - <reference idRef="147"/> - <reference idRef="147"/> - <reference idRef="147"/> - <reference idRef="152"/> - <reference idRef="147"/> - <reference idRef="147"/> - <reference idRef="147"/> - <reference idRef="29"/> - <reference idRef="1"/> - <reference idRef="166"/> - <reference idRef="185"/> - <reference idRef="29"/> - <reference idRef="184"/> - <reference idRef="195"/> - <reference idRef="195"/> - <reference idRef="29"/> - <reference idRef="195"/> - <reference idRef="195"/> - <reference idRef="192"/> - <reference idRef="195"/> - <reference idRef="195"/> - <reference idRef="147"/> - <reference idRef="147"/> - </array> - <dictionary count="3" name="nameTable"> - <string>Files Owner</string> - <reference idRef="1"/> - <string>MainWindow</string> - <reference idRef="166"/> - <string>MenuBar</string> - <reference idRef="29"/> - </dictionary> - <unsigned_int name="nextObjectID">200</unsigned_int> -</object> diff --git a/packaging/macosx/ScriptExec/Info.plist b/packaging/macosx/ScriptExec/Info.plist deleted file mode 100644 index 9cac37f85..000000000 --- a/packaging/macosx/ScriptExec/Info.plist +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> -<plist version="0.9"> -<dict> - <key>CFBundleDevelopmentRegion</key> - <string>English</string> - <key>CFBundleDocumentTypes</key> - <array> - <dict> - <key>CFBundleTypeExtensions</key> - <array> - <string>*</string> - </array> - <key>CFBundleTypeName</key> - <string>All</string> - <key>CFBundleTypeOSTypes</key> - <array> - <string>****</string> - </array> - <key>CFBundleTypeRole</key> - <string>Viewer</string> - </dict> - </array> - <key>CFBundleExecutable</key> - <string>ScriptExec</string> - <key>CFBundleIconFile</key> - <string></string> - <key>CFBundleIdentifier</key> - <string>com.apple.myCarbonNibApp</string> - <key>CFBundleInfoDictionaryVersion</key> - <string>6.0</string> - <key>CFBundlePackageType</key> - <string>APPL</string> - <key>CFBundleSignature</key> - <string>????</string> - <key>CFBundleVersion</key> - <string>1.1</string> -</dict> -</plist> diff --git a/packaging/macosx/ScriptExec/MenuBar.nib/classes.nib b/packaging/macosx/ScriptExec/MenuBar.nib/classes.nib deleted file mode 100644 index ea58db118..000000000 --- a/packaging/macosx/ScriptExec/MenuBar.nib/classes.nib +++ /dev/null @@ -1,4 +0,0 @@ -{ -IBClasses = (); -IBVersion = 1; -} diff --git a/packaging/macosx/ScriptExec/MenuBar.nib/info.nib b/packaging/macosx/ScriptExec/MenuBar.nib/info.nib deleted file mode 100644 index c0f4643ef..000000000 --- a/packaging/macosx/ScriptExec/MenuBar.nib/info.nib +++ /dev/null @@ -1,23 +0,0 @@ -<?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>IBDocumentLocation</key> - <string>99 362 356 240 0 0 1280 832 </string> - <key>IBEditorPositions</key> - <dict> - <key>187</key> - <string>340 374 240 44 0 0 1280 832 </string> - </dict> - <key>IBFramework Version</key> - <string>349.0</string> - <key>IBOpenObjects</key> - <array> - <integer>187</integer> - </array> - <key>IBSystem Version</key> - <string>7F44</string> - <key>targetFramework</key> - <string>IBCarbonFramework</string> -</dict> -</plist> diff --git a/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib b/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib deleted file mode 100644 index 78f0a0a01..000000000 --- a/packaging/macosx/ScriptExec/MenuBar.nib/objects.xib +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" standalone="yes"?> -<object class="NSIBObjectData"> - <string name="targetFramework">IBCarbonFramework</string> - <object name="rootObject" class="NSCustomObject" id="1"> - <string name="customClass">NSApplication</string> - </object> - <array count="4" name="allObjects"> - <object class="IBCarbonMenu" id="187"> - <string name="title">MenuBar</string> - <array count="1" name="items"> - <object class="IBCarbonMenuItem" id="195"> - <string name="title">ScriptExec</string> - <object name="submenu" class="IBCarbonMenu" id="193"> - <string name="title">ScriptExec</string> - <string name="name">_NSAppleMenu</string> - </object> - </object> - </array> - <string name="name">_NSMainMenu</string> - </object> - <reference idRef="193"/> - <reference idRef="195"/> - <object class="IBCarbonMenuItem" id="204"> - <string name="title">Window</string> - <object name="submenu" class="IBCarbonMenu"> - <string name="title">Window</string> - <array count="5" name="items"> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Minimize Window</string> - <string name="keyEquivalent">m</string> - <ostype name="command">mini</ostype> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Minimize All Windows</string> - <string name="keyEquivalent">m</string> - <int name="keyEquivalentModifier">1572864</int> - <ostype name="command">mini</ostype> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="separator">TRUE</boolean> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Bring All to Front</string> - <ostype name="command">frnt</ostype> - </object> - <object class="IBCarbonMenuItem"> - <boolean name="dynamic">TRUE</boolean> - <string name="title">Bring in Front</string> - <int name="keyEquivalentModifier">1572864</int> - <ostype name="command">frnt</ostype> - </object> - </array> - <string name="name">_NSWindowsMenu</string> - </object> - </object> - </array> - <array count="4" name="allParents"> - <reference idRef="1"/> - <reference idRef="195"/> - <reference idRef="187"/> - <reference idRef="187"/> - </array> - <dictionary count="2" name="nameTable"> - <string>File's Owner</string> - <reference idRef="1"/> - <string>MenuBar</string> - <reference idRef="187"/> - </dictionary> - <unsigned_int name="nextObjectID">206</unsigned_int> -</object> diff --git a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj b/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj deleted file mode 100644 index 0443dd764..000000000 --- a/packaging/macosx/ScriptExec/ScriptExec.xcodeproj/project.pbxproj +++ /dev/null @@ -1,351 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 664C29F1060ECDC4006EC560 /* openDoc in Resources */ = {isa = PBXBuildFile; fileRef = 664C29F0060ECDC4006EC560 /* openDoc */; }; - 8D0C4E8B0486CD37000505A6 /* ScriptExec_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 32DBCF6D0370B57F00C91783 /* ScriptExec_Prefix.pch */; }; - 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 */; }; - 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 */ - 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>"; }; - 32DBCF6D0370B57F00C91783 /* ScriptExec_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptExec_Prefix.pch; sourceTree = "<group>"; }; - 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; - 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; }; - 664C29F0060ECDC4006EC560 /* openDoc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = openDoc; sourceTree = "<group>"; }; - 8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; - 8D0C4E970486CD37000505A6 /* ScriptExec.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ScriptExec.app; sourceTree = BUILT_PRODUCTS_DIR; }; - B8DCE042056DAC3500C390B0 /* MenuBar.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; path = MenuBar.nib; sourceTree = "<group>"; }; - B8DCE048056DAC5000C390B0 /* script */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = script; sourceTree = "<group>"; }; - B8DCE04E056DACAE00C390B0 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = "<absolute>"; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 8D0C4E910486CD37000505A6 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */, - B8DCE04F056DACAE00C390B0 /* Security.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 195DF8CFFE9D517E11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 8D0C4E970486CD37000505A6 /* ScriptExec.app */, - ); - name = Products; - sourceTree = "<group>"; - }; - 20286C29FDCF999611CA2CEA /* ScriptExec */ = { - isa = PBXGroup; - children = ( - 20286C2AFDCF999611CA2CEA /* Sources */, - 20286C2CFDCF999611CA2CEA /* Resources */, - 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */, - 195DF8CFFE9D517E11CA2CBB /* Products */, - ); - name = ScriptExec; - sourceTree = "<group>"; - }; - 20286C2AFDCF999611CA2CEA /* Sources */ = { - isa = PBXGroup; - children = ( - 32DBCF6D0370B57F00C91783 /* ScriptExec_Prefix.pch */, - 20286C2BFDCF999611CA2CEA /* main.c */, - ); - name = Sources; - sourceTree = "<group>"; - }; - 20286C2CFDCF999611CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 664C29F0060ECDC4006EC560 /* openDoc */, - B8DCE042056DAC3500C390B0 /* MenuBar.nib */, - 8D0C4E960486CD37000505A6 /* Info.plist */, - B8DCE048056DAC5000C390B0 /* script */, - 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */, - ); - name = Resources; - sourceTree = "<group>"; - }; - 20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = { - isa = PBXGroup; - children = ( - 20286C33FDCF999611CA2CEA /* Carbon.framework */, - 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */, - 4A9504C8FFE6A3BC11CA0CBA /* ApplicationServices.framework */, - B8DCE04E056DACAE00C390B0 /* Security.framework */, - ); - name = "External Frameworks and Libraries"; - sourceTree = "<group>"; - }; -/* End PBXGroup section */ - -/* Begin PBXHeadersBuildPhase section */ - 8D0C4E8A0486CD37000505A6 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E8B0486CD37000505A6 /* ScriptExec_Prefix.pch in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - -/* Begin PBXNativeTarget section */ - 8D0C4E890486CD37000505A6 /* ScriptExec */ = { - isa = PBXNativeTarget; - buildConfigurationList = 78E9AE160A36A8E3000D76A8 /* Build configuration list for PBXNativeTarget "ScriptExec" */; - buildPhases = ( - 8D0C4E8A0486CD37000505A6 /* Headers */, - 8D0C4E8C0486CD37000505A6 /* Resources */, - 8D0C4E8F0486CD37000505A6 /* Sources */, - 8D0C4E910486CD37000505A6 /* Frameworks */, - 8D0C4E940486CD37000505A6 /* Rez */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ScriptExec; - productInstallPath = "$(HOME)/Applications"; - productName = ScriptExec; - productReference = 8D0C4E970486CD37000505A6 /* ScriptExec.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 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 */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 8D0C4E8C0486CD37000505A6 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */, - B8DCE045056DAC3500C390B0 /* MenuBar.nib in Resources */, - B8DCE049056DAC5000C390B0 /* script in Resources */, - 664C29F1060ECDC4006EC560 /* openDoc in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXRezBuildPhase section */ - 8D0C4E940486CD37000505A6 /* Rez */ = { - isa = PBXRezBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXRezBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 8D0C4E8F0486CD37000505A6 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D0C4E900486CD37000505A6 /* main.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXVariantGroup section */ - 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 0867D6ABFE840B52C02AAC07 /* English */, - ); - name = InfoPlist.strings; - sourceTree = "<group>"; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 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 = ""; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - 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; - ZERO_LINK = YES; - }; - name = Development; - }; - 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; - GCC_ENABLE_TRIGRAPHS = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_OPTIMIZATION_LEVEL = s; - 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; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 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; - 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; - }; - name = Default; - }; - 78E9AE1B0A36A8E3000D76A8 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = Development; - }; - 78E9AE1C0A36A8E3000D76A8 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = Deployment; - }; - 78E9AE1D0A36A8E3000D76A8 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - }; - name = Default; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 78E9AE160A36A8E3000D76A8 /* Build configuration list for PBXNativeTarget "ScriptExec" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 78E9AE170A36A8E3000D76A8 /* Development */, - 78E9AE180A36A8E3000D76A8 /* Deployment */, - 78E9AE190A36A8E3000D76A8 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 78E9AE1A0A36A8E3000D76A8 /* Build configuration list for PBXProject "ScriptExec" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 78E9AE1B0A36A8E3000D76A8 /* Development */, - 78E9AE1C0A36A8E3000D76A8 /* Deployment */, - 78E9AE1D0A36A8E3000D76A8 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; -/* End XCConfigurationList section */ - }; - rootObject = 20286C28FDCF999611CA2CEA /* Project object */; -} diff --git a/packaging/macosx/ScriptExec/ScriptExec_Prefix.pch b/packaging/macosx/ScriptExec/ScriptExec_Prefix.pch deleted file mode 100644 index 16d7ede3d..000000000 --- a/packaging/macosx/ScriptExec/ScriptExec_Prefix.pch +++ /dev/null @@ -1,5 +0,0 @@ -// -// Prefix header for all source files of the 'ScriptExec' target in the 'ScriptExec' project. -// - -#include <Carbon/Carbon.h> diff --git a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh b/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh deleted file mode 100755 index 9cf08ed49..000000000 --- a/packaging/macosx/ScriptExec/launcher-quartz-no-macintegration.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/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> -# - -get_env_current () -{ - env | awk -F= '/[a-zA-Z_][a-zA-Z_0-9]*=/ {if (!system("[ -n \"${" $1 "+y}\" ]")) print $1 }' | sort | uniq -} -[ -z "$_env_orig" ] && export _env_orig="$(get_env_current)" - -[ -n "$INK_DEBUG_LAUNCHER" ] && set -x - -CMD="$(readlink $0 || echo $0)" -CWD="$(cd "$(dirname "$CMD")" && pwd -P)" -# 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 to 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 deleted file mode 100644 index e3f066d70..000000000 --- a/packaging/macosx/ScriptExec/main.c +++ /dev/null @@ -1,593 +0,0 @@ -/* - Platypus - create MacOS X application bundles that execute scripts - This is the executable that goes into Platypus apps - Copyright (C) 2003 Sveinbjorn Thordarson <sveinbt@hi.is> - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - main.c - main program file - -*/ - -/* - * This app laucher basically takes care of: - * - 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. - */ - -/////////////////////////////////////// -// Includes -/////////////////////////////////////// -#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> - -// Unix stuff -#include <string.h> -#include <unistd.h> -#include <sys/wait.h> -#include <pthread.h> -#include <stdio.h> - -/////////////////////////////////////// -// Definitions -/////////////////////////////////////// -#pragma mark Definitions - -// name length limits -#define kMaxPathLength 1024 - -// names of files bundled with app -#define kScriptFileName "script" -#define kOpenDocFileName "openDoc" - -// custom carbon event class -#define kEventClassRedFatalAlert 911 - -// custom carbon event types -#define kEventKindFCCacheFailed 912 - -//maximum arguments the script accepts -#define kMaxArgumentsToScript 252 - -/////////////////////////////////////// -// Prototypes -/////////////////////////////////////// -#pragma mark Prototypes - -static void *Execute(void *arg); -static void *OpenDoc(void *arg); -static OSErr ExecuteScript(char *script, pid_t *pid); - -static void GetParameters(void); -static unsigned char* GetScript(void); -static unsigned char* GetOpenDoc(void); - -OSErr LoadMenuBar(char *appName); - -static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize); -static void RedFatalAlert(Str255 errorString, Str255 expStr); -static short DoesFileExist(unsigned char *path); - -static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); -static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); -static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); -static OSStatus FCCacheFailedHandler(EventHandlerCallRef theHandlerCall, - EventRef theEvent, void *userData); -static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon); - -static OSStatus CompileAppleScript(const void* text, long textLength, - AEDesc *resultData); -static OSStatus SimpleCompileAppleScript(const char* theScript); -static OSErr runScript(); - -/////////////////////////////////////// -// Globals -/////////////////////////////////////// -#pragma mark Globals - -// process id of forked process -pid_t pid = 0; - -// thread id of threads that start scripts -pthread_t odtid = 0, tid = 0; - -// indicator of whether the script has completed executing -short taskDone = true; - -// execution parameters -char scriptPath[kMaxPathLength]; -char openDocPath[kMaxPathLength]; - -//arguments to the script -char *arguments[kMaxArgumentsToScript+3]; -char *fileArgs[kMaxArgumentsToScript]; -short numArgs = 0; - -extern char **environ; - -#pragma mark - - -/////////////////////////////////////// -// Program entrance point -/////////////////////////////////////// -int main(int argc, char* argv[]) -{ - OSErr err = noErr; - EventTypeSpec FCCacheEvents = { kEventClassRedFatalAlert, kEventKindFCCacheFailed }; - - InitCursor(); - - //install Apple Event handlers - err += AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, - NewAEEventHandlerUPP(AppQuitAEHandler), - 0, false); - err += AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, - NewAEEventHandlerUPP(AppOpenDocAEHandler), - 0, false); - err += AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, - NewAEEventHandlerUPP(AppOpenAppAEHandler), - 0, false); - - err += AEInstallEventHandler(kCoreEventClass, kAEReopenApplication, - NewAEEventHandlerUPP(AppReopenAppAEHandler), - 0, false); - - err += InstallEventHandler(GetApplicationEventTarget(), - NewEventHandlerUPP(FCCacheFailedHandler), 1, - &FCCacheEvents, NULL, NULL); - - if (err) RedFatalAlert("\pInitialization Error", - "\pError initing Apple Event handlers."); - - //create the menu bar - if (err = LoadMenuBar(NULL)) RedFatalAlert("\pInitialization Error", - "\pError loading MenuBar.nib."); - - GetParameters(); //load data from files containing exec settings - - // compile "icon clicked" script so it's ready to execute - SimpleCompileAppleScript("tell application \"XQuartz\" to activate"); - - RunApplicationEventLoop(); //Run the event loop - return 0; -} - -#pragma mark - - - -static void RequestUserAttention(void) -{ - NMRecPtr notificationRequest = (NMRecPtr) NewPtr(sizeof(NMRec)); - - memset(notificationRequest, 0, sizeof(*notificationRequest)); - notificationRequest->qType = nmType; - notificationRequest->nmMark = 1; - notificationRequest->nmIcon = 0; - notificationRequest->nmSound = 0; - notificationRequest->nmStr = NULL; - notificationRequest->nmResp = NULL; - - verify_noerr(NMInstall(notificationRequest)); -} - - -static void ShowFirstStartWarningDialog(void) -{ - SInt16 itemHit; - - AlertStdAlertParamRec params; - params.movable = true; - params.helpButton = false; - params.filterProc = NULL; - params.defaultText = (void *) kAlertDefaultOKText; - params.cancelText = NULL; - params.otherText = NULL; - params.defaultButton = kAlertStdAlertOKButton; - params.cancelButton = kAlertStdAlertCancelButton; - params.position = kWindowDefaultPosition; - - StandardAlert(kAlertNoteAlert, "\pInkscape on Mac OS X", - "\pWhile Inkscape is open, its windows can be displayed or hidden by displaying or hiding the X11 application.\n\nThe first time this version of Inkscape is run it may take several minutes before the main window is displayed while font caches are built.", - ¶ms, &itemHit); -} - - -////////////////////////////////// -// 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) -{ - - pthread_join(tid, NULL); - if (odtid) pthread_join(odtid, NULL); - - // Bounce Inkscape Dock icon - RequestUserAttention(); - // Need to show warning to the user, then carry on. - ShowFirstStartWarningDialog(); - - // Note that we've seen the warning. - 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(); - - return noErr; -} - - -/////////////////////////////////// -// Execution thread starts here -/////////////////////////////////// -static void *Execute (void *arg) -{ - EventRef event; - - taskDone = false; - - OSErr err = ExecuteScript(scriptPath, &pid); - if (err == (OSErr)12) { - CreateEvent(NULL, kEventClassRedFatalAlert, kEventKindFCCacheFailed, 0, - kEventAttributeNone, &event); - PostEventToQueue(GetMainEventQueue(), event, kEventPriorityHigh); - } - else ExitToShell(); - return 0; -} - -/////////////////////////////////// -// Open additional documents thread starts here -/////////////////////////////////// -static void *OpenDoc (void *arg) -{ - ExecuteScript(openDocPath, NULL); - return 0; -} - -/////////////////////////////////////// -// Run a script via the system command -/////////////////////////////////////// -static OSErr ExecuteScript (char *script, pid_t *pid) -{ - pid_t wpid = 0, p = 0; - int status, i; - - if (! pid) pid = &p; - - // Generate the array of argument strings before we do any executing - arguments[0] = script; - for (i = 0; i < numArgs; i++) arguments[i + 1] = fileArgs[i]; - arguments[i + 1] = NULL; - - *pid = fork(); //open fork - - if (*pid == (pid_t)-1) exit(13); //error - else if (*pid == 0) { //child process started - execve(arguments[0], arguments, environ); - exit(13); //if we reach this point, there's an error - } - - wpid = waitpid(*pid, &status, 0); //wait while child process finishes - - if (wpid == (pid_t)-1) return wpid; - return (OSErr)WEXITSTATUS(status); -} - -#pragma mark - - -/////////////////////////////////////// -// This function loads all the neccesary settings -// from config files in the Resources folder -/////////////////////////////////////// -static void GetParameters (void) -{ - char *str; - if (! (str = (char *)GetScript())) //get path to script to be executed - RedFatalAlert("\pInitialization Error", - "\pError getting script from application bundle."); - strcpy((char *)&scriptPath, str); - - if (! (str = (char *)GetOpenDoc())) //get path to openDoc - RedFatalAlert("\pInitialization Error", - "\pError getting openDoc from application bundle."); - strcpy((char *)&openDocPath, str); -} - -/////////////////////////////////////// -// Get path to the script in Resources folder -/////////////////////////////////////// -static unsigned char* GetScript (void) -{ - CFStringRef fileName; - CFBundleRef appBundle; - CFURLRef scriptFileURL; - FSRef fileRef; - unsigned char *path; - - //get CF URL for script - if (! (appBundle = CFBundleGetMainBundle())) return NULL; - if (! (fileName = CFStringCreateWithCString(NULL, kScriptFileName, - kCFStringEncodingASCII))) - return NULL; - if (! (scriptFileURL = CFBundleCopyResourceURL(appBundle, fileName, NULL, - NULL))) return NULL; - - //Get file reference from Core Foundation URL - if (! CFURLGetFSRef(scriptFileURL, &fileRef)) return NULL; - - //dispose of the CF variables - CFRelease(scriptFileURL); - CFRelease(fileName); - - //create path string - if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; - if (! DoesFileExist(path)) return NULL; - - return path; -} - -/////////////////////////////////////// -// Gets the path to openDoc in Resources folder -/////////////////////////////////////// -static unsigned char* GetOpenDoc (void) -{ - CFStringRef fileName; - CFBundleRef appBundle; - CFURLRef openDocFileURL; - FSRef fileRef; - unsigned char *path; - - //get CF URL for openDoc - if (! (appBundle = CFBundleGetMainBundle())) return NULL; - if (! (fileName = CFStringCreateWithCString(NULL, kOpenDocFileName, - kCFStringEncodingASCII))) - return NULL; - if (! (openDocFileURL = CFBundleCopyResourceURL(appBundle, fileName, NULL, - NULL))) return NULL; - - //Get file reference from Core Foundation URL - if (! CFURLGetFSRef( openDocFileURL, &fileRef )) return NULL; - - //dispose of the CF variables - CFRelease(openDocFileURL); - CFRelease(fileName); - - //create path string - if (! (path = malloc(kMaxPathLength))) return NULL; - if (FSMakePath(fileRef, path, kMaxPathLength)) return NULL; - if (! DoesFileExist(path)) return NULL; - - return path; -} - -#pragma mark - - -///////////////////////////////////// -// Load menu bar from nib -///////////////////////////////////// -OSErr LoadMenuBar (char *appName) -{ - OSErr err; - IBNibRef nibRef; - - if (err = CreateNibReference(CFSTR("MenuBar"), &nibRef)) return err; - if (err = SetMenuBarFromNib(nibRef, CFSTR("MenuBar"))) return err; - DisposeNibReference(nibRef); - - return noErr; -} - -#pragma mark - - -/////////////////////////////////////// -// Generate path string from FSSpec record -/////////////////////////////////////// -static OSStatus FSMakePath(FSRef fileRef, unsigned char *path, long maxPathSize) -{ - // and then convert the FSRef to a path - return FSRefMakePath(&fileRef, path, maxPathSize); -} - -//////////////////////////////////////// -// Standard red error alert, then exit application -//////////////////////////////////////// -static void RedFatalAlert (Str255 errorString, Str255 expStr) -{ - StandardAlert(kAlertStopAlert, errorString, expStr, NULL, NULL); - ExitToShell(); -} - -/////////////////////////////////////// -// Determines whether file exists at path or not -/////////////////////////////////////// -static short DoesFileExist (unsigned char *path) -{ - if (access((char *)path, F_OK) == -1) return false; - return true; -} - -#pragma mark - - -/////////////////////////////////////// -// Apple Event handler for Quit i.e. from -// the dock or Application menu item -/////////////////////////////////////// -static OSErr AppQuitAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - #pragma unused (reply, refCon, theAppleEvent) - - while (numArgs > 0) free(fileArgs[numArgs--]); - - if (! taskDone && pid) { //kill the script process brutally - kill(pid, 9); - printf("Inkscape.app: PID %d killed brutally\n", pid); - } - - pthread_cancel(tid); - if (odtid) pthread_cancel(odtid); - - ExitToShell(); - - return noErr; -} - -///////////////////////////////////// -// Handler for docs dragged on app icon -///////////////////////////////////// -static OSErr AppOpenDocAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - #pragma unused (reply, refCon) - - OSErr err = noErr; - AEDescList fileRefList; - AEKeyword keyword; - DescType type; - - short i; - long count, actualSize; - - FSRef fileRef; - unsigned char path[kMaxPathLength]; - - while (numArgs > 0) free(fileArgs[numArgs--]); - - //Read the AppleEvent - err = AEGetParamDesc(theAppleEvent, keyDirectObject, typeAEList, - &fileRefList); - - err = AECountItems(&fileRefList, &count); //Count number of files - - for (i = 1; i <= count; i++) { //iteratively process each file - //get fsref from apple event - if (! (err = AEGetNthPtr(&fileRefList, i, typeFSRef, &keyword, &type, - (Ptr)&fileRef, sizeof(FSRef), &actualSize))) - { - //get path from file ref - if ((err = FSMakePath(fileRef, (unsigned char *)&path, - kMaxPathLength))) return err; - - if (numArgs == kMaxArgumentsToScript) break; - - if (! (fileArgs[numArgs] = malloc(kMaxPathLength))) return true; - - strcpy(fileArgs[numArgs++], (char *)&path); - } - else return err; - } - - if (! taskDone) pthread_create(&odtid, NULL, OpenDoc, NULL); - else pthread_create(&tid, NULL, Execute, NULL); - - return err; -} - -/////////////////////////////// -// Handler for clicking on app icon -/////////////////////////////// -// if app is already open -static OSErr AppReopenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - return runScript(); -} - -// if app is being opened -static OSErr AppOpenAppAEHandler(const AppleEvent *theAppleEvent, - AppleEvent *reply, long refCon) -{ - #pragma unused (reply, refCon, theAppleEvent) - - // the app has been opened without any items dragged on to it - pthread_create(&tid, NULL, Execute, NULL); - - 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. -ComponentInstance theComponent; -AEDesc scriptTextDesc; -OSStatus err; -OSAID scriptID, resultID; - -static OSStatus CompileAppleScript(const void* text, long textLength, - AEDesc *resultData) { - - resultData = NULL; - /* set up locals to a known state */ - theComponent = NULL; - AECreateDesc(typeNull, NULL, 0, &scriptTextDesc); - scriptID = kOSANullScript; - resultID = kOSANullScript; - - /* open the scripting component */ - theComponent = OpenDefaultComponent(kOSAComponentType, - typeAppleScript); - if (theComponent == NULL) { err = paramErr; return err; } - - /* put the script text into an aedesc */ - err = AECreateDesc(typeChar, text, textLength, &scriptTextDesc); - if (err != noErr) return err; - - /* compile the script */ - err = OSACompile(theComponent, &scriptTextDesc, - kOSAModeNull, &scriptID); - - return err; -} - -/* runs the compiled applescript */ -static OSErr runScript() -{ - /* run the script */ - err = OSAExecute(theComponent, scriptID, kOSANullScript, - kOSAModeNull, &resultID); - return err; -} - - -/* Simple shortcut to the function that actually compiles the applescript. */ -static OSStatus SimpleCompileAppleScript(const char* theScript) { - return CompileAppleScript(theScript, strlen(theScript), NULL); -} diff --git a/packaging/macosx/ScriptExec/openDoc b/packaging/macosx/ScriptExec/openDoc deleted file mode 100755 index 2242173e7..000000000 --- a/packaging/macosx/ScriptExec/openDoc +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - - -echo $1;
\ No newline at end of file diff --git a/packaging/macosx/ScriptExec/script b/packaging/macosx/ScriptExec/script deleted file mode 100755 index 2242173e7..000000000 --- a/packaging/macosx/ScriptExec/script +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - - -echo $1;
\ No newline at end of file diff --git a/packaging/macosx/ScriptExec/version.plist b/packaging/macosx/ScriptExec/version.plist deleted file mode 100644 index a29320186..000000000 --- a/packaging/macosx/ScriptExec/version.plist +++ /dev/null @@ -1,16 +0,0 @@ -<?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>17</string> - <key>CFBundleShortVersionString</key> - <string>0.1</string> - <key>CFBundleVersion</key> - <string>0.1</string> - <key>ProjectName</key> - <string>NibPBTemplates</string> - <key>SourceVersion</key> - <string>1150000</string> -</dict> -</plist> diff --git a/packaging/macosx/create-stock-icon-theme.sh b/packaging/macosx/create-stock-icon-theme.sh deleted file mode 100755 index 4e47f270f..000000000 --- a/packaging/macosx/create-stock-icon-theme.sh +++ /dev/null @@ -1,191 +0,0 @@ -#!/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 - di_stock="edit-undo edit-redo document-revert gtk-undelete - format-indent-less format-indent-more - go-first go-jump go-last go-next go-previous - media-playback-start media-seek-backward media-seek-forward media-skip-backward media-skip-forward" - for di in $di_stock; 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 i in "preferences"; do - if [ -f "gtk-${i}.png" ]; then - if [ ! -e "${i}-system.png" ]; then - ln -s "gtk-${i}.png" "${i}-system.png" - fi - fi - done - cd "$current_dir" -done - - -# create links (round 1): legacy mapping -#--------------------------------------------------------- - -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): directional icons (bug #1269698) -#--------------------------------------------------------- - -for size in $gtk_stock_sizes; do - cd "${icon_theme_name}/${size}x${size}/stock" - # legacy directional icons - di_stock="gtk-undo gtk-redo gtk-revert-to-saved - gtk-unindent gtk-indent - gtk-goto-first gtk-jump-to gtk-goto-last gtk-go-forward gtk-go-back" - for di in $di_stock; do - if [ -f "${di}-ltr.png" ]; then - if [ ! -e "${di}.png" ]; then - ln -s "${di}-ltr.png" "${di}.png" - fi - fi - done - cd "$current_dir" -done - - -# create links (round 3): fallbacks for symbolic icon lookup -#--------------------------------------------------------- - -# 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 differdeleted file mode 100644 index cbb27c341..000000000 --- a/packaging/macosx/dmg_background.png +++ /dev/null diff --git a/packaging/macosx/dmg_background.svg b/packaging/macosx/dmg_background.svg deleted file mode 100644 index 650069fbd..000000000 --- a/packaging/macosx/dmg_background.svg +++ /dev/null @@ -1,1345 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- Created with Inkscape (http://www.inkscape.org/) --> - -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://creativecommons.org/ns#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - 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="1280" - height="800" - id="svg13532" - version="1.1" - inkscape:version="0.91+devel r13674" - viewBox="0 0 1280 800" - sodipodi:docname="dmg_background.svg"> - <defs - id="defs13534"> - <linearGradient - inkscape:collect="always" - id="content_bg"> - <stop - style="stop-color:#eeeeee;stop-opacity:1" - offset="0" - id="stop4699" /> - <stop - style="stop-color:#ffffff;stop-opacity:1" - offset="1" - id="stop4701" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="header_bg"> - <stop - style="stop-color:#e6e6e6;stop-opacity:1" - offset="0" - id="stop4685" /> - <stop - id="stop4687" - offset="0.13333334" - style="stop-color:#e6e6e6;stop-opacity:1" /> - <stop - style="stop-color:#ffffff;stop-opacity:1" - offset="1" - id="stop4689" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="nav_foot"> - <stop - style="stop-color:#4d4d4d;stop-opacity:1" - offset="0" - id="stop4635" /> - <stop - style="stop-color:#333333;stop-opacity:1" - offset="1" - id="stop4637" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="nav_top"> - <stop - style="stop-color:#4d4d4d;stop-opacity:1" - offset="0" - id="stop4469" /> - <stop - style="stop-color:#1a1a1a;stop-opacity:1" - offset="1" - id="stop4471" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - id="linearGradient5785-8-9"> - <stop - offset="0" - style="stop-color:#c0cdf9;stop-opacity:1" - id="stop5787-7-9" /> - <stop - offset="1" - style="stop-color:#07092d;stop-opacity:0.28804347" - id="stop5789-3-7" /> - </linearGradient> - <linearGradient - gradientUnits="userSpaceOnUse" - id="WhiteTransparent-3-90"> - <stop - offset="0" - style="stop-color:#ffffff;stop-opacity:1" - id="stop7606-1-2" /> - <stop - offset="1" - style="stop-color:#ffffff;stop-opacity:0" - id="stop7608-8-0" /> - </linearGradient> - <linearGradient - id="linearGradient5793-9-3"> - <stop - offset="0" - style="stop-color:#eeeeec;stop-opacity:1" - id="stop5795-5-7" /> - <stop - offset="1" - style="stop-color:#eeeeec;stop-opacity:0" - id="stop5797-4-8" /> - </linearGradient> - <linearGradient - id="linearGradient10981-3-9-0"> - <stop - offset="0" - style="stop-color:#729fcf;stop-opacity:1" - id="stop10983-2-0-9" /> - <stop - offset="1" - style="stop-color:#729fcf;stop-opacity:0" - id="stop10985-3-7-7" /> - </linearGradient> - <linearGradient - inkscape:collect="always" - id="linearGradient5781"> - <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> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5785-8-9" - id="linearGradient9175" - y2="40" - x2="60" - y1="20" - x1="82.118591" /> - <clipPath - id="clipoutline1-8"> - <path - 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> - <filter - color-interpolation-filters="sRGB" - id="filter6017-3-7"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.80546496" - id="feGaussianBlur6019-9-28" /> - </filter> - <filter - color-interpolation-filters="sRGB" - id="filter6031-0-56"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="3.4903482" - id="feGaussianBlur6033-8-49" /> - </filter> - <clipPath - id="clipPath9086-1-5"> - <use - xlink:href="#outline1-2" - height="300" - width="400" - y="0" - x="0" - style="opacity:0.25;fill:#ffffff;fill-opacity:1" - id="use9088-0-9" - transform="translate(1.0095461e-6,0)" /> - </clipPath> - <filter - color-interpolation-filters="sRGB" - id="filter8490-0-0"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.4163949" - id="feGaussianBlur8492-5-0" /> - </filter> - <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" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="IcecapTip-0-3" - y2="50" - x2="90" - y1="20" - x1="60" /> - <radialGradient - gradientTransform="matrix(1.5700516,0,0,1.0509301,-75.500107,-22.095908)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient9177-1-7" - fy="250.89737" - fx="116.31038" - r="30.599579" - cy="250.89737" - cx="116.31038" /> - <radialGradient - gradientTransform="matrix(2.0032532,0,0,1.340898,-132.8752,-95.166065)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient8574-0-1" - fy="251.99396" - fx="132.44434" - r="30.599579" - cy="251.99396" - cx="132.44434" /> - <filter - color-interpolation-filters="sRGB" - id="filter8732-3-8" - x="-0.078079157" - width="1.1561583" - y="-0.11422065" - height="1.2284414"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.9579068" - id="feGaussianBlur8734-5-0" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient8744-9-7" - fy="168.5" - fx="210.25" - r="34.25" - cy="168.5" - cx="210.25" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.4233577,0,97.164234)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient8768-6-2" - fy="182.08189" - fx="217.5" - r="34.25" - cy="182.08189" - cx="217.5" /> - <filter - color-interpolation-filters="sRGB" - id="filter8764-9-3" - x="-0.074262142" - width="1.1485243" - y="-0.1754123" - height="1.3508246"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.1195652" - id="feGaussianBlur8766-2-4" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient8912-9-9" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient8910-3-8" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <filter - color-interpolation-filters="sRGB" - id="filter8906-3-4" - x="-0.085441329" - width="1.1708827" - y="-0.27823201" - height="1.556464"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.56515877" - id="feGaussianBlur8908-7-88" /> - </filter> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient8922-9-3" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <filter - color-interpolation-filters="sRGB" - id="filter8980-1-63" - x="-0.069862768" - width="1.1397254" - y="-0.47285891" - height="1.9457178"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.82052366" - id="feGaussianBlur8982-9-6" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient8990-4-8" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient8992-2-5" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.1477455,0,174.56924)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient8994-0-8" - fy="204.83229" - fx="228.21875" - r="14.09375" - cy="204.83229" - cx="228.21875" /> - <radialGradient - gradientTransform="matrix(1,0,0,0.4070844,0,115.76014)" - gradientUnits="userSpaceOnUse" - 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 - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient9023-6-6" - y2="201.5" - x2="231.75" - y1="195.1875" - x1="231.625" /> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient9025-1-9" - y2="200.07138" - x2="231.37646" - y1="195.62132" - x1="231.37646" /> - <radialGradient - gradientTransform="matrix(1.1850746,-0.3283582,0.1228557,0.4433973,-45.068314,152.92161)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient9046-1-8" - fy="230.83626" - fx="90.28125" - r="10.46875" - cy="230.83626" - cx="90.28125" /> - <filter - color-interpolation-filters="sRGB" - id="filter9068-2-2" - x="-0.076179281" - width="1.1523587" - y="-0.1655701" - height="1.3311402"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.66458488" - id="feGaussianBlur9070-7-2" /> - </filter> - <radialGradient - gradientTransform="matrix(1.7221535,0,0,1.6949765,-49.39526,-14.078057)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient11553-3-1" - fy="21.225746" - fx="68.39994" - r="54.783398" - cy="21.225746" - cx="68.39994" /> - <filter - color-interpolation-filters="sRGB" - id="filter9298-4-5"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="0.32610678" - id="feGaussianBlur9300-4-6" /> - </filter> - <linearGradient - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient5905-4-7" - y2="223.5" - x2="153.5" - y1="208.16444" - x1="95.5" /> - <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-7" /> - </filter> - <linearGradient - gradientTransform="matrix(0.8852575,0,0,0.8852575,5.1772151,9.2293372)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient5793-9-3" - id="linearGradient5801-2-8" - y2="84.480316" - x2="53.63158" - y1="76.246338" - x1="57.225197" /> - <radialGradient - gradientTransform="matrix(1.3515234,0,0,1.7175707,-63.705646,-153.95568)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="radialGradient5811-3-0" - fy="214.55121" - fx="181.22731" - r="22.466398" - cy="214.55121" - cx="181.22731" /> - <filter - color-interpolation-filters="sRGB" - id="filter5845-5-1"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="1.2409356" - id="feGaussianBlur5847-5-4" /> - </filter> - <linearGradient - gradientTransform="matrix(0.4927913,0,0,0.4927913,-6.0003885,-9.7225182)" - gradientUnits="userSpaceOnUse" - xlink:href="#WhiteTransparent-3-90" - id="linearGradient5822-7-1" - y2="187.65974" - x2="82.754066" - y1="180.47572" - x1="73.712105" /> - <filter - color-interpolation-filters="sRGB" - id="filter10997-7-2-1"> - <feGaussianBlur - inkscape:collect="always" - stdDeviation="2.7696726" - id="feGaussianBlur10999-0-7-6" /> - </filter> - <linearGradient - gradientTransform="translate(-130.16572,-83.352786)" - gradientUnits="userSpaceOnUse" - xlink:href="#linearGradient10981-3-9-0" - id="linearGradient1539-7" - y2="144.5" - x2="153.70045" - y1="217.5" - x1="180.81293" /> - <clipPath - id="clipPath17127" - clipPathUnits="userSpaceOnUse"> - <rect - y="0" - x="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> - <linearGradient - inkscape:collect="always" - xlink:href="#nav_top" - id="linearGradient4475" - x1="60" - y1="110" - x2="60" - y2="162" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#nav_top" - id="linearGradient4483" - x1="70" - y1="110" - x2="70" - y2="162" - gradientUnits="userSpaceOnUse" /> - <radialGradient - 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 - inkscape:collect="always" - xlink:href="#header_bg" - id="linearGradient4681" - x1="532" - y1="0" - x2="532" - y2="75" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(-20,0)" /> - <linearGradient - inkscape:collect="always" - xlink:href="#content_bg" - id="linearGradient4703" - x1="512" - y1="163" - x2="512" - y2="263" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient5781" - 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="#6666af" - borderopacity="1" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="0.70710678" - inkscape:cx="1680" - inkscape:cy="533.33334" - inkscape:document-units="px" - inkscape:current-layer="layer5" - showgrid="false" - 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="22" - 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 - type="xygrid" - 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="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 /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:groupmode="layer" - id="layer3" - inkscape:label="website vector" - style="display:none"> - <use - x="0" - y="0" - 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="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> - <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 - style="display:inline" - height="100%" - width="100%" - id="use4735" - xlink:href="#rect4669" - y="0" - x="0" - 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;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - x="459" - y="141.78999" - id="text4804" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan4806" - x="459" - y="141.78999">Inkscape 0.91+devel</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.3333333,0,0,1.3333333,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 - clip-path="url(#clipPath17127)" - id="g17092" - transform="translate(0,-128)"> - <g - 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 - 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 - 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 - 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 - 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> - </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> -</svg> diff --git a/packaging/macosx/dmg_set_style.scpt b/packaging/macosx/dmg_set_style.scpt Binary files differdeleted file mode 100755 index b27a6860d..000000000 --- a/packaging/macosx/dmg_set_style.scpt +++ /dev/null diff --git a/packaging/macosx/inkscape.ds_store b/packaging/macosx/inkscape.ds_store Binary files differdeleted file mode 100644 index 469da6fcc..000000000 --- a/packaging/macosx/inkscape.ds_store +++ /dev/null diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh deleted file mode 100755 index 2a6e9ed15..000000000 --- a/packaging/macosx/osx-app.sh +++ /dev/null @@ -1,864 +0,0 @@ -#!/bin/bash -# -# USAGE -# osx-app [-s] [-l /path/to/libraries] -py /path/to/python/modules [-l /path/to/libraries] -b /path/to/bin/inkscape -p /path/to/Info.plist -# -# This script attempts to build an Inkscape.app package for OS X, resolving -# dynamic libraries, etc. -# -# If the '-s' option is given, then the libraries and executable are stripped. -# -# The Info.plist file can be found in the base inkscape directory once -# configure has been run. -# -# AUTHORS -# 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 -# -# Thanks to GNUnet's "build_app" script for help with library dep resolution. -# https://gnunet.org/svn/GNUnet/contrib/OSX/build_app -# -# NB: -# 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_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 [ -z $LIBPREFIX ]; then - LIBPREFIX="" -fi - - -# Help message -#---------------------------------------------------------- -help() -{ -echo -e " -Create an app bundle for OS X - -\033[1mUSAGE\033[0m - $0 [-s] [-l /path/to/libraries] -py /path/to/python/modules -b /path/to/bin/inkscape -p /path/to/Info.plist - -\033[1mOPTIONS\033[0m - \033[1m-h,--help\033[0m - display this help message - \033[1m-s\033[0m - strip the libraries and executables from debugging symbols - \033[1m-py,--with-python\033[0m - add python modules (numpy, lxml) from given directory - inside the app bundle - \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 - 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 -" -} - - -# Parse command line arguments -#---------------------------------------------------------- -while [ "$1" != "" ] -do - case $1 in - -py|--with-python) - add_python=true - python_dir="$2" - shift 1 ;; - -s) - strip_build=true - with_dSYM=false ;; - -l|--libraries) - LIBPREFIX="$2" - shift 1 ;; - -b|--binary) - binary="$2" - shift 1 ;; - -p|--plist) - plist="$2" - shift 1 ;; - -v|--verbose) - verbose_mode=true ;; - -h|--help) - help - exit 0 ;; - *) - echo "Invalid command line option: $1" - exit 2 ;; - esac - shift 1 -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 - exit 1 -fi - -if [ ! -x "$binary" ]; then - echo "Inkscape executable not not found at $binary." >&2 - exit 1 -fi - -if [ "x$plist" == "x" ]; then - echo "Info.plist file not specified." >&2 - exit 1 -fi - -if [ ! -f "$plist" ]; then - echo "Info.plist file not found at $plist." >&2 - exit 1 -fi - -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 ! pkg-config --exists gtk-engines-2; then - echo "Missing gtk-engines2 -- please install gtk-engines2 and try again." >&2 - exit 1 -fi - -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/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 [ ! -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 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 [ ! -e "$LIBPREFIX/lib/libpotrace.dylib" ]; then - echo "Missing potrace -- please install potrace and try again." >&2 - exit 1 -fi - -if ! pkg-config --exists ImageMagick; then - echo "Missing ImageMagick -- please install ImageMagick and try again." >&2 - exit 1 -fi - -# FIXME: retrieve aspell version from installed files (no pkg-config support) -ASPELL_VERSION="0.60" -if [ ! -e "$LIBPREFIX/lib/aspell-$ASPELL_VERSION/en.dat" ]; then - echo "Missing aspell en dictionary -- please install at least 'aspell-dict-en', but" >&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 - - -# 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 - 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. -package="Inkscape.app" - -# Remove a previously existing package if necessary -if [ -d $package ]; then - echo "Removing previous Inkscape.app" - 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" -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" - - -# 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 -#---------------------------------------------------------- -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 -#---------------------------------------------------------- -echo -e "\n\033[1mFilling app bundle...\033[0m\n" - -binary_name=`basename "$binary"` -binary_dir=`dirname "$binary"` - -# Inkscape's binary -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_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_cmd -rp "$LIBPREFIX/share/mime" "$pkgshare/" - -# Copy GTK hicolor icon theme index file -mkdir -p "$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_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 - -# activate wrapper scripts -if [ $add_wrapper = "true" ]; then - mv "$pkgbin/gimp-wrapper.sh" "$pkgbin/gimp" -fi - -# Add python modules if requested -if [ ${add_python} = "true" ]; then - 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" - else # we build Pillow with +tkinter - $cp_cmd -RL "$packages_path/_tkinter.so" "$pkgpython" - fi - $cp_cmd -RL "$packages_path/sk1libs" "$pkgpython" - $cp_cmd -RL "$packages_path/uniconvertor" "$pkgpython" - # pySerial for HPGL plotting - $cp_cmd -RL "$packages_path/serial" "$pkgpython" - #Â PyGTK (optional) - $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 -PANGOVERSION=$(pkg-config --modversion pango) -PANGOVERSION_MINOR="$(cut -d. -f2 <<< $PANGOVERSION)" - -if [ $PANGOVERSION_MINOR -lt 37 ]; then - mkdir -p $pkgetc/pango - touch "$pkgetc/pango/pangorc" -else - echo "Newer pango version found, modules are built-in" -fi - -# 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_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) - -if [ $PANGOVERSION_MINOR -lt 37 ]; then - # Pull in modules - pango_mod_version=`pkg-config --variable=pango_module_version pango` - mkdir -p $pkglib/pango/$pango_mod_version/modules - $cp_cmd $LIBPREFIX/lib/pango/$pango_mod_version/modules/*.so $pkglib/pango/$pango_mod_version/modules/ -fi - -gtk_version=`pkg-config --variable=gtk_binary_version gtk+-2.0` -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 -if [ $PANGOVERSION_MINOR -lt 37 ]; then - pango-querymodules "$pkglib/pango/$pango_mod_version"/modules/*.so \ - | sed -e "s,$PWD/$pkgresources,@loader_path/..,g" \ - > "$pkgetc"/pango/pango.modules -fi - -# 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 - -# ImageMagick version -IMAGEMAGICKVER="$(pkg-config --modversion ImageMagick)" -IMAGEMAGICKVER_MAJOR="$(cut -d. -f1 <<< "$IMAGEMAGICKVER")" - -# 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_cmd -r "$LIBPREFIX/lib/aspell-$ASPELL_VERSION" "$pkglib/" -$cp_cmd -r "$LIBPREFIX/share/aspell" "$pkgshare/" - -# 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,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-$IMAGEMAGICKVER/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 "$pkglib" | wc -l)" - if [ $nnfiles = $nfiles ]; then - endl=false - else - nfiles=$nnfiles - fi -done - -# Some libraries don't seem to have write permission, fix this. -chmod -R u+w "$package/Contents/Resources/lib" - -# Strip libraries and executables if requested -#---------------------------------------------------------- -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 - -# 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 () { - if [ ! -d "$1" ]; then - 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 "" - [ $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 () { - 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 - 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 -} - -rewritelibpaths - - -# Include debug info in app bundle -#---------------------------------------------------------- -# TODO: needs more testing - -if [ "$with_dSYM" = "true" ]; then - - echo -e "\n\033[1mAdding debug info to app bundle ...\033[0m\n" - - # package debug symbols for main binary - echo "dsymutil $binpath" - dsymutil "$binpath" - - # some of the dependencies have debug symbols in MacPorts ... - #for item in libbz2.1.0.dylib libexif.12.dylib libopenraw.1.dylib; do - for item in libbz2.1.0.dylib libexif.12.dylib; do - echo "dsymutil ${pkglib}/${item}" - dsymutil "${pkglib}/${item}" - done - - # to debug issues with ImageMagick / libMagick++ - # Note: install ImageMagick with local portfile which includes the 'debug 1.0' portgroup - # use 'port -n -k upgrade --enforce-variants ImageMagick +debug' to reinstall with debug symbols - # (keep work dir (port -k) to allow recreation of bundled dSYMs with dsymutil) - if [[ "$use_port" == "t" ]]; then - if [[ "$(port echo ImageMagick and active | grep debug)" ]]; then - # if ImageMagick was installed with debug variant - for file in $(find $package -name 'libMagick*' -and -name '*.dylib' -and -not -ipath '*.dSYM*'); do - echo "dsymutil $file" - dsymutil "$file" - done - for file in $(find $package -ipath '*ImageMagick*' -and -name '*.so' -and -not -ipath '*.dSYM*'); do - echo "dsymutil $file" - dsymutil "$file" - done - else - echo "Macports' ImageMagick port was not installed with +debug variant." - fi - else - echo "not using MacPorts, skipping recreation of dSYMs included in app bundle." - fi - - # for debug bundle, remove translations and tutorials (download size) - echo "Removing translation files and tutorials (only for debug builds) ..." - rm -rf "$pkglocale"/* - rm -f "${pkgshare}/${binary_name}/tutorials"/* - -else - - # remove dSYM files if present (local port built with +debug variant from debug port group) - for item in $(find "${pkglib}/ImageMagick-${IMAGEMAGICKVER}" -name '*.dSYM'); do - rm -r "$item" - done - -fi - - -# All done. -#---------------------------------------------------------- -echo "Inkscape.app created successfully." - -exit 0 diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh deleted file mode 100755 index 048523143..000000000 --- a/packaging/macosx/osx-build.sh +++ /dev/null @@ -1,579 +0,0 @@ -#!/bin/bash -# -# Inkscape compilation and packaging script for Mac OS X -# -# Please see -# http://wiki.inkscape.org/wiki/index.php?title=CompilingMacOsX -# for more complete information -# -# 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-2014 -# Released under GNU GPL, read the file 'COPYING' for more information -# - -############################################################ - -# User modifiable parameters -#---------------------------------------------------------- -# Configure flags -CONFFLAGS="--enable-osxapp" -# Libraries prefix (Warning: NO trailing slash) -if [ -z "$LIBPREFIX" ]; then - LIBPREFIX="/opt/local-x11" -fi - -############################################################ - -# Help message -#---------------------------------------------------------- -help() -{ - -echo -e " -Compilation script for Inkscape on Mac OS X. - -\033[1mUSAGE\033[0m - $0 [options] action[s] - -\033[1mACTIONS & OPTIONS\033[0m - \033[1mh,help\033[0m - display this help message - \033[1mu,up,update\033[0m - update an existing checkout from bzr (run bzr pull) - \033[1ma,auto,autogen\033[0m - prepare configure script (run autogen.sh). This is only necessary - for a fresh bzr checkout or after make distclean. - \033[1mc,conf,configure\033[0m - configure the build (run configure). Edit your configuration - options in $0 - \033[1m-g,--debug\033[0m compile with debug symbols and without optimization - \033[1m-p,--prefix\033[0m specify install prefix (configure step only) - \033[1mb,build\033[0m - build Inkscape (run make) - \033[1m-j,--jobs\033[0m Set the number of parallel execution for make - \033[1mi,install\033[0m - 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 - \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[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 ~/python_modules/ p d\033[0m - update an bzr checkout, prepare configure script, configure, - build and install Inkscape in the user home directory (~). - Then package Inkscape without debugging information, - with python packages from ~/python_modules/ and prepare - a dmg for distribution." -} - -# Parameters -#---------------------------------------------------------- -# Paths -HERE="$(pwd)" -SRCROOT="$(cd ../.. && pwd)" # we are currently in packaging/macosx - -# Defaults -if [ -z "$BUILDPREFIX" ]; then - BUILDPREFIX="$SRCROOT/build-osxapp/" -fi -if [ -z "$INSTALLPREFIX" ]; then - INSTALLPREFIX="$SRCROOT/inst-osxapp/" -fi -BZRUPDATE="f" -AUTOGEN="f" -CONFIGURE="f" -DEBUG_BUILD="f" -BUILD="f" -NJOBS=1 -INSTALL="f" -PACKAGE="f" -DISTRIB="f" -BUILD_INFO="f" - -STRIP="" -VERBOSE="" -PYTHON_MODULES="" - -# Parse command line options -#---------------------------------------------------------- -while [ "$1" != "" ] -do - case $1 in - h|help) - help - exit 1 ;; - all) - BZRUPDATE="t" - CONFIGURE="t" - BUILD="t" - INSTALL="t" - PACKAGE="t" - DISTRIB="t" ;; - u|up|update) - BZRUPDATE="t" ;; - a|auto|autogen) - AUTOGEN="t" ;; - c|conf|configure) - CONFIGURE="t" ;; - -g|--debug) - DEBUG_BUILD="t" ;; - b|build) - BUILD="t" ;; - -j|--jobs) - NJOBS=$2 - shift 1 ;; - i|install) - INSTALL="t" ;; - p|pack|package) - PACKAGE="t" ;; - d|dist|distrib) - DISTRIB="t" ;; - -p|--prefix) - INSTALLPREFIX=$2 - shift 1 ;; - -s|--strip) - STRIP="-s" ;; - -py|--with-python) - PYTHON_MODULES="$2" - shift 1 ;; - -v|--verbose) - VERBOSE="-v" ;; - info) - BUILD_INFO="t" ;; - *) - echo "Invalid command line option: $1" - exit 2 ;; - esac - shift 1 -done - -# 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 ]] && export 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 -# ---------------------------------------------------------- -export LIBPREFIX - -# Specific environment variables -# automake seach path -export CPATH="$LIBPREFIX/include" -# configure search path -export CPPFLAGS="$CPPFLAGS -I$LIBPREFIX/include" -export LDFLAGS="$LDFLAGS -L$LIBPREFIX/lib" -# compiler arguments -if [[ $DEBUG_BUILD == "t" ]]; then - export CFLAGS="-g -O0" -else - export CFLAGS="-Os" -fi - -# 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" - 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" - BUILDNO=1 - - TARGETARCH="$_build_arch" - NEWNAME="Inkscape-$INKVERSION$REVISION-$BUILDNO-$gtk_target-$TARGETVERSION-$TARGETARCH" - while [ -e "Inkscape-$INKVERSION$REVISION-$BUILDNO-$gtk_target-$TARGETVERSION-$TARGETARCH".dmg ]; do - let BUILDNO=${BUILDNO}+1 - NEWNAME="Inkscape-$INKVERSION$REVISION-$BUILDNO-$gtk_target-$TARGETVERSION-$TARGETARCH" - done - 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)" - if [ -z "$PORTVER" ]; then - PORTVER="$(port echo ${1}-devel and active 2>/dev/null | cut -d@ -f2 | cut -d_ -f1)" - fi - 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 () { - [ -z "$INFOFILE" ] && 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) - Potrace $(checkversion potrace potrace) -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 - 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" - exit $status - fi - cd $HERE -fi - -if [[ "$AUTOGEN" == "t" ]] -then - cd $SRCROOT - export NOCONFIGURE=true && ./autogen.sh - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nautogen failed" - exit $status - fi - cd $HERE -fi - -if [[ "$CONFIGURE" == "t" ]] -then - ALLCONFFLAGS="$CONFFLAGS --prefix=$INSTALLPREFIX --enable-localinstall" - cd $SRCROOT - 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 - $SRCROOT/configure $ALLCONFFLAGS - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nConfigure failed" - exit $status - fi - cd $HERE -fi - -if [[ "$BUILD" == "t" ]] -then - cd $BUILDPREFIX || exit 1 - touch "$SRCROOT/src/main.cpp" "$SRCROOT/src/ui/dialog/aboutbox.cpp" - make -j $NJOBS - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nBuild failed" - exit $status - fi - cd $HERE -fi - -if [[ "$INSTALL" == "t" ]] -then - cd $BUILDPREFIX || exit 1 - make install - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nInstall failed" - exit $status - fi - cd $HERE -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 $BUILDPREFIX/Info.plist ] - then - 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" - # TODO: fix this: it does not allow for spaces in the PATH under this form and cannot be quoted - fi - - if [[ "$DEBUG_BUILD" = "t" ]]; then - export with_dSYM="true" - fi - - # Create app bundle - ./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 - -if [[ "$DISTRIB" == "t" ]] -then - getinkscapeinfo - # Create dmg bundle - ./osx-dmg.sh -p "Inkscape.app" - status=$? - if [[ $status -ne 0 ]]; then - echo -e "\nDisk image creation failed" - exit $status - fi - - mv Inkscape.dmg $DMGFILE - - if [[ "$DEBUG_BUILD" = "t" ]]; then - mv "$DMGFILE" "${NEWNAME}-debug.dmg" - ln -s "${NEWNAME}-debug.dmg" "$DMGFILE" - fi - - # Prepare information file - BUILD_INFO="t" -fi - -if [[ "$BUILD_INFO" == "t" ]] -then - buildinfofile -fi - -if [[ "$PACKAGE" == "t" || "$DISTRIB" == "t" ]]; -then - # open a Finder window here to admire what we just produced - open . -fi - -exit 0 diff --git a/packaging/macosx/osx-dmg.sh b/packaging/macosx/osx-dmg.sh deleted file mode 100755 index 95129b8cb..000000000 --- a/packaging/macosx/osx-dmg.sh +++ /dev/null @@ -1,178 +0,0 @@ -#!/bin/sh -# -# USAGE -# osx-dmg [-s] -p /path/to/Inkscape.app -# -# The script creates a read-write disk image, -# copies Inkscape in it, customizes its appearance using a -# previously created .DS_Store file (inkscape.ds_store), -# and then compresses the disk image for distribution. -# -# AUTHORS -# Jean-Olivier Irisson <jo.irisson@gmail.com> -# Michael Wybrow <mjwybrow@users.sourceforge.net> -# -# Copyright (C) 2006-2007 -# Released under GNU GPL, read the file 'COPYING' for more information -# -# -# How to update the disk image layout: -# ------------------------------------ -# -# Modify the 'dmg_background.svg' file and generate a new -# 'dmg_background.png' file. -# -# Update the AppleScript file 'dmg_set_style.scpt'. -# -# Run this script with the '-s' option. It will apply the -# 'dmg_set_style.scpt' AppleScript file, and then prompt the -# user to check the window size and position before writing -# a new 'inkscape.ds_store' file to work around a bug in Finder -# and AppleScript. The updated 'inkscape.ds_store' will need -# to be commited to the repository when this is done. -# - -# Defaults -set_ds_store=false -ds_store_file="inkscape.ds_store" -package="" -rw_name="RWinkscape.dmg" -volume_name="Inkscape" -tmp_dir="/tmp/dmg-$$" -auto_open_opt= - -# Help message -#---------------------------------------------------------- -help() -{ -echo -e " -Create a custom dmg file to distribute Inkscape - -\033[1mUSAGE\033[0m - $0 [-s] -p /path/to/Inkscape.app - -\033[1mOPTIONS\033[0m - \033[1m-h,--help\033[0m - display this help message - \033[1m-s\033[0m - set a new apperance (do not actually creates a bundle) - \033[1m-p,--package\033[0m - set the path to the Inkscape.app that should be copie - in the dmg -" -} - -# Parse command line arguments -while [ "$1" != "" ] -do - case $1 in - -h|--help) - help - exit 0 ;; - -s) - set_ds_store=true ;; - -p|--package) - package="$2" - shift 1 ;; - *) - echo "Invalid command line option" - exit 2 ;; - esac - shift 1 -done - -# Safety checks -if [ ! -e "$package" ]; then - echo "Cannot find package: $package" - exit 1 -fi - -echo "\n\033[1mCREATE INKSCAPE DISK IMAGE\033[0m\n" - -# Create temp directory with desired contents of the release volume. -rm -rf "$tmp_dir" -mkdir "$tmp_dir" - -echo "\033[1mCopying files to temp directory\033[0m" -# Inkscape itself -# copy Inkscape.app -cp -rf "$package" "$tmp_dir"/ -# link to Applications in order to drag and drop inkscape onto it -ln -sf /Applications "$tmp_dir"/ - -# Copy a background image inside a hidden directory so the image file itself won't be shown. -mkdir "$tmp_dir/.background" -cp dmg_background.png "$tmp_dir/.background/background.png" - -# If the appearance settings are not to be modified we just copy them -if [ ${set_ds_store} = "false" ]; then - # Copy the .DS_Store file which contains information about - # window size, appearance, etc. Most of this can be set - # with Apple script but involves user intervention so we - # just keep a copy of the correct settings and use that instead. - cp $ds_store_file "$tmp_dir/.DS_Store" - auto_open_opt=-noautoopen -fi - -# Create a new RW image from the temp directory. -echo "\033[1mCreating a temporary disk image\033[0m" -rm -f "$rw_name" -/usr/bin/hdiutil create -srcfolder "$tmp_dir" -volname "$volume_name" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW "$rw_name" - -# We're finished with the temp directory, remove it. -rm -rf "$tmp_dir" - -# Mount the created image. -MOUNT_DIR="/Volumes/$volume_name" -DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify $auto_open_opt "$rw_name" | egrep '^/dev/' | sed 1q | awk '{print $1}'` - -# Have the disk image window open automatically when mounted. -bless -openfolder /Volumes/$volume_name - -# In case the apperance has to be modified, mount the image and apply the base settings to it via Applescript -if [ ${set_ds_store} = "true" ]; then - /usr/bin/osascript dmg_set_style.scpt - - open "/Volumes/$volume_name" - # BUG: one needs to move and close the window manually for the - # changes in appearance to be retained... - echo " - ************************************** - * Please move the disk image window * - * to the center of the screen * - * then close it and press enter * - ************************************** - " - read -e DUMB - - # .DS_Store files aren't written till the disk is unmounted, or finder is restarted. - hdiutil detach "$DEV_NAME" - auto_open_opt=-noautoopen - DEV_NAME=`/usr/bin/hdiutil attach -readwrite -noverify $auto_open_opt "$rw_name" | egrep '^/dev/' | sed 1q | awk '{print $1}'` - echo - echo "New $ds_store_file file written. Re-run $0 without the -s option to use it" - cp /Volumes/$volume_name/.DS_Store ./$ds_store_file - SetFile -a v ./$ds_store_file - - # Unmount the disk image. - hdiutil detach "$DEV_NAME" - rm -f "$rw_name" - - exit 0 -fi - -# Unmount the disk image. -hdiutil detach "$DEV_NAME" - -# Create the offical release image by compressing the RW one. -echo "\033[1mCompressing the final disk image\033[0m" -img_name="Inkscape.dmg" -# TODO make this a command line option -if [ -e "$img_name" ]; then - echo "$img_name already exists." - rm -i "$img_name" -fi -/usr/bin/hdiutil convert "$rw_name" -format UDZO -imagekey zlib-level=9 -o "$img_name" -rm -f "$rw_name" - -exit 0 diff --git a/packaging/macosx/ports/_resources/port1.0/group/python-1.0.tcl b/packaging/macosx/ports/_resources/port1.0/group/python-1.0.tcl deleted file mode 100644 index dd288f57b..000000000 --- a/packaging/macosx/ports/_resources/port1.0/group/python-1.0.tcl +++ /dev/null @@ -1,289 +0,0 @@ -# -*- 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: python-1.0.tcl 118101 2014-03-22 15:16:34Z jmr@macports.org $ -# -# Copyright (c) 2011 The MacPorts Project -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of The MacPorts Project nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -# Usage: -# name should be of the form py-foo for modules -# subports pyXY-foo are declared for each XY in python.versions - -# for apps (i.e. not named py-foo), no subports will be defined -# only the python.default_version will be used -# you can change that in variants if you want - -# options: -# python.versions: which versions this module supports, e.g. "26 27 31" -# always set this (even if you have your own subport blocks) -# python.default_version: which version will be installed if the user asks -# for py-foo rather than pyXY-foo -# -# Note: setting these options requires name to be set beforehand - -categories python - -use_configure no -# we want the default universal variant added despite not using configure -universal_variant yes - -build.target build - -pre-destroot { - xinstall -d -m 755 ${destroot}${prefix}/share/doc/${subport}/examples -} - -options python.versions python.version python.default_version -option_proc python.versions python_set_versions -default python.default_version {[python_get_default_version]} -default python.version {[python_get_version]} - -proc python_get_version {} { - if {[string match py-* [option name]]} { - return [string range [option subport] 2 3] - } else { - return [option python.default_version] - } -} -proc python_get_default_version {} { - global python.versions - if {[info exists python.versions]} { - if {[lsearch -exact ${python.versions} 27] != -1} { - return 27 - } else { - return [lindex ${python.versions} end] - } - } else { - return 27 - } -} - -proc python_set_versions {option action args} { - if {$action ne "set"} { - return - } - global name subport python._addedcode - if {[string match py-* $name]} { - foreach v [option $option] { - subport py${v}[string trimleft $name py] { depends_lib port:python${v} } - } - if {$subport eq $name || $subport eq ""} { - # set up py-foo as a stub port that depends on the default pyXY-foo - fetch {} - checksum {} - extract {} - supported_archs noarch - global python.default_version python.version - unset python.version - depends_lib port:py${python.default_version}[string trimleft $name py] - patch {} - build {} - destroot { - system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README" - } - } else { - set addcode 1 - } - } else { - set addcode 1 - } - if {[info exists addcode] && ![info exists python._addedcode]} { - pre-build { - if {${python.add_archflags}} { - if {[variant_exists universal] && [variant_isset universal]} { - build.env-append CFLAGS="${configure.universal_cflags}" \ - OBJCFLAGS="${configure.universal_cflags}" \ - CXXFLAGS="${configure.universal_cxxflags}" \ - LDFLAGS="${configure.universal_ldflags}" - } else { - build.env-append CFLAGS="${configure.cc_archflags}" \ - OBJCFLAGS="${configure.objc_archflags}" \ - CXXFLAGS="${configure.cxx_archflags}" \ - FFLAGS="${configure.f77_archflags}" \ - F90FLAGS="${configure.f90_archflags}" \ - FCFLAGS="${configure.fc_archflags}" \ - LDFLAGS="${configure.ld_archflags}" - } - } - if {${python.set_compiler}} { - foreach var {cc objc cxx fc f77 f90} { - if {[set configure.${var}] ne ""} { - build.env-append [string toupper $var]="[set configure.${var}]" - } - } - } - } - post-destroot { - if {${python.link_binaries}} { - foreach bin [glob -nocomplain -tails -directory "${destroot}${python.prefix}/bin" *] { - if {[catch {file type "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}"}]} { - ln -s "${python.prefix}/bin/${bin}" "${destroot}${prefix}/bin/${bin}${python.link_binaries_suffix}" - } - } - } - if {${python.move_binaries}} { - foreach bin [glob -nocomplain -tails -directory "${destroot}${prefix}/bin" *] { - move ${destroot}${prefix}/bin/${bin} \ - ${destroot}${prefix}/bin/${bin}${python.move_binaries_suffix} - } - } - } - set python._addedcode 1 - } -} - -option_proc python.default_version python_set_default_version -proc python_set_default_version {option action args} { - if {$action ne "set"} { - return - } - global name subport python.default_version - if {[string match py-* $name]} { - if {$subport eq $name || $subport eq ""} { - depends_lib port:py${python.default_version}[string trimleft $name py] - } - } else { - python.versions ${python.default_version} - depends_lib-append port:python[option python.default_version] - } -} - - -options python.branch python.prefix python.bin python.lib python.libdir \ - python.include python.pkgd -# for pythonXY, python.branch is X.Y -default python.branch {[string range ${python.version} 0 end-1].[string index ${python.version} end]} -default python.prefix {[python_get_defaults prefix]} -default python.bin {[python_get_defaults bin]} -default python.lib {[python_get_defaults lib]} -default python.pkgd {[python_get_defaults pkgd]} -default python.libdir {${python.prefix}/lib/python${python.branch}} -default python.include {[python_get_defaults include]} - -default build.cmd {"${python.bin} setup.py [python_get_defaults setup_args]"} -default destroot.cmd {"${python.bin} setup.py [python_get_defaults setup_args]"} -default destroot.destdir {"--prefix=[python_get_defaults setup_prefix] --root=${destroot}"} - -proc python_get_defaults {var} { - global python.version python.branch prefix python.prefix - switch -- $var { - prefix { - global build_arch frameworks_dir - set ret "${frameworks_dir}/Python.framework/Versions/${python.branch}" - if {${python.version} == 25 || (${python.version} == 24 && - ![file isfile ${ret}/include/python${python.branch}/Python.h] && - ([file isfile ${prefix}/include/python${python.branch}/Python.h] - || [string match *64* $build_arch]))} { - set ret $prefix - } - return $ret - } - bin { - if {${python.version} != 24} { - return "${python.prefix}/bin/python${python.branch}" - } else { - return "${prefix}/bin/python${python.branch}" - } - } - include { - set inc_dir "${python.prefix}/include/python${python.branch}" - if {[file exists ${inc_dir}]} { - return ${inc_dir} - } else { - # look for "${inc_dir}*" and pick the first one found; - # make assumptions if none are found - if {[catch {set inc_dirs [glob ${inc_dir}*]}]} { - if {${python.version} < 30} { - return ${inc_dir} - } else { - return ${inc_dir}m - } - } else { - return [lindex ${inc_dirs} 0] - } - } - } - lib { - if {${python.version} != 24 && ${python.version} != 25} { - return "${python.prefix}/Python" - } else { - return "${prefix}/lib/lib${python.branch}.dylib" - } - } - pkgd { - if {${python.version} != 24} { - return "${python.prefix}/lib/python${python.branch}/site-packages" - } else { - return "${prefix}/lib/python${python.branch}/site-packages" - } - } - setup_args { - if {${python.version} != 24} { - return "--no-user-cfg" - } else { - return "" - } - } - setup_prefix { - if {${python.version} != 24} { - return "${python.prefix}" - } else { - return "${prefix}" - } - } - link_binaries { - if {${python.version} != 24 && ${python.version} != 25} { - return yes - } else { - return no - } - } - move_binaries { - if {${python.version} == 24 || ${python.version} == 25} { - return yes - } else { - return no - } - } - default { - error "unknown option $var" - } - } -} - -options python.add_archflags -default python.add_archflags yes -options python.set_compiler -default python.set_compiler yes - -options python.link_binaries python.link_binaries_suffix -default python.link_binaries {[python_get_defaults link_binaries]} -default python.link_binaries_suffix {-${python.branch}} - -options python.move_binaries python.move_binaries_suffix -default python.move_binaries {[python_get_defaults move_binaries]} -default python.move_binaries_suffix {-${python.branch}} diff --git a/packaging/macosx/ports/devel/dbus-python/Portfile b/packaging/macosx/ports/devel/dbus-python/Portfile deleted file mode 100644 index 3242e1cdb..000000000 --- a/packaging/macosx/ports/devel/dbus-python/Portfile +++ /dev/null @@ -1,164 +0,0 @@ -# -*- 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 119928 2014-05-10 20:35:38Z devans@macports.org $ - -PortSystem 1.0 - -name dbus-python -version 1.2.0 -maintainers mcalhoun openmaintainer -license MIT -categories devel python -platforms darwin -description Python bindings for the dbus message bus system. - -set python_versions {24 25 26 27 31 32 33} - -# this default version should stay synchronized with python_get_default_version -# in the python PortGroup -set python_default_version 27 - -long_description \ - ${description} - -homepage http://www.freedesktop.org/Software/dbus/ -master_sites http://dbus.freedesktop.org/releases/dbus-python/ - -if {${name} eq ${subport}} { - # set up dbus-python as a stub port that depends on the default dbus-pythonXY - fetch {} - checksum {} - extract {} - supported_archs noarch - - depends_lib port:${name}${python_default_version} - - patch {} - use_configure no - build {} - destroot { - xinstall -d ${destroot}${prefix}/share/doc/${name} - system "echo $name is a stub port > ${destroot}${prefix}/share/doc/${name}/README" - } -} - -foreach python_version ${python_versions} { - - set python_branch [string range ${python_version} 0 end-1].[string index ${python_version} end] - - subport ${name}${python_version} { - - checksums rmd160 cba09a1ca259bfa49c943142110a968241f40360 \ - sha256 e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df - - livecheck.type regex - livecheck.url ${master_sites}?C=M&O=D - livecheck.regex ${name}-(\\d+(?:\\.\\d+)*) - - # dbus-python 1.x only supports Python 2.6 and above - if { [vercmp ${python_branch} 2.5] <= 0 } { - version 0.84.0 - - checksums rmd160 ec5912e28e49e89ff3f9a3a5a05292c27f11de2c \ - sha256 b85bc7aaf1a976627ca461b1ca7b0c4ddddff709f52fe44c9b2d1d7d8fac5906 - - livecheck.regex ${name}-(0(?:\\.\\d+)*) - } - - distname ${name}-${version} - - depends_build port:pkgconfig - - depends_lib \ - path:bin/dbus-daemon:dbus \ - port:dbus-glib \ - port:gettext \ - path:lib/pkgconfig/glib-2.0.pc:glib2 \ - port:libiconv \ - port:python${python_version} - - set python_prefix ${frameworks_dir}/Python.framework/Versions/${python_branch} - - configure.pre_args-replace --prefix=${prefix} --prefix=${python_prefix} - - configure.args \ - --docdir=${prefix}/share/doc/${subport} \ - --includedir=${python_prefix}/include/python${python_branch} \ - --disable-html-docs \ - --disable-api-docs - - configure.pkg_config_path ${python_prefix}/lib/pkgconfig - - configure.python ${prefix}/bin/python${python_branch} - - variant html description {Enable HTML documentation building} {} - - # pyXY-epydoc, which is required to build the api, is only supported on certain versions of python - if { [lsearch -exact {25 26 27} ${python_version}] != -1 } { - variant doc description {Enable API documentation building} {} - } - - variant examples description {Install examples} { - post-destroot { - set docdir ${prefix}/share/doc/${subport} - set exdir ${docdir}/examples - xinstall -d ${destroot}${exdir} - eval xinstall -m 644 [glob ${worksrcpath}/examples/*] ${destroot}${exdir} - } - } - - # pyXY-gobject, which is required to test, is only supported on certain versions of python - if { [lsearch -exact {26 27 32 33 34} ${python_version}] != -1 } { - variant test {} - - test.run yes - test.target check - } - - # ${python_version} and ${python_branch} do not have the right value inside variant block, - # so put it here. - if { [variant_isset html] || ([variant_exists doc] && [variant_isset doc]) } { - depends_build-append port:py${python_version}-docutils - configure.env-append RST2HTML=${prefix}/bin/rst2html-${python_branch}.py - } - - if { [variant_isset html] } { - configure.args-replace --disable-html-docs --enable-html-docs - } - - # ${python_version} and ${python_branch} do not have the right value inside variant block, - # so put it here. - if { [variant_exists doc] && [variant_isset doc] } { - depends_build-append port:py${python_version}-epydoc - configure.args-replace --disable-api-docs --enable-api-docs - configure.env-append EPYDOC=${prefix}/bin/epydoc-${python_branch} - - post-destroot { - set docdir ${prefix}/share/doc/${subport} - set apidir ${docdir}/api - xinstall -d ${destroot}${apidir} - eval xinstall -m 644 [glob ${worksrcpath}/api/*] ${destroot}${apidir} - } - } - - # ${python_version} and ${python_branch} do not have the right value inside variant block, - # so put it here. - if { [variant_exists test] } { - if { [variant_isset test] } { - depends_build-append port:py${python_version}-gobject - } else { - pre-test { - ui_error "test variant must be activated to enable test support." - error "Please enable test variant." - } - } - } - - platform darwin 9 { - post-patch { - reinplace "s| -export-symbols-regex.*| \\\\|g" \ - ${worksrcpath}/_dbus_bindings/Makefile.in \ - ${worksrcpath}/_dbus_glib_bindings/Makefile.in - } - } - } -} diff --git a/packaging/macosx/ports/devel/inkscape-packaging/Portfile b/packaging/macosx/ports/devel/inkscape-packaging/Portfile deleted file mode 100644 index de5d9ef35..000000000 --- a/packaging/macosx/ports/devel/inkscape-packaging/Portfile +++ /dev/null @@ -1,126 +0,0 @@ -# -*- 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 101 - -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 \ - port:potrace - -# 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-serial \ - 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 +librevenge - -# livecheck -livecheck.type none diff --git a/packaging/macosx/ports/lang/python25/Portfile b/packaging/macosx/ports/lang/python25/Portfile deleted file mode 100644 index a27bdaf64..000000000 --- a/packaging/macosx/ports/lang/python25/Portfile +++ /dev/null @@ -1,214 +0,0 @@ -# -*- 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 deleted file mode 100644 index d4617a931..000000000 --- a/packaging/macosx/ports/lang/python25/files/_localemodule.c.ed +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 0bdbf3ea0..000000000 --- a/packaging/macosx/ports/lang/python25/files/locale.py.ed +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 100617df6..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-64bit.diff +++ /dev/null @@ -1,1234 +0,0 @@ ---- 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 deleted file mode 100644 index 6f8ac6608..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-FSIORefNum.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 8153bebbd..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-Lib-cgi.py.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 961a8ad28..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-Lib-distutils-dist.py.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 deleted file mode 100644 index e99a24741..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-Makefile.pre.in.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- 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 deleted file mode 100644 index 0fee9e791..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-Misc-setuid-prog.c.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 deleted file mode 100644 index c14913cf7..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-Modules-posixmodule.c.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- 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 deleted file mode 100644 index 22d260047..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-configure.diff +++ /dev/null @@ -1,45 +0,0 @@ ---- 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 deleted file mode 100644 index 130a3ad5d..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-fwrapv.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 deleted file mode 100644 index 99da7a9c4..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-libedit.diff +++ /dev/null @@ -1,132 +0,0 @@ ---- 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 deleted file mode 100644 index 5350dee29..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-mac_ver.diff +++ /dev/null @@ -1,114 +0,0 @@ - -# 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 deleted file mode 100644 index bd0ecd803..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-pyconfig.h.in.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- 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 deleted file mode 100644 index 14d3bc582..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-setup.py-disabled_modules.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 2649594c8..000000000 --- a/packaging/macosx/ports/lang/python25/files/patch-setup.py.diff +++ /dev/null @@ -1,80 +0,0 @@ ---- 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 deleted file mode 100644 index 671d0d560..000000000 --- a/packaging/macosx/ports/lang/python25/files/pyconfig.ed +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 67ecc11a1..000000000 --- a/packaging/macosx/ports/lang/python25/files/pyconfig.h-universal.ed +++ /dev/null @@ -1,50 +0,0 @@ -/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 deleted file mode 100644 index e7ca5aed2..000000000 --- a/packaging/macosx/ports/lang/python25/files/python25 +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index c72cd28d5..000000000 --- a/packaging/macosx/ports/lang/python26/Portfile +++ /dev/null @@ -1,158 +0,0 @@ -# $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 deleted file mode 100644 index fb861bc82..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Lib-cgi.py.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- 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 deleted file mode 100644 index 45276c555..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Lib-distutils-dist.py.diff +++ /dev/null @@ -1,51 +0,0 @@ ---- 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 deleted file mode 100644 index bafcf4715..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Mac-IDLE-Makefile.in.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index cfa5f88ff..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Mac-Makefile.in.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index be74da903..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Mac-PythonLauncher-Makefile.in.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 63e4e11d2..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Mac-Tools-Doc-setup.py.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 60cd69706..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-Makefile.pre.in.diff +++ /dev/null @@ -1,31 +0,0 @@ ---- 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 deleted file mode 100644 index 3acb4ac2b..000000000 --- a/packaging/macosx/ports/lang/python26/files/patch-setup.py.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 deleted file mode 100644 index 671d0d560..000000000 --- a/packaging/macosx/ports/lang/python26/files/pyconfig.ed +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 5be5fa655..000000000 --- a/packaging/macosx/ports/lang/python26/files/python26 +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index acdfe5bac..000000000 --- a/packaging/macosx/ports/lang/python26/files/version.plist +++ /dev/null @@ -1,16 +0,0 @@ -<?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 deleted file mode 100644 index 6935fab95..000000000 --- a/packaging/macosx/ports/python/py-Pillow/Portfile +++ /dev/null @@ -1,74 +0,0 @@ -# -*- 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 deleted file mode 100644 index fe300cfe5..000000000 --- a/packaging/macosx/ports/python/py-Pillow/files/patch-setup.py.diff +++ /dev/null @@ -1,120 +0,0 @@ ---- 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-gobject/Portfile b/packaging/macosx/ports/python/py-gobject/Portfile deleted file mode 100644 index 3503ef1db..000000000 --- a/packaging/macosx/ports/python/py-gobject/Portfile +++ /dev/null @@ -1,77 +0,0 @@ -# -*- 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-gobject -set my_name pygobject -version 2.28.6 -revision 101 -epoch 20110613 -set branch [join [lrange [split ${version} .] 0 1] .] -categories-append gnome -license LGPL-2.1+ -maintainers jwa openmaintainer -platforms darwin -python.versions 26 27 33 34 - -description Python bindings for GObject. - -long_description \ - PyGObject provides a convenient wrapper for the GObject+ library \ - for use in Python programs, and takes care of many of the boring details \ - such as managing memory and type casting. \ - When combined with PyGTK, PyORBit and gnome-python, \ - it can be used to write full featured Gnome applications. - -homepage http://www.pygtk.org/ -master_sites gnome:sources/${my_name}/${branch}/ -distname ${my_name}-${version} -use_xz yes - -checksums rmd160 4bc5e8546a5029d3d6b154629ab3fa4023d96bef \ - sha256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 - -if {$subport ne $name} { - depends_build-append port:pkgconfig - depends_lib-append path:lib/pkgconfig/glib-2.0.pc:glib2 \ - port:libffi \ - port:py${python.version}-cairo \ - port:gobject-introspection - - patch.pre_args -p1 - patchfiles patch-pygi-info.c-p1.diff \ - 00git_class_init.patch \ - 00git_fix_qdata_warning.patch \ - 00git_gio_flag_type.patch - - use_configure yes - configure.python ${python.bin} - configure.env-append PKG_CONFIG_PATH='${python.prefix}/lib/pkgconfig' - configure.pre_args --prefix='${python.prefix}' - configure.args-append --disable-glibtest \ - --enable-introspection=no - configure.cppflags-append \ - -I${python.prefix}/include \ - -I${prefix}/include/cairo - build.cmd [portbuild::build_getmaketype] - build.target - - destroot.cmd ${build.cmd} - destroot.target install - destroot.destdir DESTDIR=${destroot} - - test.run yes - test.env PYTHONPATH=[glob -nocomplain ${worksrcpath}/build/lib*] - test.target check - - post-destroot { - set docdir ${prefix}/share/doc/${subport} - xinstall -d ${destroot}${docdir} - xinstall -m 0644 -W ${worksrcpath} AUTHORS COPYING ChangeLog NEWS README \ - ${destroot}${docdir} - } -} - -livecheck.type none diff --git a/packaging/macosx/ports/python/py-gobject/files/00git_class_init.patch b/packaging/macosx/ports/python/py-gobject/files/00git_class_init.patch deleted file mode 100644 index 01f79d6ce..000000000 --- a/packaging/macosx/ports/python/py-gobject/files/00git_class_init.patch +++ /dev/null @@ -1,316 +0,0 @@ -From 9456ba70fdb98b3a4eb7ee2f630182387a54ca00 Mon Sep 17 00:00:00 2001 -From: Martin Pitt <martinpitt@gnome.org> -Date: Tue, 19 Feb 2013 15:39:56 +0100 -Subject: [PATCH] Move property and signal creation into _class_init() - -We must not add class interfaces after g_type_class_ref() has been called the -first time. Move signal and property creation from pyg_type_register() into -pyg_object_class_init(), and drop the hack of registering interfaces twice. - -This is a backport of commit efcb0f9fd for 2.28.x. This allows old pygtk -applications to work with pygobject 2.28.x and glib 2.35.x. - -Bug: https://bugzilla.gnome.org/show_bug.cgi?id=694108 -Bug-Ubuntu: https://launchpad.net/bugs/1129309 ---- - gobject/gobjectmodule.c | 177 +++++++++++++++++++----------------------------- - 1 file changed, 70 insertions(+), 107 deletions(-) - -diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c -index 2a84606..91f7315 100644 ---- a/gobject/gobjectmodule.c -+++ b/gobject/gobjectmodule.c -@@ -312,13 +312,6 @@ pyg_object_get_property (GObject *object, guint property_id, - pyglib_gil_state_release(state); - } - --static void --pyg_object_class_init(GObjectClass *class, PyObject *py_class) --{ -- class->set_property = pyg_object_set_property; -- class->get_property = pyg_object_get_property; --} -- - typedef struct _PyGSignalAccumulatorData { - PyObject *callable; - PyObject *user_data; -@@ -484,15 +477,14 @@ override_signal(GType instance_type, const gchar *signal_name) - } - - static PyObject * --add_signals (GType instance_type, PyObject *signals) -+add_signals (GObjectClass *klass, PyObject *signals) - { - gboolean ret = TRUE; -- GObjectClass *oclass; - Py_ssize_t pos = 0; - PyObject *key, *value, *overridden_signals = NULL; -+ GType instance_type = G_OBJECT_CLASS_TYPE (klass); - - overridden_signals = PyDict_New(); -- oclass = g_type_class_ref(instance_type); - while (PyDict_Next(signals, &pos, &key, &value)) { - const gchar *signal_name; - gchar *signal_name_canon, *c; -@@ -530,7 +522,6 @@ add_signals (GType instance_type, PyObject *signals) - if (!ret) - break; - } -- g_type_class_unref(oclass); - if (ret) - return overridden_signals; - else { -@@ -800,14 +791,12 @@ pyg_param_spec_from_object (PyObject *tuple) - } - - static gboolean --add_properties (GType instance_type, PyObject *properties) -+add_properties (GObjectClass *klass, PyObject *properties) - { - gboolean ret = TRUE; -- GObjectClass *oclass; - Py_ssize_t pos = 0; - PyObject *key, *value; - -- oclass = g_type_class_ref(instance_type); - while (PyDict_Next(properties, &pos, &key, &value)) { - const gchar *prop_name; - GType prop_type; -@@ -873,7 +862,7 @@ add_properties (GType instance_type, PyObject *properties) - Py_DECREF(slice); - - if (pspec) { -- g_object_class_install_property(oclass, 1, pspec); -+ g_object_class_install_property(klass, 1, pspec); - } else { - PyObject *type, *value, *traceback; - ret = FALSE; -@@ -883,7 +872,7 @@ add_properties (GType instance_type, PyObject *properties) - g_snprintf(msg, 256, - "%s (while registering property '%s' for GType '%s')", - PYGLIB_PyUnicode_AsString(value), -- prop_name, g_type_name(instance_type)); -+ prop_name, G_OBJECT_CLASS_NAME(klass)); - Py_DECREF(value); - value = PYGLIB_PyUnicode_FromString(msg); - } -@@ -892,11 +881,63 @@ add_properties (GType instance_type, PyObject *properties) - } - } - -- g_type_class_unref(oclass); - return ret; - } - - static void -+pyg_object_class_init(GObjectClass *class, PyObject *py_class) -+{ -+ PyObject *gproperties, *gsignals, *overridden_signals; -+ PyObject *class_dict = ((PyTypeObject*) py_class)->tp_dict; -+ -+ class->set_property = pyg_object_set_property; -+ class->get_property = pyg_object_get_property; -+ -+ /* install signals */ -+ /* we look this up in the instance dictionary, so we don't -+ * accidentally get a parent type's __gsignals__ attribute. */ -+ gsignals = PyDict_GetItemString(class_dict, "__gsignals__"); -+ if (gsignals) { -+ if (!PyDict_Check(gsignals)) { -+ PyErr_SetString(PyExc_TypeError, -+ "__gsignals__ attribute not a dict!"); -+ return; -+ } -+ if (!(overridden_signals = add_signals(class, gsignals))) { -+ return; -+ } -+ if (PyDict_SetItemString(class_dict, "__gsignals__", -+ overridden_signals)) { -+ return; -+ } -+ Py_DECREF(overridden_signals); -+ -+ PyDict_DelItemString(class_dict, "__gsignals__"); -+ } else { -+ PyErr_Clear(); -+ } -+ -+ /* install properties */ -+ /* we look this up in the instance dictionary, so we don't -+ * accidentally get a parent type's __gproperties__ attribute. */ -+ gproperties = PyDict_GetItemString(class_dict, "__gproperties__"); -+ if (gproperties) { -+ if (!PyDict_Check(gproperties)) { -+ PyErr_SetString(PyExc_TypeError, -+ "__gproperties__ attribute not a dict!"); -+ return; -+ } -+ if (!add_properties(class, gproperties)) { -+ return; -+ } -+ PyDict_DelItemString(class_dict, "__gproperties__"); -+ /* Borrowed reference. Py_DECREF(gproperties); */ -+ } else { -+ PyErr_Clear(); -+ } -+} -+ -+static void - pyg_register_class_init(GType gtype, PyGClassInitFunc class_init) - { - GSList *list; -@@ -1068,7 +1109,7 @@ pygobject__g_instance_init(GTypeInstance *instance, - */ - static void - pyg_type_add_interfaces(PyTypeObject *class, GType instance_type, -- PyObject *bases, gboolean new_interfaces, -+ PyObject *bases, - GType *parent_interfaces, guint n_parent_interfaces) - { - int i; -@@ -1082,7 +1123,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type, - guint k; - PyObject *base = PyTuple_GET_ITEM(bases, i); - GType itype; -- gboolean is_new = TRUE; - const GInterfaceInfo *iinfo; - GInterfaceInfo iinfo_copy; - -@@ -1099,16 +1139,6 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type, - if (!G_TYPE_IS_INTERFACE(itype)) - continue; - -- for (k = 0; k < n_parent_interfaces; ++k) { -- if (parent_interfaces[k] == itype) { -- is_new = FALSE; -- break; -- } -- } -- -- if ((new_interfaces && !is_new) || (!new_interfaces && is_new)) -- continue; -- - iinfo = pyg_lookup_interface_info(itype); - if (!iinfo) { - gchar *error; -@@ -1129,7 +1159,7 @@ pyg_type_add_interfaces(PyTypeObject *class, GType instance_type, - int - pyg_type_register(PyTypeObject *class, const char *type_name) - { -- PyObject *gtype, *gsignals, *gproperties, *overridden_signals; -+ PyObject *gtype; - GType parent_type, instance_type; - GType *parent_interfaces; - guint n_parent_interfaces; -@@ -1216,88 +1246,22 @@ pyg_type_register(PyTypeObject *class, const char *type_name) - } - - /* -- * Note: Interfaces to be implemented are searched twice. First -- * we register interfaces that are already implemented by a parent -- * type. The second time, the remaining interfaces are -- * registered, i.e. the ones that are not implemented by a parent -- * type. In between these two loops, properties and signals are -- * registered. It has to be done this way, in two steps, -- * otherwise glib will complain. If registering all interfaces -- * always before properties, you get an error like: -- * -- * ../gobject:121: Warning: Object class -- * test_interface+MyObject doesn't implement property -- * 'some-property' from interface 'TestInterface' -- * -- * If, on the other hand, you register interfaces after -- * registering the properties, you get something like: -- * -- * ../gobject:121: Warning: cannot add interface type -- * `TestInterface' to type `test_interface+MyUnknown', since -- * type `test_interface+MyUnknown' already conforms to -- * interface -- * -- * This looks like a GLib quirk, but no bug has been filed -- * upstream. However we have a unit test for this particular -- * problem, which can be found in test_interfaces.py, class -- * TestInterfaceImpl. -+ * Note, all interfaces need to be registered before the first -+ * g_type_class_ref(), see bug #686149. - * - * See also comment above pyg_type_add_interfaces(). - */ -- pyg_type_add_interfaces(class, instance_type, class->tp_bases, FALSE, -+ pyg_type_add_interfaces(class, instance_type, class->tp_bases, - parent_interfaces, n_parent_interfaces); - -- /* we look this up in the instance dictionary, so we don't -- * accidentally get a parent type's __gsignals__ attribute. */ -- gsignals = PyDict_GetItemString(class->tp_dict, "__gsignals__"); -- if (gsignals) { -- if (!PyDict_Check(gsignals)) { -- PyErr_SetString(PyExc_TypeError, -- "__gsignals__ attribute not a dict!"); -- g_free(parent_interfaces); -- return -1; -- } -- if (!(overridden_signals = add_signals(instance_type, gsignals))) { -- g_free(parent_interfaces); -- return -1; -- } -- if (PyDict_SetItemString(class->tp_dict, "__gsignals__", -- overridden_signals)) { -- g_free(parent_interfaces); -- return -1; -- } -- Py_DECREF(overridden_signals); -- } else { -- PyErr_Clear(); -- } - -- /* we look this up in the instance dictionary, so we don't -- * accidentally get a parent type's __gsignals__ attribute. */ -- gproperties = PyDict_GetItemString(class->tp_dict, "__gproperties__"); -- if (gproperties) { -- if (!PyDict_Check(gproperties)) { -- PyErr_SetString(PyExc_TypeError, -- "__gproperties__ attribute not a dict!"); -- g_free(parent_interfaces); -- return -1; -- } -- if (!add_properties(instance_type, gproperties)) { -- g_free(parent_interfaces); -- return -1; -- } -- PyDict_DelItemString(class->tp_dict, "__gproperties__"); -- /* Borrowed reference. Py_DECREF(gproperties); */ -- } else { -- PyErr_Clear(); -+ gclass = g_type_class_ref(instance_type); -+ if (PyErr_Occurred() != NULL) { -+ g_type_class_unref(gclass); -+ g_free(parent_interfaces); -+ return -1; - } - -- /* Register new interfaces, that are _not_ already defined by -- * the parent type. FIXME: See above. -- */ -- pyg_type_add_interfaces(class, instance_type, class->tp_bases, TRUE, -- parent_interfaces, n_parent_interfaces); -- -- gclass = g_type_class_ref(instance_type); - if (pyg_run_class_init(instance_type, gclass, class)) { - g_type_class_unref(gclass); - g_free(parent_interfaces); -@@ -1306,9 +1270,8 @@ pyg_type_register(PyTypeObject *class, const char *type_name) - g_type_class_unref(gclass); - g_free(parent_interfaces); - -- if (gsignals) -- PyDict_DelItemString(class->tp_dict, "__gsignals__"); -- -+ if (PyErr_Occurred() != NULL) -+ return -1; - return 0; - } - --- -1.8.1.2 - diff --git a/packaging/macosx/ports/python/py-gobject/files/00git_fix_qdata_warning.patch b/packaging/macosx/ports/python/py-gobject/files/00git_fix_qdata_warning.patch deleted file mode 100644 index ed4b5d2b9..000000000 --- a/packaging/macosx/ports/python/py-gobject/files/00git_fix_qdata_warning.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 42d871eb0b08ee6d55e95cc7e4b90844919555b9 Mon Sep 17 00:00:00 2001 -From: Ivan Stankovic <ivan.stankovic@avl.com> -Date: Tue, 21 Feb 2012 12:24:58 +0100 -Subject: [PATCH 1/2] Fix set_qdata warning on accessing NULL gobject property - -https://bugzilla.gnome.org/show_bug.cgi?id=661155 ---- - gobject/pygobject.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -diff --git a/gobject/pygobject.c b/gobject/pygobject.c -index 6c2f06c..70dc89a 100644 ---- a/gobject/pygobject.c -+++ b/gobject/pygobject.c -@@ -991,7 +991,9 @@ pygobject_new(GObject *obj) - PyObject * - pygobject_new_sunk(GObject *obj) - { -- g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1)); -+ if (obj) -+ g_object_set_qdata (obj, pygobject_ref_sunk_key, GINT_TO_POINTER (1)); -+ - return pygobject_new_full(obj, TRUE, NULL); - } - --- -1.7.9.1 - diff --git a/packaging/macosx/ports/python/py-gobject/files/00git_gio_flag_type.patch b/packaging/macosx/ports/python/py-gobject/files/00git_gio_flag_type.patch deleted file mode 100644 index 78e7ddfd5..000000000 --- a/packaging/macosx/ports/python/py-gobject/files/00git_gio_flag_type.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 -From: Ryan Lortie <desrt@desrt.ca> -Date: Mon, 12 Mar 2012 16:44:14 -0400 -Subject: gio-types.defs: change some enums to flags - -These flags types were originally incorrectly handled in glib as being -enums. That bug was fixed, but they're still enums here, leading to -warnings about the mismatch. - -Change them to flags. - -https://bugzilla.gnome.org/show_bug.cgi?id=668522 ---- - gio/gio-types.defs | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gio-types.defs b/gio/gio-types.defs -index 331e0bc..7eee5c8 100644 ---- a/gio/gio-types.defs -+++ b/gio/gio-types.defs -@@ -526,7 +526,7 @@ - ) - ) - --(define-enum MountMountFlags -+(define-flags MountMountFlags - (in-module "gio") - (c-name "GMountMountFlags") - (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") -@@ -545,7 +545,7 @@ - ) - ) - --(define-enum DriveStartFlags -+(define-flags DriveStartFlags - (in-module "gio") - (c-name "GDriveStartFlags") - (gtype-id "G_TYPE_DRIVE_START_FLAGS") -@@ -770,7 +770,7 @@ - ) - ) - --(define-enum SocketMsgFlags -+(define-flags SocketMsgFlags - (in-module "gio") - (c-name "GSocketMsgFlags") - (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") --- -1.7.9.1 - diff --git a/packaging/macosx/ports/python/py-gobject/files/patch-pygi-info.c-p1.diff b/packaging/macosx/ports/python/py-gobject/files/patch-pygi-info.c-p1.diff deleted file mode 100644 index b5a3d519d..000000000 --- a/packaging/macosx/ports/python/py-gobject/files/patch-pygi-info.c-p1.diff +++ /dev/null @@ -1,28 +0,0 @@ ---- a/gi/pygi-info.c.orig 2014-01-15 09:16:11.000000000 +0200 -+++ b/gi/pygi-info.c 2014-01-15 09:16:52.000000000 +0200 -@@ -162,9 +162,6 @@ - case GI_INFO_TYPE_CONSTANT: - type = &PyGIConstantInfo_Type; - break; -- case GI_INFO_TYPE_ERROR_DOMAIN: -- type = &PyGIErrorDomainInfo_Type; -- break; - case GI_INFO_TYPE_UNION: - type = &PyGIUnionInfo_Type; - break; -@@ -481,7 +478,6 @@ - case GI_INFO_TYPE_INVALID: - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CONSTANT: -- case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_VALUE: - case GI_INFO_TYPE_SIGNAL: - case GI_INFO_TYPE_PROPERTY: -@@ -860,7 +856,6 @@ - case GI_INFO_TYPE_INVALID: - case GI_INFO_TYPE_FUNCTION: - case GI_INFO_TYPE_CONSTANT: -- case GI_INFO_TYPE_ERROR_DOMAIN: - case GI_INFO_TYPE_VALUE: - case GI_INFO_TYPE_SIGNAL: - case GI_INFO_TYPE_PROPERTY: diff --git a/packaging/macosx/ports/python/py-numpy/Portfile b/packaging/macosx/ports/python/py-numpy/Portfile deleted file mode 100644 index 0a325c8ba..000000000 --- a/packaging/macosx/ports/python/py-numpy/Portfile +++ /dev/null @@ -1,214 +0,0 @@ -# -*- 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 127764 2014-11-03 14:01:21Z michaelld@macports.org $ - -PortSystem 1.0 -PortGroup python 1.0 -PortGroup github 1.0 - -github.setup numpy numpy 1.9.1 v -name py-numpy -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 c043ce0045166762e36c513458abc499d36bbcf5 \ - sha256 504b7cbc3b47df592d683e0f3b992cfa4d29338f8d23fca07f040164018b607f - -python.versions 27 32 33 34 - -if {${name} ne ${subport}} { - - revision 100 - - patchfiles patch-f2py_setup.py.diff \ - patch-fcompiler_g95.diff \ - patch-numpy_core_setup.py.diff - - depends_lib-append port:fftw-3 \ - port:py${python.version}-nose \ - port:py${python.version}-cython - - # 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} { - 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 gcc48. - - 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 gcc47]} { - default_variants +gcc48 - } - - 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} eq "i386"} { - supported_archs i386 x86_64 - } elseif {${os.arch} eq "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" - } - } - - 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 - - if {[variant_isset atlas]} { - build.env-append ATLAS=${prefix}/lib \ - LAPACK=${prefix}/lib \ - BLAS=${prefix}/lib - destroot.env-append ATLAS=${prefix}/lib \ - LAPACK=${prefix}/lib \ - BLAS=${prefix}/lib - } else { - build.env-append ATLAS=None \ - LAPACK=/usr/lib \ - BLAS=/usr/lib - destroot.env-append ATLAS=None \ - LAPACK=/usr/lib \ - BLAS=/usr/lib - } - -} else { - livecheck none - #livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}" -} diff --git a/packaging/macosx/ports/python/py-numpy/files/patch-f2py_setup.py.diff b/packaging/macosx/ports/python/py-numpy/files/patch-f2py_setup.py.diff deleted file mode 100644 index 1e3164e73..000000000 --- a/packaging/macosx/ports/python/py-numpy/files/patch-f2py_setup.py.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- numpy/f2py/setup.py -+++ numpy/f2py/setup.py -@@ -41,21 +41,21 @@ def configuration(parent_package='',top_ - ) - - 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': - f2py_exe = f2py_exe + '.py' - target = os.path.join(build_dir, f2py_exe) - if newer(__file__, target): - log.info('Creating %s', target) - f = open(target, 'w') - f.write('''\ --#!%s -+#!@@MPORTS_PYTHON@@ - # See http://cens.ioc.ee/projects/f2py2e/ - import os, sys - for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: - try: - i=sys.argv.index("--"+mode) -@@ -75,11 +75,11 @@ elif mode=="2e-numpy": - from numpy.f2py import main - else: - sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") - sys.exit(1) - main() --'''%(sys.executable)) -+''') - f.close() - return target - - config.add_scripts(generate_f2py_py) - diff --git a/packaging/macosx/ports/python/py-numpy/files/patch-fcompiler_g95.diff b/packaging/macosx/ports/python/py-numpy/files/patch-fcompiler_g95.diff deleted file mode 100644 index b95a2609a..000000000 --- a/packaging/macosx/ports/python/py-numpy/files/patch-fcompiler_g95.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- numpy/distutils/fcompiler/__init__.py -+++ numpy/distutils/fcompiler/__init__.py -@@ -708,11 +708,11 @@ - ('win32', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95', - 'intelvem', 'intelem')), - ('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',)), - # os.name mappings - ('posix', ('gnu', 'gnu95',)), diff --git a/packaging/macosx/ports/python/py-numpy/files/patch-numpy_core_setup.py.diff b/packaging/macosx/ports/python/py-numpy/files/patch-numpy_core_setup.py.diff deleted file mode 100644 index 1c9a09c34..000000000 --- a/packaging/macosx/ports/python/py-numpy/files/patch-numpy_core_setup.py.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- numpy/core/setup.py.orig 2014-03-25 19:03:06.000000000 -0400 -+++ numpy/core/setup.py 2014-03-25 19:03:26.000000000 -0400 -@@ -485,7 +485,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') -@@ -585,7 +592,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 __STDC_FORMAT_MACROS - target_f.write(""" diff --git a/packaging/macosx/ports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff b/packaging/macosx/ports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff deleted file mode 100644 index 848d46186..000000000 --- a/packaging/macosx/ports/python/py-numpy/files/patch-numpy_linalg_setup.py.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- numpy/linalg/setup.py.orig 2013-11-16 08:30:31.000000000 -0500 -+++ numpy/linalg/setup.py 2013-11-16 08:39:27.000000000 -0500 -@@ -37,7 +37,8 @@ - config.add_extension('lapack_lite', - sources = [get_lapack_lite_sources], - depends = ['lapack_litemodule.c'] + lapack_lite_src, -- extra_info = lapack_info -+ extra_info = lapack_info, -+ extra_link_args=['-undefined dynamic_lookup -bundle'] - ) - - # umath_linalg module -@@ -47,6 +48,7 @@ - depends = ['umath_linalg.c.src'] + lapack_lite_src, - extra_info = lapack_info, - libraries = ['npymath'], -+ extra_link_args=['-undefined dynamic_lookup -bundle'] - ) - - return config diff --git a/packaging/macosx/ports/python/py-numpy/files/wrapper-template b/packaging/macosx/ports/python/py-numpy/files/wrapper-template deleted file mode 100755 index 48936d107..000000000 --- a/packaging/macosx/ports/python/py-numpy/files/wrapper-template +++ /dev/null @@ -1,143 +0,0 @@ -#!/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/py-sk1libs/Portfile b/packaging/macosx/ports/python/py-sk1libs/Portfile deleted file mode 100644 index 0c152ce8c..000000000 --- a/packaging/macosx/ports/python/py-sk1libs/Portfile +++ /dev/null @@ -1,64 +0,0 @@ -# -*- 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 deleted file mode 100644 index 1d69461a3..000000000 --- a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 deleted file mode 100644 index 541935e71..000000000 --- a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff +++ /dev/null @@ -1,26 +0,0 @@ ---- 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 deleted file mode 100644 index 2c4a22ca0..000000000 --- a/packaging/macosx/ports/python/py-uniconvertor/Portfile +++ /dev/null @@ -1,46 +0,0 @@ -# -*- 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 deleted file mode 100644 index aa74a06ad..000000000 --- a/packaging/macosx/ports/python/py25-Pillow/Portfile +++ /dev/null @@ -1,77 +0,0 @@ -# -*- 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 deleted file mode 100644 index 99f72a8c9..000000000 --- a/packaging/macosx/ports/python/py25-Pillow/files/patch-_imagingft.c.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- _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 deleted file mode 100644 index 2f4b797f6..000000000 --- a/packaging/macosx/ports/python/py25-Pillow/files/patch-setup.py-v1.7.8.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- 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 deleted file mode 100644 index 49a753cd1..000000000 --- a/packaging/macosx/ports/python/py25-lxml/Portfile +++ /dev/null @@ -1,51 +0,0 @@ -# -*- 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 deleted file mode 100644 index 62a60eec5..000000000 --- a/packaging/macosx/ports/python/py25-nose/Portfile +++ /dev/null @@ -1,86 +0,0 @@ -# -*- 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 deleted file mode 100644 index d9a8f4034..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests24 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.4 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests25 b/packaging/macosx/ports/python/py25-nose/files/nosetests25 deleted file mode 100644 index 95864c283..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests25 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.5 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests26 b/packaging/macosx/ports/python/py25-nose/files/nosetests26 deleted file mode 100644 index bb670776f..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests26 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.6 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests27 b/packaging/macosx/ports/python/py25-nose/files/nosetests27 deleted file mode 100644 index 28c7bfe8c..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests27 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.7 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests31 b/packaging/macosx/ports/python/py25-nose/files/nosetests31 deleted file mode 100644 index 5ba27a4d5..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests31 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.1 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests32 b/packaging/macosx/ports/python/py25-nose/files/nosetests32 deleted file mode 100644 index 07bfb86a1..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests32 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.2 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests33 b/packaging/macosx/ports/python/py25-nose/files/nosetests33 deleted file mode 100644 index b750d806b..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests33 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.3 diff --git a/packaging/macosx/ports/python/py25-nose/files/nosetests34 b/packaging/macosx/ports/python/py25-nose/files/nosetests34 deleted file mode 100644 index 542ffc949..000000000 --- a/packaging/macosx/ports/python/py25-nose/files/nosetests34 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.4 diff --git a/packaging/macosx/ports/python/py25-numpy/Portfile b/packaging/macosx/ports/python/py25-numpy/Portfile deleted file mode 100644 index 4575d6293..000000000 --- a/packaging/macosx/ports/python/py25-numpy/Portfile +++ /dev/null @@ -1,209 +0,0 @@ -# -*- 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 deleted file mode 100644 index 5b8f2a28f..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/patch-f2py_setup.py.diff +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 deleted file mode 100644 index 2640a530b..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/patch-fcompiler_g95.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 4f73dcfc9..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_distutils_fcompiler___init__.py.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 deleted file mode 100644 index 0b06883a4..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/patch-numpy_linalg_setup.py.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 04e3cdd7a..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/patch-setup.py.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- 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 deleted file mode 100755 index 48936d107..000000000 --- a/packaging/macosx/ports/python/py25-numpy/files/wrapper-template +++ /dev/null @@ -1,143 +0,0 @@ -#!/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 deleted file mode 100644 index 35c528500..000000000 --- a/packaging/macosx/ports/python/py25-setuptools/Portfile +++ /dev/null @@ -1,58 +0,0 @@ -# -*- 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/packaging/macosx/ports/python/py26-cython/Portfile b/packaging/macosx/ports/python/py26-cython/Portfile deleted file mode 100644 index 9497f5e7e..000000000 --- a/packaging/macosx/ports/python/py26-cython/Portfile +++ /dev/null @@ -1,85 +0,0 @@ -# -*- 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 125247 2014-09-11 17:01:30Z stromnov@macports.org $ - -PortSystem 1.0 -PortGroup python 1.0 -PortGroup select 1.0 - -name py26-cython -version 0.21 -revision 0 -categories-append devel -platforms darwin -license Apache-2 - -python.versions 26 -python.version 26 - -maintainers stromnov openmaintainer - -description A language for writing C extension modules for Python. - -long_description Cython is a language that makes writing C extensions for \ - the Python language as easy as Python itself. Cython is \ - based on the well-known Pyrex, but supports more cutting \ - edge functionality and optimizations - -homepage http://www.cython.org/ -master_sites ${homepage}release/ \ - http://pypi.python.org/packages/source/C/Cython/ - -distname Cython-${version} - -checksums rmd160 f5944014c1e4dccb8ec23af96efc05c137917371 \ - sha256 0cd5787fb3f1eaf8326b21bdfcb90aabd3eca7c214c5b7b503fbb82da97bbaa0 - -if {${name} eq ${subport}} { - - revision 100 - - # Cython 0.21 requires Python 2.6+ or 3.3+ - if {[lsearch {24 25 31 32} ${python.version}] != -1} { - version 0.20.2 - revision 0 - distname Cython-${version} - checksums rmd160 e78f1779077d6c8e266c9b42b85c8e9031a342d2 \ - sha256 ed13b606a2aeb5bd6c235f8ed6c9988c99d01a033d0d21d56137c13d5c7be63f - } - - post-destroot { - if {${subport} eq "py24-cython" || ${subport} eq "py25-cython"} { - xinstall -m 644 -W ${worksrcpath}/Doc About.html FAQ.html \ - extension_types.html index.html overview.html primes.c sharing.html \ - special_methods.html ${destroot}${prefix}/share/doc/${subport} - xinstall -m 644 -W ${worksrcpath} INSTALL.txt README.txt \ - ToDo.txt USAGE.txt ${destroot}${prefix}/share/doc/${subport} - } else { - xinstall -m 755 -d ${destroot}${python.prefix}/share/doc/cython - xinstall -m 644 -W ${worksrcpath}/Doc About.html FAQ.html \ - extension_types.html index.html overview.html primes.c sharing.html \ - special_methods.html ${destroot}${python.prefix}/share/doc/cython - xinstall -m 644 -W ${worksrcpath} INSTALL.txt README.txt\ - ToDo.txt USAGE.txt ${destroot}${python.prefix}/share/doc/cython - } - } - - depends_run port:cython_select - test.run no - - select.group cython - select.file ${filespath}/cython${python.version} - - notes " -To make the Python ${python.branch} version of Cython the one that is run\ -when you execute the commands without a version suffix, e.g. 'cython', run: - -port select --set ${select.group} [file tail ${select.file}] -" - - livecheck.type none -} else { - #livecheck.type regex - #livecheck.url [lindex ${master_sites} 0] - #livecheck.regex {Cython-(\d+(?:\.\d+)*)\.[tz]} - livecheck.type none -} diff --git a/packaging/macosx/ports/python/py26-cython/files/cython24 b/packaging/macosx/ports/python/py26-cython/files/cython24 deleted file mode 100644 index 6fa8a8026..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython24 +++ /dev/null @@ -1,2 +0,0 @@ -bin/cython-2.4 -- diff --git a/packaging/macosx/ports/python/py26-cython/files/cython25 b/packaging/macosx/ports/python/py26-cython/files/cython25 deleted file mode 100644 index 294a43303..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython25 +++ /dev/null @@ -1,2 +0,0 @@ -bin/cython-2.5 -- diff --git a/packaging/macosx/ports/python/py26-cython/files/cython26 b/packaging/macosx/ports/python/py26-cython/files/cython26 deleted file mode 100644 index 48523983b..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython26 +++ /dev/null @@ -1,2 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/2.6/bin/cython -${frameworks_dir}/Python.framework/Versions/2.6/bin/cygdb diff --git a/packaging/macosx/ports/python/py26-cython/files/cython27 b/packaging/macosx/ports/python/py26-cython/files/cython27 deleted file mode 100644 index 91f8cb8fd..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython27 +++ /dev/null @@ -1,2 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/2.7/bin/cython -${frameworks_dir}/Python.framework/Versions/2.7/bin/cygdb diff --git a/packaging/macosx/ports/python/py26-cython/files/cython31 b/packaging/macosx/ports/python/py26-cython/files/cython31 deleted file mode 100644 index 96c9b1b4e..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython31 +++ /dev/null @@ -1,2 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/3.1/bin/cython -${frameworks_dir}/Python.framework/Versions/3.1/bin/cygdb diff --git a/packaging/macosx/ports/python/py26-cython/files/cython32 b/packaging/macosx/ports/python/py26-cython/files/cython32 deleted file mode 100644 index b31fc1fc5..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython32 +++ /dev/null @@ -1,2 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/3.2/bin/cython -${frameworks_dir}/Python.framework/Versions/3.2/bin/cygdb diff --git a/packaging/macosx/ports/python/py26-cython/files/cython33 b/packaging/macosx/ports/python/py26-cython/files/cython33 deleted file mode 100644 index d19afec09..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython33 +++ /dev/null @@ -1,2 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/3.3/bin/cython -${frameworks_dir}/Python.framework/Versions/3.3/bin/cygdb diff --git a/packaging/macosx/ports/python/py26-cython/files/cython34 b/packaging/macosx/ports/python/py26-cython/files/cython34 deleted file mode 100644 index 487ad3299..000000000 --- a/packaging/macosx/ports/python/py26-cython/files/cython34 +++ /dev/null @@ -1,2 +0,0 @@ -${frameworks_dir}/Python.framework/Versions/3.4/bin/cython -${frameworks_dir}/Python.framework/Versions/3.4/bin/cygdb diff --git a/packaging/macosx/ports/python/py26-lxml/Portfile b/packaging/macosx/ports/python/py26-lxml/Portfile deleted file mode 100644 index 4d9f59690..000000000 --- a/packaging/macosx/ports/python/py26-lxml/Portfile +++ /dev/null @@ -1,52 +0,0 @@ -# -*- 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 py26-lxml -version 3.3.5 -revision 0 -categories-append devel -platforms darwin -license BSD - -python.versions 26 -python.version 26 - -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/py26-nose/Portfile b/packaging/macosx/ports/python/py26-nose/Portfile deleted file mode 100644 index 03c74a44d..000000000 --- a/packaging/macosx/ports/python/py26-nose/Portfile +++ /dev/null @@ -1,87 +0,0 @@ -# -*- 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 py26-${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 26 -python.version 26 - -# 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/py26-nose/files/nosetests24 b/packaging/macosx/ports/python/py26-nose/files/nosetests24 deleted file mode 100644 index d9a8f4034..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests24 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.4 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests25 b/packaging/macosx/ports/python/py26-nose/files/nosetests25 deleted file mode 100644 index 95864c283..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests25 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.5 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests26 b/packaging/macosx/ports/python/py26-nose/files/nosetests26 deleted file mode 100644 index bb670776f..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests26 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.6 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests27 b/packaging/macosx/ports/python/py26-nose/files/nosetests27 deleted file mode 100644 index 28c7bfe8c..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests27 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-2.7 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests31 b/packaging/macosx/ports/python/py26-nose/files/nosetests31 deleted file mode 100644 index 5ba27a4d5..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests31 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.1 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests32 b/packaging/macosx/ports/python/py26-nose/files/nosetests32 deleted file mode 100644 index 07bfb86a1..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests32 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.2 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests33 b/packaging/macosx/ports/python/py26-nose/files/nosetests33 deleted file mode 100644 index b750d806b..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests33 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.3 diff --git a/packaging/macosx/ports/python/py26-nose/files/nosetests34 b/packaging/macosx/ports/python/py26-nose/files/nosetests34 deleted file mode 100644 index 542ffc949..000000000 --- a/packaging/macosx/ports/python/py26-nose/files/nosetests34 +++ /dev/null @@ -1 +0,0 @@ -bin/nosetests-3.4 diff --git a/packaging/macosx/ports/python/py26-numpy/Portfile b/packaging/macosx/ports/python/py26-numpy/Portfile deleted file mode 100644 index db4a511aa..000000000 --- a/packaging/macosx/ports/python/py26-numpy/Portfile +++ /dev/null @@ -1,214 +0,0 @@ -# -*- 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 125483 2014-09-18 14:34:29Z michaelld@macports.org $ - -PortSystem 1.0 -PortGroup python 1.0 -PortGroup github 1.0 - -github.setup numpy numpy 1.9.0 v -name py26-numpy -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 836bcd7ef0f37129f06ea73b3cc27ec31035bfe0 \ - sha256 33e33768307b5f92cb098e93359e4fe97dfb9783df591ffbd44809bab7e50c0f - -python.versions 26 -python.version 26 - -if {${name} eq ${subport}} { - - revision 100 - - patchfiles patch-f2py_setup.py.diff \ - patch-fcompiler_g95.diff \ - patch-numpy_core_setup.py.diff - - depends_lib-append port:fftw-3 \ - port:py${python.version}-nose \ - port:py${python.version}-cython - - # 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} { - 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 gcc48. - - 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 gcc47]} { - default_variants +gcc48 - } - - 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} eq "i386"} { - supported_archs i386 x86_64 - } elseif {${os.arch} eq "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" - } - } - - 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 - - if {[variant_isset atlas]} { - build.env-append ATLAS=${prefix}/lib \ - LAPACK=${prefix}/lib \ - BLAS=${prefix}/lib - destroot.env-append ATLAS=${prefix}/lib \ - LAPACK=${prefix}/lib \ - BLAS=${prefix}/lib - } else { - build.env-append ATLAS=None \ - LAPACK=/usr/lib \ - BLAS=/usr/lib - destroot.env-append ATLAS=None \ - LAPACK=/usr/lib \ - BLAS=/usr/lib - } - -#} else { -# livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}" -} diff --git a/packaging/macosx/ports/python/py26-numpy/files/patch-f2py_setup.py.diff b/packaging/macosx/ports/python/py26-numpy/files/patch-f2py_setup.py.diff deleted file mode 100644 index 1e3164e73..000000000 --- a/packaging/macosx/ports/python/py26-numpy/files/patch-f2py_setup.py.diff +++ /dev/null @@ -1,39 +0,0 @@ ---- numpy/f2py/setup.py -+++ numpy/f2py/setup.py -@@ -41,21 +41,21 @@ def configuration(parent_package='',top_ - ) - - 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': - f2py_exe = f2py_exe + '.py' - target = os.path.join(build_dir, f2py_exe) - if newer(__file__, target): - log.info('Creating %s', target) - f = open(target, 'w') - f.write('''\ --#!%s -+#!@@MPORTS_PYTHON@@ - # See http://cens.ioc.ee/projects/f2py2e/ - import os, sys - for mode in ["g3-numpy", "2e-numeric", "2e-numarray", "2e-numpy"]: - try: - i=sys.argv.index("--"+mode) -@@ -75,11 +75,11 @@ elif mode=="2e-numpy": - from numpy.f2py import main - else: - sys.stderr.write("Unknown mode: " + repr(mode) + "\\n") - sys.exit(1) - main() --'''%(sys.executable)) -+''') - f.close() - return target - - config.add_scripts(generate_f2py_py) - diff --git a/packaging/macosx/ports/python/py26-numpy/files/patch-fcompiler_g95.diff b/packaging/macosx/ports/python/py26-numpy/files/patch-fcompiler_g95.diff deleted file mode 100644 index b95a2609a..000000000 --- a/packaging/macosx/ports/python/py26-numpy/files/patch-fcompiler_g95.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- numpy/distutils/fcompiler/__init__.py -+++ numpy/distutils/fcompiler/__init__.py -@@ -708,11 +708,11 @@ - ('win32', ('gnu', 'intelv', 'absoft', 'compaqv', 'intelev', 'gnu95', 'g95', - 'intelvem', 'intelem')), - ('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',)), - # os.name mappings - ('posix', ('gnu', 'gnu95',)), diff --git a/packaging/macosx/ports/python/py26-numpy/files/patch-numpy_core_setup.py.diff b/packaging/macosx/ports/python/py26-numpy/files/patch-numpy_core_setup.py.diff deleted file mode 100644 index 3aed3b18c..000000000 --- a/packaging/macosx/ports/python/py26-numpy/files/patch-numpy_core_setup.py.diff +++ /dev/null @@ -1,34 +0,0 @@ ---- numpy/core/setup.py.orig 2014-03-25 19:03:06.000000000 -0400 -+++ numpy/core/setup.py 2014-03-25 19:03:26.000000000 -0400 -@@ -481,7 +481,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') -@@ -581,7 +588,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 __STDC_FORMAT_MACROS - target_f.write(""" diff --git a/packaging/macosx/ports/python/py26-numpy/files/patch-numpy_linalg_setup.py.diff b/packaging/macosx/ports/python/py26-numpy/files/patch-numpy_linalg_setup.py.diff deleted file mode 100644 index 848d46186..000000000 --- a/packaging/macosx/ports/python/py26-numpy/files/patch-numpy_linalg_setup.py.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- numpy/linalg/setup.py.orig 2013-11-16 08:30:31.000000000 -0500 -+++ numpy/linalg/setup.py 2013-11-16 08:39:27.000000000 -0500 -@@ -37,7 +37,8 @@ - config.add_extension('lapack_lite', - sources = [get_lapack_lite_sources], - depends = ['lapack_litemodule.c'] + lapack_lite_src, -- extra_info = lapack_info -+ extra_info = lapack_info, -+ extra_link_args=['-undefined dynamic_lookup -bundle'] - ) - - # umath_linalg module -@@ -47,6 +48,7 @@ - depends = ['umath_linalg.c.src'] + lapack_lite_src, - extra_info = lapack_info, - libraries = ['npymath'], -+ extra_link_args=['-undefined dynamic_lookup -bundle'] - ) - - return config diff --git a/packaging/macosx/ports/python/py26-numpy/files/wrapper-template b/packaging/macosx/ports/python/py26-numpy/files/wrapper-template deleted file mode 100644 index 48936d107..000000000 --- a/packaging/macosx/ports/python/py26-numpy/files/wrapper-template +++ /dev/null @@ -1,143 +0,0 @@ -#!/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/py26-setuptools/Portfile b/packaging/macosx/ports/python/py26-setuptools/Portfile deleted file mode 100644 index b9893a4cb..000000000 --- a/packaging/macosx/ports/python/py26-setuptools/Portfile +++ /dev/null @@ -1,61 +0,0 @@ -# -*- 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 125953 2014-09-30 10:58:10Z jmr@macports.org $ - -PortSystem 1.0 -PortGroup python 1.0 - -name py26-setuptools -version 6.0.2 -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 b79fab610e362fe8e3a9cb92fb9d95ef \ - rmd160 5040f99a8ee3cd5b4040dc1e0a4d7cd9d5e7f7b1 \ - sha256 7029f6ca93e6a78112f1f621f79cab1a611901697a4c131bc5ef2f7a429825f7 - -python.versions 26 -python.version 26 -python.link_binaries no -python.move_binaries no - -if {$subport eq $name} { - - revision 100 - - if {${python.version} <= 25} { - version 1.4.2 - 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+)+) -} |
