summaryrefslogtreecommitdiff
path: root/graphics/cairo
diff options
context:
space:
mode:
authorminskim <minskim>2006-07-25 01:48:54 +0000
committerminskim <minskim>2006-07-25 01:48:54 +0000
commitc8474ad9c33d61cc75147441188376e4b2e0d730 (patch)
tree765254b18a9a2bcc70909d0f5fb465bc5fcb74a2 /graphics/cairo
parent54e078b69f80cec3247d1c80526654022dfac7c9 (diff)
downloadpkgsrc-c8474ad9c33d61cc75147441188376e4b2e0d730.tar.gz
Add a workaround for freedesktop.org bug 7401, so that 'make test' works.
Patch from cairo cvs.
Diffstat (limited to 'graphics/cairo')
-rw-r--r--graphics/cairo/distinfo3
-rw-r--r--graphics/cairo/patches/patch-ae30
2 files changed, 32 insertions, 1 deletions
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 0bb168f20e4..58c608fe748 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -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-aa) = 7d4b4fa8f685a64bbd703d2ee8ae5f6ad28d196d
SHA1 (patch-ab) = d408881c714686a3481f66dcb069c763359313a6
SHA1 (patch-ac) = de91ee6dd733c56957de83a1880a583eaf601126
SHA1 (patch-ad) = 6778eecd56c622382ebd6c870193cd805aaf9d9c
+SHA1 (patch-ae) = 735df8410da29046f862b9ab19b7a8cbda24050b
diff --git a/graphics/cairo/patches/patch-ae b/graphics/cairo/patches/patch-ae
new file mode 100644
index 00000000000..fa53ffd4885
--- /dev/null
+++ b/graphics/cairo/patches/patch-ae
@@ -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,