diff options
| author | pav <pav@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-09-09 20:07:04 +0800 |
|---|---|---|
| committer | pav <pav@df743ca5-7f9a-e211-a948-0013205c9059> | 2007-09-09 20:07:04 +0800 |
| commit | 75f62e991a811ac7a5cf9324094b95307926a097 (patch) | |
| tree | 50f402e0293d239cb910a02097a23c51dbc867ff /graphics/cairo/files | |
| parent | 740276e2a0148b732c14c74b4a31c58ff303e12f (diff) | |
| download | marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.tar marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.tar.gz marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.tar.bz2 marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.tar.lz marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.tar.xz marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.tar.zst marcuscom-ports-75f62e991a811ac7a5cf9324094b95307926a097.zip | |
- Push USE_XLIB out of cairo and pango (but not gtk20 for now)
PR: ports/115870, ports/115872
Submitted by: mm
Tested by: pointyhat exprun (on GNOME 2.18 ports)
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@9544 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_cairo-xlib-surface.c | 11 | ||||
| -rw-r--r-- | graphics/cairo/files/patch-src_cairoint.h | 14 |
3 files changed, 53 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_cairo-xlib-surface.c b/graphics/cairo/files/patch-src_cairo-xlib-surface.c new file mode 100644 index 000000000..396ac3e29 --- /dev/null +++ b/graphics/cairo/files/patch-src_cairo-xlib-surface.c @@ -0,0 +1,11 @@ +--- src/cairo-xlib-surface.c.orig Mon Oct 3 22:44:43 2005 ++++ src/cairo-xlib-surface.c Wed Nov 16 18:59:40 2005 +@@ -1758,7 +1758,7 @@ + + surface->buggy_repeat = FALSE; + if (strstr (ServerVendor (dpy), "X.Org") != NULL) { +- if (VendorRelease (dpy) <= 60802000) ++ if (VendorRelease (dpy) < 60900000) + surface->buggy_repeat = TRUE; + } else if (strstr (ServerVendor (dpy), "XFree86") != NULL) { + if (VendorRelease (dpy) <= 40500000) 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> |