From ba605d16fe28e45d0ee5ffe0d52d051244aee2c2 Mon Sep 17 00:00:00 2001 From: wiz Date: Sun, 4 Nov 2012 23:48:54 +0000 Subject: Add comments to patches. --- graphics/cairo/distinfo | 8 ++++---- graphics/cairo/patches/patch-aa | 13 ++++++++++++- graphics/cairo/patches/patch-ab | 5 ++++- graphics/cairo/patches/patch-ac | 5 ++++- 4 files changed, 24 insertions(+), 7 deletions(-) (limited to 'graphics/cairo') diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index 55b4d97470d..05ac6fd7385 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.71 2012/11/04 23:44:27 wiz Exp $ +$NetBSD: distinfo,v 1.72 2012/11/04 23:48:54 wiz Exp $ SHA1 (cairo-1.12.8.tar.xz) = 56a10bf3b804367c97734d655c23a9f652d5c297 RMD160 (cairo-1.12.8.tar.xz) = b27be3ba3262bdd3a5ca08c037c5df3fa1c11756 Size (cairo-1.12.8.tar.xz) = 42113752 bytes -SHA1 (patch-aa) = 474f44c1c8d4017137fe59b160afca8f16ad7287 -SHA1 (patch-ab) = 62ff361d52742bba0f49c6a32149269b958fa24a -SHA1 (patch-ac) = 151c682245004902cf42ba141e3743592691dfb9 +SHA1 (patch-aa) = b01bc60f77a7122b0c0d0d9b25ad512bac7c190c +SHA1 (patch-ab) = 11f7e0e59bd5c51a8fdacb48dcf2f2fefdf3b768 +SHA1 (patch-ac) = 1785bbef6bcab4781bf89e1b986a7eb96e5f2b64 SHA1 (patch-ad) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530 diff --git a/graphics/cairo/patches/patch-aa b/graphics/cairo/patches/patch-aa index 57c3e954789..e7f1840fc0b 100644 --- a/graphics/cairo/patches/patch-aa +++ b/graphics/cairo/patches/patch-aa @@ -1,4 +1,15 @@ -$NetBSD: patch-aa,v 1.15 2012/09/07 15:24:03 adam Exp $ +$NetBSD: patch-aa,v 1.16 2012/11/04 23:48:54 wiz Exp $ + +revision 1.6 +date: 2005/12/06 23:14:11; author: joerg; state: Exp; lines: +2 -2 +Fix a bug in the thread linkage I introduced earlier. This was most +noticable on NetBSD 1.6, where PTHREAD_LDFLAGS is not set at all. +---------------------------- +revision 1.5 +date: 2005/10/02 10:54:37; author: jmmv; state: Exp; lines: +21 -168 +Cairo uses pthreads, so link it against the threading library. +Fixes build problems of other packages using cairo (nothing could be linked +with -lcairo before), at least under NetBSD 2.0. Bump PKGREVISION to 2. --- src/Makefile.in.orig 2012-04-29 18:49:55.000000000 +0000 +++ src/Makefile.in diff --git a/graphics/cairo/patches/patch-ab b/graphics/cairo/patches/patch-ab index ad739c46475..5f07fac2f7d 100644 --- a/graphics/cairo/patches/patch-ab +++ b/graphics/cairo/patches/patch-ab @@ -1,4 +1,7 @@ -$NetBSD: patch-ab,v 1.16 2012/09/07 15:24:03 adam Exp $ +$NetBSD: patch-ab,v 1.17 2012/11/04 23:48:54 wiz Exp $ + +Use installed cairo library from cairo package. +(needed for split-off cairo-gobject package) --- util/cairo-gobject/Makefile.in.orig 2012-04-29 18:49:57.000000000 +0000 +++ util/cairo-gobject/Makefile.in diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac index 648b28e84c0..ca3ccd2011c 100644 --- a/graphics/cairo/patches/patch-ac +++ b/graphics/cairo/patches/patch-ac @@ -1,4 +1,7 @@ -$NetBSD: patch-ac,v 1.17 2011/02/15 11:30:47 drochner Exp $ +$NetBSD: patch-ac,v 1.18 2012/11/04 23:48:54 wiz Exp $ + +File is only installed by cairo-gobject, so manually +define existence macro. --- util/cairo-gobject/cairo-gobject.h.orig 2010-09-09 15:56:24.000000000 +0000 +++ util/cairo-gobject/cairo-gobject.h -- cgit v1.2.3