[pkgsrc/trunk]: pkgsrc/graphics/cairo Add a workaround for freedesktop.org bu...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a93db1bb7d8
branches:  trunk
changeset: 516660:2a93db1bb7d8
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Tue Jul 25 01:48:54 2006 +0000

description:
Add a workaround for freedesktop.org bug 7401, so that 'make test' works.
Patch from cairo cvs.

diffstat:

 graphics/cairo/distinfo         |   3 ++-
 graphics/cairo/patches/patch-ae |  30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletions(-)

diffs (48 lines):

diff -r 2e65ddd1013c -r 2a93db1bb7d8 graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Mon Jul 24 23:21:13 2006 +0000
+++ b/graphics/cairo/distinfo   Tue Jul 25 01:48:54 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2006/07/08 21:14:14 markd Exp $
+$NetBSD: distinfo,v 1.20 2006/07/25 01:48:54 minskim Exp $
 
 SHA1 (cairo-1.2.0.tar.gz) = c5da7f89cdd3782102357f99a47f516d11661e92
 RMD160 (cairo-1.2.0.tar.gz) = 9dd76e43e881dfd3f20a81fc0f946e302ed7993c
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = d408881c714686a3481f66dcb069c763359313a6
 SHA1 (patch-ac) = de91ee6dd733c56957de83a1880a583eaf601126
 SHA1 (patch-ad) = 6778eecd56c622382ebd6c870193cd805aaf9d9c
+SHA1 (patch-ae) = 735df8410da29046f862b9ab19b7a8cbda24050b
diff -r 2e65ddd1013c -r 2a93db1bb7d8 graphics/cairo/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-ae   Tue Jul 25 01:48:54 2006 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-ae,v 1.1 2006/07/25 01:48:54 minskim Exp $
+
+https://bugs.freedesktop.org/show_bug.cgi?id=7401
+
+--- test/cairo-test.c.orig     2006-06-30 17:03:52.000000000 -0700
++++ test/cairo-test.c
+@@ -1635,7 +1635,7 @@ cairo_test_expecting (cairo_test_t *test
+ {
+     volatile int i, j, num_targets;
+     const char *tname;
+-    sighandler_t old_segfault_handler;
++    void (*old_segfault_handler)(int);
+     cairo_test_status_t status, ret;
+     cairo_test_target_t **targets_to_test;
+     cairo_test_target_t targets[] =
+@@ -1841,12 +1841,12 @@ cairo_test_expecting (cairo_test_t *test
+                   dev_offset);
+ 
+           /* Set up a checkpoint to get back to in case of segfaults. */
+-          old_segfault_handler = signal (SIGSEGV, (sighandler_t) segfault_handler);
++          old_segfault_handler = signal (SIGSEGV, segfault_handler);
+           if (0 == setjmp (jmpbuf))
+               status = cairo_test_for_target (test, draw, target, dev_offset);
+           else
+               status = CAIRO_TEST_CRASHED;
+-          signal (SIGSEGV, (sighandler_t) old_segfault_handler);
++          signal (SIGSEGV, old_segfault_handler);
+ 
+           cairo_test_log ("TEST: %s TARGET: %s FORMAT: %s OFFSET: %d RESULT: ",
+                           test->name, target->name,