[pkgsrc/trunk]: pkgsrc/graphics/cairo Repair a broken build on solaris and po...

[dmcmahill <dmcmahill%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7aa633b95c91
branches:  trunk
changeset: 527202:7aa633b95c91
user:      dmcmahill <dmcmahill%pkgsrc.org@localhost>
date:      Thu Mar 29 12:00:44 2007 +0000

description:
Repair a broken build on solaris and possibly others.

diffstat:

 graphics/cairo/Makefile         |   3 ++-
 graphics/cairo/distinfo         |   3 ++-
 graphics/cairo/patches/patch-ac |  29 +++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diffs (59 lines):

diff -r 4c6369850fd9 -r 7aa633b95c91 graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Thu Mar 29 12:00:13 2007 +0000
+++ b/graphics/cairo/Makefile   Thu Mar 29 12:00:44 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.53 2007/03/20 15:29:18 drochner Exp $
+# $NetBSD: Makefile,v 1.54 2007/03/29 12:00:44 dmcmahill Exp $
 
 DISTNAME=      cairo-1.4.2
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 
diff -r 4c6369850fd9 -r 7aa633b95c91 graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Thu Mar 29 12:00:13 2007 +0000
+++ b/graphics/cairo/distinfo   Thu Mar 29 12:00:44 2007 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.31 2007/03/20 15:29:18 drochner Exp $
+$NetBSD: distinfo,v 1.32 2007/03/29 12:00:44 dmcmahill Exp $
 
 SHA1 (cairo-1.4.2.tar.gz) = 9e7a323fc7d81d5011044d7eb22db3bf26ff7314
 RMD160 (cairo-1.4.2.tar.gz) = 53ad2e60507e181cb754991c1fe8f8de47f366a3
 Size (cairo-1.4.2.tar.gz) = 3081092 bytes
 SHA1 (patch-aa) = a5bcc788ba51b1943b6f37678437491a46a7b45c
 SHA1 (patch-ab) = 02ab6fef56431729db98691e9ed9c879c625f016
+SHA1 (patch-ac) = 3bbe230d3631989a9b858f6fbb1427655b4f0859
 SHA1 (patch-ae) = 55c4c5992059e96c96ac022028fe9fed811909fa
diff -r 4c6369850fd9 -r 7aa633b95c91 graphics/cairo/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-ac   Thu Mar 29 12:00:44 2007 +0000
@@ -0,0 +1,29 @@
+$NetBSD: patch-ac,v 1.5 2007/03/29 12:00:44 dmcmahill Exp $
+
+See https://bugs.freedesktop.org/show_bug.cgi?id=10441
+Instead of the patch there which relies on things like __hpux__
+we use the configure test results.
+
+--- test/pdiff/pdiff.c.orig    2007-03-19 15:08:04.000000000 -0500
++++ test/pdiff/pdiff.c
+@@ -20,7 +20,19 @@
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include <stdint.h>
++
++#ifdef HAVE_STDINT_H
++#  include <stdint.h>
++#else
++#  ifdef HAVE_INTTYPES_H
++#    include <inttypes.h>
++#  else
++#    ifdef HAVE_SYS_INT_TYPES_H
++#      include <sys/int_types.h>
++#    endif
++#  endif
++#endif
++
+ #include "pdiff.h"
+ 
+ #ifndef M_PI