Hi, This diff updates cairo to bugfix release 1.14.2. Nice cleanup in patches/.
Eric. Index: Makefile =================================================================== RCS file: /cvs/ports/graphics/cairo/Makefile,v retrieving revision 1.56 diff -u -p -r1.56 Makefile --- Makefile 5 Jan 2015 09:27:41 -0000 1.56 +++ Makefile 17 Mar 2015 11:04:27 -0000 @@ -2,8 +2,7 @@ COMMENT= vector graphics library -DISTNAME= cairo-1.14.0 -REVISION= 1 +DISTNAME= cairo-1.14.2 SHARED_LIBS+= cairo 12.3 SHARED_LIBS+= cairo-gobject 1.1 SHARED_LIBS+= cairo-script-interpreter 1.1 Index: distinfo =================================================================== RCS file: /cvs/ports/graphics/cairo/distinfo,v retrieving revision 1.23 diff -u -p -r1.23 distinfo --- distinfo 17 Nov 2014 12:50:14 -0000 1.23 +++ distinfo 17 Mar 2015 11:04:27 -0000 @@ -1,2 +1,2 @@ -SHA256 (cairo-1.14.0.tar.xz) = LPX4FDLnfqQ1mvnc0PT6830BWTRQE5HDEb/S0ZoBNLc= -SIZE (cairo-1.14.0.tar.xz) = 36584076 +SHA256 (cairo-1.14.2.tar.xz) = yRnZmd2xu77NS75lKZyiq9IHnH4T0iRXeJWvpwBezOs= +SIZE (cairo-1.14.2.tar.xz) = 35376404 Index: patches/patch-src_cairo-cff-subset_c =================================================================== RCS file: patches/patch-src_cairo-cff-subset_c diff -N patches/patch-src_cairo-cff-subset_c --- patches/patch-src_cairo-cff-subset_c 17 Nov 2014 12:50:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,128 +0,0 @@ -$OpenBSD: patch-src_cairo-cff-subset_c,v 1.1 2014/11/17 12:50:14 eric Exp $ - -http://cgit.freedesktop.org/cairo/commit/?id=99a35dd273f3deb4ae54310f1ed1746bfd9fae70 - - CFF: Fix unaligned access - ---- src/cairo-cff-subset.c.orig Mon Oct 13 21:46:33 2014 -+++ src/cairo-cff-subset.c Fri Oct 31 02:05:05 2014 -@@ -433,7 +433,7 @@ cff_index_read (cairo_array_t *index, unsigned char ** - p = *ptr; - if (p + 2 > end_ptr) - return CAIRO_INT_STATUS_UNSUPPORTED; -- count = be16_to_cpu( *((uint16_t *)p) ); -+ count = get_unaligned_be16 (p); - p += 2; - if (count > 0) { - offset_size = *p++; -@@ -984,14 +984,14 @@ cairo_cff_font_read_fdselect (cairo_cff_font_t *font, - for (i = 0; i < font->num_glyphs; i++) - font->fdselect[i] = *p++; - } else if (type == 3) { -- num_ranges = be16_to_cpu( *((uint16_t *)p) ); -+ num_ranges = get_unaligned_be16 (p); - p += 2; - for (i = 0; i < num_ranges; i++) - { -- first = be16_to_cpu( *((uint16_t *)p) ); -+ first = get_unaligned_be16 (p); - p += 2; - fd = *p++; -- last = be16_to_cpu( *((uint16_t *)p) ); -+ last = get_unaligned_be16 (p); - for (j = first; j < last; j++) - font->fdselect[j] = fd; - } -@@ -1722,7 +1722,7 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t *fon - p = font->charset + 1; - g = 1; - while (g <= (unsigned)font->num_glyphs && p < font->data_end) { -- c = be16_to_cpu( *((uint16_t *)p) ); -+ c = get_unaligned_be16 (p); - if (c == cid) { - *gid = g; - return CAIRO_STATUS_SUCCESS; -@@ -1737,7 +1737,7 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t *fon - first_gid = 1; - p = font->charset + 1; - while (first_gid <= (unsigned)font->num_glyphs && p + 2 < font->data_end) { -- first_cid = be16_to_cpu( *((uint16_t *)p) ); -+ first_cid = get_unaligned_be16 (p); - num_left = p[2]; - if (cid >= first_cid && cid <= first_cid + num_left) { - *gid = first_gid + cid - first_cid; -@@ -1753,8 +1753,8 @@ cairo_cff_font_get_gid_for_cid (cairo_cff_font_t *fon - first_gid = 1; - p = font->charset + 1; - while (first_gid <= (unsigned)font->num_glyphs && p + 3 < font->data_end) { -- first_cid = be16_to_cpu( *((uint16_t *)p) ); -- num_left = be16_to_cpu( *((uint16_t *)(p+2)) ); -+ first_cid = get_unaligned_be16 (p); -+ num_left = get_unaligned_be16 (p+2); - if (cid >= first_cid && cid <= first_cid + num_left) { - *gid = first_gid + cid - first_cid; - return CAIRO_STATUS_SUCCESS; -@@ -2328,7 +2328,7 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *f - unsigned int i; - cairo_int_status_t status; - unsigned int offset_array; -- uint32_t *offset_array_ptr; -+ unsigned char *offset_array_ptr; - int offset_base; - uint16_t count; - uint8_t offset_size = 4; -@@ -2349,7 +2349,7 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *f - if (unlikely (status)) - return status; - offset_base = _cairo_array_num_elements (&font->output) - 1; -- *offset_array_ptr = cpu_to_be32(1); -+ put_unaligned_be32(1, offset_array_ptr); - offset_array += sizeof(uint32_t); - for (i = 0; i < font->num_subset_fontdicts; i++) { - status = cff_dict_write (font->fd_dict[font->fd_subset_map[i]], -@@ -2357,8 +2357,9 @@ cairo_cff_font_write_cid_fontdict (cairo_cff_font_t *f - if (unlikely (status)) - return status; - -- offset_array_ptr = (uint32_t *) _cairo_array_index (&font->output, offset_array); -- *offset_array_ptr = cpu_to_be32(_cairo_array_num_elements (&font->output) - offset_base); -+ offset_array_ptr = _cairo_array_index (&font->output, offset_array); -+ put_unaligned_be32 (_cairo_array_num_elements (&font->output) - offset_base, -+ offset_array_ptr); - offset_array += sizeof(uint32_t); - } - -@@ -2609,7 +2610,7 @@ cairo_cff_font_create_set_widths (cairo_cff_font_t *fo - unsigned int i; - tt_hhea_t hhea; - int num_hmetrics; -- unsigned char buf[10]; -+ uint16_t short_entry; - int glyph_index; - cairo_int_status_t status; - -@@ -2629,7 +2630,8 @@ cairo_cff_font_create_set_widths (cairo_cff_font_t *fo - status = font->backend->load_truetype_table (font->scaled_font_subset->scaled_font, - TT_TAG_hmtx, - glyph_index * long_entry_size, -- buf, &short_entry_size); -+ (unsigned char *) &short_entry, -+ &short_entry_size); - if (unlikely (status)) - return status; - } -@@ -2638,11 +2640,12 @@ cairo_cff_font_create_set_widths (cairo_cff_font_t *fo - status = font->backend->load_truetype_table (font->scaled_font_subset->scaled_font, - TT_TAG_hmtx, - (num_hmetrics - 1) * long_entry_size, -- buf, &short_entry_size); -+ (unsigned char *) &short_entry, -+ &short_entry_size); - if (unlikely (status)) - return status; - } -- font->widths[i] = be16_to_cpu (*((int16_t*)buf)); -+ font->widths[i] = be16_to_cpu (short_entry); - } - - return CAIRO_STATUS_SUCCESS; Index: patches/patch-src_cairo-image-compositor_c =================================================================== RCS file: patches/patch-src_cairo-image-compositor_c diff -N patches/patch-src_cairo-image-compositor_c --- patches/patch-src_cairo-image-compositor_c 5 Jan 2015 09:27:41 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_cairo-image-compositor_c,v 1.1 2015/01/05 09:27:41 brad Exp $ - -http://cgit.freedesktop.org/cairo/commit/?id=5c82d91a5e15d29b1489dcb413b24ee7fdf59934 - - image: Fix crash in _fill_xrgb32_lerp_opaque_spans - ---- src/cairo-image-compositor.c.orig Fri Jan 2 19:19:26 2015 -+++ src/cairo-image-compositor.c Fri Jan 2 19:20:25 2015 -@@ -2242,10 +2242,10 @@ _fill_xrgb32_lerp_opaque_spans (void *abstract_rendere - spans[0].x, y, len, 1, r->u.fill.pixel); - } else { - uint32_t *d = (uint32_t*)(r->u.fill.data + r->u.fill.stride*y + spans[0].x*4); -- while (len--) -+ while (len-- > 0) - *d++ = r->u.fill.pixel; - } -- } else while (len--) { -+ } else while (len-- > 0) { - *d = lerp8x4 (r->u.fill.pixel, a, *d); - d++; - } Index: patches/patch-src_cairo-image-info_c =================================================================== RCS file: patches/patch-src_cairo-image-info_c diff -N patches/patch-src_cairo-image-info_c --- patches/patch-src_cairo-image-info_c 17 Nov 2014 12:50:14 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,106 +0,0 @@ -$OpenBSD: patch-src_cairo-image-info_c,v 1.1 2014/11/17 12:50:14 eric Exp $ - -http://cgit.freedesktop.org/cairo/commit/?id=99a35dd273f3deb4ae54310f1ed1746bfd9fae70 - - CFF: Fix unaligned access - ---- src/cairo-image-info.c.orig Wed Sep 25 00:38:54 2013 -+++ src/cairo-image-info.c Fri Oct 31 02:05:05 2014 -@@ -39,12 +39,6 @@ - #include "cairo-error-private.h" - #include "cairo-image-info-private.h" - --static uint32_t --_get_be32 (const unsigned char *p) --{ -- return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]; --} -- - /* JPEG (image/jpeg) - * - * http://www.w3.org/Graphics/JPEG/itu-t81.pdf -@@ -170,7 +164,7 @@ static const unsigned char _jpx_signature[] = { - static const unsigned char * - _jpx_next_box (const unsigned char *p) - { -- return p + _get_be32 (p); -+ return p + get_unaligned_be32 (p); - } - - static const unsigned char * -@@ -185,8 +179,8 @@ _jpx_match_box (const unsigned char *p, const unsigned - uint32_t length; - - if (p + 8 < end) { -- length = _get_be32 (p); -- if (_get_be32 (p + 4) == type && p + length < end) -+ length = get_unaligned_be32 (p); -+ if (get_unaligned_be32 (p + 4) == type && p + length < end) - return TRUE; - } - -@@ -208,8 +202,8 @@ _jpx_find_box (const unsigned char *p, const unsigned - static void - _jpx_extract_info (const unsigned char *p, cairo_image_info_t *info) - { -- info->height = _get_be32 (p); -- info->width = _get_be32 (p + 4); -+ info->height = get_unaligned_be32 (p); -+ info->width = get_unaligned_be32 (p + 4); - info->num_components = (p[8] << 8) + p[9]; - info->bits_per_component = p[10]; - } -@@ -281,13 +275,13 @@ _cairo_image_info_get_png_info (cairo_image_info_t - return CAIRO_INT_STATUS_UNSUPPORTED; - - p += 4; -- if (_get_be32 (p) != PNG_IHDR) -+ if (get_unaligned_be32 (p) != PNG_IHDR) - return CAIRO_INT_STATUS_UNSUPPORTED; - - p += 4; -- info->width = _get_be32 (p); -+ info->width = get_unaligned_be32 (p); - p += 4; -- info->height = _get_be32 (p); -+ info->height = get_unaligned_be32 (p); - - return CAIRO_STATUS_SUCCESS; - } -@@ -347,14 +341,14 @@ _jbig2_get_next_segment (const unsigned char *p, - if (p + 6 >= end) - return NULL; - -- seg_num = _get_be32 (p); -+ seg_num = get_unaligned_be32 (p); - *type = p[4] & 0x3f; - big_page_size = (p[4] & 0x40) != 0; - p += 5; - - num_segs = p[0] >> 5; - if (num_segs == 7) { -- num_segs = _get_be32 (p) & 0x1fffffff; -+ num_segs = get_unaligned_be32 (p) & 0x1fffffff; - ref_seg_bytes = 4 + ((num_segs + 1)/8); - } else { - ref_seg_bytes = 1; -@@ -373,7 +367,7 @@ _jbig2_get_next_segment (const unsigned char *p, - if (p + 4 >= end) - return NULL; - -- *data_len = _get_be32 (p); -+ *data_len = get_unaligned_be32 (p); - p += 4; - *data = p; - -@@ -397,8 +391,8 @@ _jbig2_get_next_segment (const unsigned char *p, - static void - _jbig2_extract_info (cairo_image_info_t *info, const unsigned char *p) - { -- info->width = _get_be32 (p); -- info->height = _get_be32 (p + 4); -+ info->width = get_unaligned_be32 (p); -+ info->height = get_unaligned_be32 (p + 4); - info->num_components = 1; - info->bits_per_component = 1; - } Index: patches/patch-src_cairo-tor-scan-converter_c =================================================================== RCS file: patches/patch-src_cairo-tor-scan-converter_c diff -N patches/patch-src_cairo-tor-scan-converter_c --- patches/patch-src_cairo-tor-scan-converter_c 5 Jan 2015 09:27:41 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,132 +0,0 @@ -$OpenBSD: patch-src_cairo-tor-scan-converter_c,v 1.2 2015/01/05 09:27:41 brad Exp $ - -http://cgit.freedesktop.org/cairo/commit/?id=2de69581c28bf115852037ca41eba13cb7335976 - - tor-scan-converter: can't do_fullrow when intersection in row + 0.5subrow - -http://cgit.freedesktop.org/cairo/commit/?id=40201f4b1ab52c85922b2b7ae05dd862159a1aa0 - - tor-scan-converter: Correctly align 64bit types - ---- src/cairo-tor-scan-converter.c.orig Mon Oct 13 21:46:33 2014 -+++ src/cairo-tor-scan-converter.c Fri Jan 2 19:18:25 2015 -@@ -277,9 +277,14 @@ struct _pool_chunk { - * chunk in the pool header. */ - struct _pool_chunk *prev_chunk; - -- /* Actual data starts here. Well aligned for pointers. */ -+ /* Actual data starts here. Well aligned even for 64 bit types. */ -+ int64_t data; - }; - -+/* The int64_t data member of _pool_chunk just exists to enforce alignment, -+ * it shouldn't be included in the allocated size for the struct. */ -+#define SIZEOF_POOL_CHUNK (sizeof(struct _pool_chunk) - sizeof(int64_t)) -+ - /* A memory pool. This is supposed to be embedded on the stack or - * within some other structure. It may optionally be followed by an - * embedded array from which requests are fulfilled until -@@ -299,8 +304,11 @@ struct pool { - - /* Header for the sentinel chunk. Directly following the pool - * struct should be some space for embedded elements from which -- * the sentinel chunk allocates from. */ -- struct _pool_chunk sentinel[1]; -+ * the sentinel chunk allocates from. This is expressed as a char -+ * array so that the 'int64_t data' member of _pool_chunk isn't -+ * included. This way embedding struct pool in other structs works -+ * without wasting space. */ -+ char sentinel[SIZEOF_POOL_CHUNK]; - }; - - /* A polygon edge. */ -@@ -475,7 +483,7 @@ _pool_chunk_create(struct pool *pool, size_t size) - { - struct _pool_chunk *p; - -- p = malloc(size + sizeof(struct _pool_chunk)); -+ p = malloc(SIZEOF_POOL_CHUNK + size); - if (unlikely (NULL == p)) - longjmp (*pool->jmp, _cairo_error (CAIRO_STATUS_NO_MEMORY)); - -@@ -489,10 +497,10 @@ pool_init(struct pool *pool, - size_t embedded_capacity) - { - pool->jmp = jmp; -- pool->current = pool->sentinel; -+ pool->current = (void*) pool->sentinel; - pool->first_free = NULL; - pool->default_capacity = default_capacity; -- _pool_chunk_init(pool->sentinel, NULL, embedded_capacity); -+ _pool_chunk_init(pool->current, NULL, embedded_capacity); - } - - static void -@@ -502,7 +510,7 @@ pool_fini(struct pool *pool) - do { - while (NULL != p) { - struct _pool_chunk *prev = p->prev_chunk; -- if (p != pool->sentinel) -+ if (p != (void *) pool->sentinel) - free(p); - p = prev; - } -@@ -542,14 +550,14 @@ _pool_alloc_from_new_chunk( - chunk = _pool_chunk_create (pool, capacity); - pool->current = chunk; - -- obj = ((unsigned char*)chunk + sizeof(*chunk) + chunk->size); -+ obj = ((unsigned char*)&chunk->data + chunk->size); - chunk->size += size; - return obj; - } - - /* Allocate size bytes from the pool. The first allocated address -- * returned from a pool is aligned to sizeof(void*). Subsequent -- * addresses will maintain alignment as long as multiples of void* are -+ * returned from a pool is aligned to 8 bytes. Subsequent -+ * addresses will maintain alignment as long as multiples of 8 are - * allocated. Returns the address of a new memory area or %NULL on - * allocation failures. The pool retains ownership of the returned - * memory. */ -@@ -559,7 +567,7 @@ pool_alloc (struct pool *pool, size_t size) - struct _pool_chunk *chunk = pool->current; - - if (size <= chunk->capacity - chunk->size) { -- void *obj = ((unsigned char*)chunk + sizeof(*chunk) + chunk->size); -+ void *obj = ((unsigned char*)&chunk->data + chunk->size); - chunk->size += size; - return obj; - } else { -@@ -573,16 +581,16 @@ pool_reset (struct pool *pool) - { - /* Transfer all used chunks to the chunk free list. */ - struct _pool_chunk *chunk = pool->current; -- if (chunk != pool->sentinel) { -- while (chunk->prev_chunk != pool->sentinel) { -+ if (chunk != (void *) pool->sentinel) { -+ while (chunk->prev_chunk != (void *) pool->sentinel) { - chunk = chunk->prev_chunk; - } - chunk->prev_chunk = pool->first_free; - pool->first_free = pool->current; - } - /* Reset the sentinel as the current chunk. */ -- pool->current = pool->sentinel; -- pool->sentinel->size = 0; -+ pool->current = (void *) pool->sentinel; -+ pool->current->size = 0; - } - - /* Rewinds the cell list's cursor to the beginning. After rewinding -@@ -1167,8 +1175,8 @@ can_do_full_row (struct active_list *active) - - if (e->dy) { - struct quorem x = e->x; -- x.quo += e->dxdy_full.quo - e->dxdy.quo/2; -- x.rem += e->dxdy_full.rem - e->dxdy.rem/2; -+ x.quo += e->dxdy_full.quo; -+ x.rem += e->dxdy_full.rem; - if (x.rem < 0) { - x.quo--; - x.rem += e->dy; Index: patches/patch-src_cairoint_h =================================================================== RCS file: patches/patch-src_cairoint_h diff -N patches/patch-src_cairoint_h --- patches/patch-src_cairoint_h 27 Nov 2014 03:23:57 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,54 +0,0 @@ -$OpenBSD: patch-src_cairoint_h,v 1.2 2014/11/27 03:23:57 brad Exp $ - -http://cgit.freedesktop.org/cairo/commit/?id=99a35dd273f3deb4ae54310f1ed1746bfd9fae70 - - CFF: Fix unaligned access - -http://cgit.freedesktop.org/cairo/commit/?id=adbeb3d53c6c6e8ddcc63988200da4c5c9627717 - - Improve performance of cpu_to_be32 and be32_to_cpu - ---- src/cairoint.h.orig Mon Oct 13 21:46:33 2014 -+++ src/cairoint.h Mon Nov 17 19:57:23 2014 -@@ -229,7 +229,7 @@ be16_to_cpu(uint16_t v) - static inline uint32_t cairo_const - cpu_to_be32(uint32_t v) - { -- return (cpu_to_be16 (v) << 16) | cpu_to_be16 (v >> 16); -+ return (v >> 24) | ((v >> 8) & 0xff00) | ((v << 8) & 0xff0000) | (v << 24); - } - - static inline uint32_t cairo_const -@@ -240,6 +240,32 @@ be32_to_cpu(uint32_t v) - - #endif - -+/* Unaligned big endian access -+ */ -+ -+static inline uint16_t get_unaligned_be16 (const unsigned char *p) -+{ -+ return p[0] << 8 | p[1]; -+} -+ -+static inline uint32_t get_unaligned_be32 (const unsigned char *p) -+{ -+ return p[0] << 24 | p[1] << 16 | p[2] << 8 | p[3]; -+} -+ -+static inline void put_unaligned_be16 (uint16_t v, unsigned char *p) -+{ -+ p[0] = (v >> 8) & 0xff; -+ p[1] = v & 0xff; -+} -+ -+static inline void put_unaligned_be32 (uint32_t v, unsigned char *p) -+{ -+ p[0] = (v >> 24) & 0xff; -+ p[1] = (v >> 16) & 0xff; -+ p[2] = (v >> 8) & 0xff; -+ p[3] = v & 0xff; -+} - - /* The glibc versions of ispace() and isdigit() are slow in UTF-8 locales. - */ Index: patches/patch-util_cairo-fdr_Makefile_in =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-fdr_Makefile_in,v retrieving revision 1.4 diff -u -p -r1.4 patch-util_cairo-fdr_Makefile_in --- patches/patch-util_cairo-fdr_Makefile_in 17 Nov 2014 12:50:14 -0000 1.4 +++ patches/patch-util_cairo-fdr_Makefile_in 17 Mar 2015 11:04:27 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_cairo-fdr_Makefile_in,v 1.4 2014/11/17 12:50:14 eric Exp $ ---- util/cairo-fdr/Makefile.in.orig Tue Oct 14 03:47:27 2014 -+++ util/cairo-fdr/Makefile.in Thu Oct 30 21:01:04 2014 -@@ -358,7 +358,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ +--- util/cairo-fdr/Makefile.in.orig Wed Mar 11 02:43:13 2015 ++++ util/cairo-fdr/Makefile.in Tue Mar 17 11:27:33 2015 +@@ -435,7 +435,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ cairo_fdr_la_SOURCES = fdr.c cairo_fdr_la_CPPFLAGS = $(AM_CPPFLAGS) cairo_fdr_la_CFLAGS = $(CAIRO_CFLAGS) Index: patches/patch-util_cairo-sphinx_Makefile_in =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-sphinx_Makefile_in,v retrieving revision 1.2 diff -u -p -r1.2 patch-util_cairo-sphinx_Makefile_in --- patches/patch-util_cairo-sphinx_Makefile_in 17 Nov 2014 12:50:14 -0000 1.2 +++ patches/patch-util_cairo-sphinx_Makefile_in 17 Mar 2015 11:04:27 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_cairo-sphinx_Makefile_in,v 1.2 2014/11/17 12:50:14 eric Exp $ ---- util/cairo-sphinx/Makefile.in.orig Tue Oct 14 03:47:28 2014 -+++ util/cairo-sphinx/Makefile.in Thu Oct 30 21:01:04 2014 -@@ -368,7 +368,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ +--- util/cairo-sphinx/Makefile.in.orig Wed Mar 11 02:43:13 2015 ++++ util/cairo-sphinx/Makefile.in Tue Mar 17 11:27:33 2015 +@@ -445,7 +445,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/src \ cairo_sphinx_la_SOURCES = fdr.c cairo_sphinx_la_CPPFLAGS = $(AM_CPPFLAGS) cairo_sphinx_la_CFLAGS = $(CAIRO_CFLAGS) Index: patches/patch-util_cairo-trace_Makefile_in =================================================================== RCS file: /cvs/ports/graphics/cairo/patches/patch-util_cairo-trace_Makefile_in,v retrieving revision 1.6 diff -u -p -r1.6 patch-util_cairo-trace_Makefile_in --- patches/patch-util_cairo-trace_Makefile_in 17 Nov 2014 12:50:14 -0000 1.6 +++ patches/patch-util_cairo-trace_Makefile_in 17 Mar 2015 11:04:27 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-util_cairo-trace_Makefile_in,v 1.6 2014/11/17 12:50:14 eric Exp $ ---- util/cairo-trace/Makefile.in.orig Tue Oct 14 03:47:28 2014 -+++ util/cairo-trace/Makefile.in Thu Oct 30 21:01:04 2014 -@@ -378,7 +378,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$ +--- util/cairo-trace/Makefile.in.orig Wed Mar 11 02:43:13 2015 ++++ util/cairo-trace/Makefile.in Tue Mar 17 11:27:33 2015 +@@ -454,7 +454,7 @@ libcairo_trace_la_CPPFLAGS = -DCAIRO_TRACE_OUTDIR="\"$ $(AM_CPPFLAGS) libcairo_trace_la_CFLAGS = $(CAIRO_CFLAGS) $(real_pthread_CFLAGS) Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/graphics/cairo/pkg/PLIST,v retrieving revision 1.17 diff -u -p -r1.17 PLIST --- pkg/PLIST 17 Nov 2014 12:50:14 -0000 1.17 +++ pkg/PLIST 17 Mar 2015 11:04:27 -0000 @@ -101,7 +101,10 @@ share/gtk-doc/html/cairo/index-all.html share/gtk-doc/html/cairo/index.html share/gtk-doc/html/cairo/index.sgml share/gtk-doc/html/cairo/language-bindings.html +share/gtk-doc/html/cairo/left-insensitive.png share/gtk-doc/html/cairo/left.png +share/gtk-doc/html/cairo/right-insensitive.png share/gtk-doc/html/cairo/right.png share/gtk-doc/html/cairo/style.css +share/gtk-doc/html/cairo/up-insensitive.png share/gtk-doc/html/cairo/up.png
