diff options
| author | Liam P. White <inkscapebrony@gmail.com> | 2014-10-16 23:36:32 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebrony@gmail.com> | 2014-10-16 23:36:32 +0000 |
| commit | b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8 (patch) | |
| tree | 7d37d088e9179f631f22143a980157da49a331a9 /packaging/macosx/ports/python/py-sk1libs/files | |
| parent | Removed dangerous GTK-mimicking macros. (diff) | |
| parent | update to trunk (r13610) (diff) | |
| download | inkscape-b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8.tar.gz inkscape-b2c02c3cd7513b6fad49a0bd0c669f9a581f5cc8.zip | |
Merge in osx-packaging-update branch. OS X packaging now works correctly for trunk.
(bzr r13620)
Diffstat (limited to 'packaging/macosx/ports/python/py-sk1libs/files')
| -rw-r--r-- | packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff | 16 | ||||
| -rw-r--r-- | packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff | 26 |
2 files changed, 42 insertions, 0 deletions
diff --git a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff new file mode 100644 index 000000000..1d69461a3 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-imaging-libimagingft-_imagingft.c.diff @@ -0,0 +1,16 @@ +--- src/imaging/libimagingft/_imagingft.c.orig 2014-07-13 00:37:57.000000000 +0200 ++++ src/imaging/libimagingft/_imagingft.c 2014-07-13 00:41:08.000000000 +0200 +@@ -70,7 +70,13 @@ + const char* message; + } ft_errors[] = + ++#if defined(USE_FREETYPE_2_1) ++/* freetype 2.1 and newer */ ++#include FT_ERRORS_H ++#else ++/* freetype 2.0 */ + #include <freetype/fterrors.h> ++#endif + + /* -------------------------------------------------------------------- */ + /* font objects */ diff --git a/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff new file mode 100644 index 000000000..541935e71 --- /dev/null +++ b/packaging/macosx/ports/python/py-sk1libs/files/patch-src-utils-fs.py.diff @@ -0,0 +1,26 @@ +--- src/utils/fs.py.orig 2010-05-23 12:46:21.000000000 +0200 ++++ src/utils/fs.py 2013-01-18 15:40:02.000000000 +0100 +@@ -220,8 +220,14 @@ + finally: + _winreg.CloseKey( k ) + if system.get_os_family()==system.MACOSX: +- #FIXME: It's a stub. The paths should be more exact. +- return ['/',] ++ return ['__PREFIX__/share/fonts', ++ '/usr/share/fonts', ++ '/opt/X11/lib/X11/fonts', ++ '/System/Library/Fonts', ++ '/Network/Library/Fonts', ++ '/Library/Fonts', ++ os.path.expanduser("~/Library/Fonts"), ++ os.path.expanduser("~/.fonts")] + + + DIRECTORY_OBJECT=0 +@@ -311,4 +317,4 @@ + if __name__ == '__main__': + _test() + +- +\ No newline at end of file ++ |