diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-30 10:12:51 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-03-30 10:12:51 +0800 |
| commit | 9111e19ca8baf74881bf4c660eea09668e1cbf0a (patch) | |
| tree | ea13f4cc556aca882e0c89b4d265bf14a8466942 /graphics/cairo/files | |
| parent | c5f63aad16be126cb9e703e53a28acaf9f7ed6ef (diff) | |
| download | marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.tar marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.tar.gz marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.tar.bz2 marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.tar.lz marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.tar.xz marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.tar.zst marcuscom-ports-9111e19ca8baf74881bf4c660eea09668e1cbf0a.zip | |
Add cairo at 1.5.14, and bump PORTEPOCH. We will be downgrading cairo
in ports, and test cairo 1.6 with GNOME 2.24.
ahze: I have also removed patch-src_cairo-xlib-display.c. If Firefox 3 still
needs this, please add it back.
Discussed with: ahze
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10841 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'graphics/cairo/files')
| -rw-r--r-- | graphics/cairo/files/patch-src_cairo-ft-font.c | 28 | ||||
| -rw-r--r-- | graphics/cairo/files/patch-src_cairoint.h | 14 |
2 files changed, 42 insertions, 0 deletions
diff --git a/graphics/cairo/files/patch-src_cairo-ft-font.c b/graphics/cairo/files/patch-src_cairo-ft-font.c new file mode 100644 index 000000000..8cd60665f --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo-ft-font.c @@ -0,0 +1,28 @@ +--- src/cairo-ft-font.c.orig Tue Aug 16 14:46:46 2005 ++++ src/cairo-ft-font.c Tue Aug 16 14:46:59 2005 +@@ -44,6 +44,11 @@ + #include <fontconfig/fontconfig.h> + #include <fontconfig/fcfreetype.h> + ++#include <sys/types.h> ++#include <stdlib.h> ++#include <time.h> ++#include <unistd.h> ++ + #include <ft2build.h> + #include FT_FREETYPE_H + #include FT_OUTLINE_H +@@ -257,7 +262,12 @@ _cairo_ft_unscaled_font_init_key (cairo_ + key->id = id; + + /* 1607 is just an arbitrary prime. */ +- hash = _cairo_hash_string (filename); ++ if (filename != NULL) { ++ hash = _cairo_hash_string (filename); ++ } else { ++ srandom(time(NULL) * getpid()); ++ hash = random(); ++ } + hash += ((unsigned long) id) * 1607; + + key->base.hash_entry.hash = hash; diff --git a/graphics/cairo/files/patch-src_cairoint.h b/graphics/cairo/files/patch-src_cairoint.h new file mode 100644 index 000000000..a9b3ce480 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairoint.h @@ -0,0 +1,14 @@ +--- src/cairoint.h.orig Sun Oct 15 18:02:35 2006 ++++ src/cairoint.h Sun Oct 15 18:10:11 2006 +@@ -50,6 +50,11 @@ + #include "config.h" + #endif + ++#ifndef INT16_MAX ++#define INT16_MAX 0x7fff ++#define INT16_MIN (-0x7fff-1) ++#endif ++ + #include <assert.h> + #include <stdlib.h> + #include <string.h> |