suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cocoa: upgrade cairo binary to v1.10.2

Browse Source 
plus one little patch from the cairo repo
This commit is contained in:
Matthew Flatt 2011-04-02 15:48:18 -06:00
parent 5522c72ecb
commit 1641d07a42
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/get-libs.rkt
View File

@ -28,7 +28,7 @@
;; GUI Libraries ;; GUI Libraries
[gui [gui
[i386-macosx [i386-macosx
["libcairo.2.dylib" 848488] ["libcairo.2.dylib" 832656]
["libintl.8.dylib" 57536] ["libintl.8.dylib" 57536]
["libgio-2.0.0.dylib" 748360] ["libgio-2.0.0.dylib" 748360]
["libjpeg.62.dylib" 412024] ["libjpeg.62.dylib" 412024]
@ -37,12 +37,12 @@
["libgmodule-2.0.0.dylib" 19016] ["libgmodule-2.0.0.dylib" 19016]
["libpangocairo-1.0.0.dylib" 84340] ["libpangocairo-1.0.0.dylib" 84340]
["libgobject-2.0.0.dylib" 288252] ["libgobject-2.0.0.dylib" 288252]
["libpixman-1.0.dylib" 459304] ["libpixman-1.0.dylib" 526824]
["libgthread-2.0.0.dylib" 24592] ["libgthread-2.0.0.dylib" 24592]
["libpng14.14.dylib" 182992] ["libpng14.14.dylib" 182992]
["PSMTabBarControl.tgz" 91302 "PSMTabBarControl.framework" 247768]] ["PSMTabBarControl.tgz" 91302 "PSMTabBarControl.framework" 247768]]
[x86_64-macosx [x86_64-macosx
["libcairo.2.dylib" 944552] ["libcairo.2.dylib" 919840]
["libintl.8.dylib" 61016] ["libintl.8.dylib" 61016]
["libgio-2.0.0.dylib" 897624] ["libgio-2.0.0.dylib" 897624]
["libjpeg.62.dylib" 153360] ["libjpeg.62.dylib" 153360]
@ -51,7 +51,7 @@
["libgmodule-2.0.0.dylib" 19832] ["libgmodule-2.0.0.dylib" 19832]
["libpangocairo-1.0.0.dylib" 94952] ["libpangocairo-1.0.0.dylib" 94952]
["libgobject-2.0.0.dylib" 344024] ["libgobject-2.0.0.dylib" 344024]
["libpixman-1.0.dylib" 499440] ["libpixman-1.0.dylib" 577128]
["libgthread-2.0.0.dylib" 21728] ["libgthread-2.0.0.dylib" 21728]
["libpng14.14.dylib" 192224] ["libpng14.14.dylib" 192224]
["PSMTabBarControl.tgz" 107267 "PSMTabBarControl.framework" 316528]] ["PSMTabBarControl.tgz" 107267 "PSMTabBarControl.framework" 316528]]

22
src/mac/README.txt
View File

@ -3,8 +3,8 @@ Information on building 3rd-party libraries needed for Mac OS X GRacket.
Get these packages (or newer, if compatible): Get these packages (or newer, if compatible):
pkg-config-0.23.tar.gz pkg-config-0.23.tar.gz
libpng-1.4.0.tar.gz libpng-1.4.0.tar.gz
pixman-0.17.14.tar.gz pixman-0.21.6.tar.gz
cairo-1.9.14.tar.gz cairo-1.10.2.tar.gz
gettext-0.17.tar.gz gettext-0.17.tar.gz
glib-2.22.4.tar.gz glib-2.22.4.tar.gz
pango-1.28.0.tar.gz pango-1.28.0.tar.gz
@ -14,9 +14,13 @@ Get these packages (or newer, if compatible):
and handled differently and handled differently
Patches: Patches:
cairo/src/cairo-quartz-font.c:656: cairo/src/cairo-path-fixed.c:1295: [from Cairo repo, 3/18/11]
if (width < 1) width = 1; /* This check is valid because the current implementation of
if (height < 1) height = 1; * _cairo_path_fixed_is_box () only accepts rectangles like:
* move,line,line,line[,line|close[,close|move]]. */
buf = cairo_path_head (path);
if (buf->num_ops > 4)
return TRUE;
glib/glib/gconvert.c:54: change to glib/glib/gconvert.c:54: change to
#if !(defined(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H) #if !(defined(__APPLE__) && defined(__LP64__)) && !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
pango/pango/modules.c:573: change to pango/pango/modules.c:573: change to
@ -73,8 +77,8 @@ ARCHDIR=
cd "$WORKDIR" cd "$WORKDIR"
tar zxf "$ARCHDIR"pkg-config-0.23.tar.gz tar zxf "$ARCHDIR"pkg-config-0.23.tar.gz
tar zxf "$ARCHDIR"libpng-1.4.0.tar.gz tar zxf "$ARCHDIR"libpng-1.4.0.tar.gz
tar zxf "$ARCHDIR"pixman-0.17.14.tar.gz tar zxf "$ARCHDIR"pixman-0.21.6.tar.gz
tar zxf "$ARCHDIR"cairo-1.9.14.tar.gz tar zxf "$ARCHDIR"cairo-1.10.2.tar.gz
tar zxf "$ARCHDIR"gettext-0.17.tar.gz tar zxf "$ARCHDIR"gettext-0.17.tar.gz
tar zxf "$ARCHDIR"glib-2.22.4.tar.gz tar zxf "$ARCHDIR"glib-2.22.4.tar.gz
tar zxf "$ARCHDIR"pango-1.28.0.tar.gz tar zxf "$ARCHDIR"pango-1.28.0.tar.gz
@ -87,11 +91,11 @@ cd ../libpng-1.4.0/
make make
make install make install
cd .. cd ..
cd pixman-0.17.14/ cd pixman-0.21.6/
./configure --prefix="$DESTDIR" ./configure --prefix="$DESTDIR"
make make
make install make install
cd ../cairo-1.9.14/ cd ../cairo-1.10.2/
env PATH="$DESTDIR"/bin:"$PATH" ./configure --disable-xlib --disable-ft --disable-fc --prefix="$DESTDIR" env PATH="$DESTDIR"/bin:"$PATH" ./configure --disable-xlib --disable-ft --disable-fc --prefix="$DESTDIR"
make make
make install make install