summaryrefslogtreecommitdiff
path: root/graphics/cairo
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2006-11-09 20:57:40 +0000
committerdrochner <drochner@pkgsrc.org>2006-11-09 20:57:40 +0000
commit9d15b11d81d7e08a8eaa55efc3d012cbda816786 (patch)
treef914e69e4944d4f49c30ad1863c66ac3f0cbdeba /graphics/cairo
parentb0e0efd2144f8b865e36309b9a8b8def51be68ca (diff)
downloadpkgsrc-9d15b11d81d7e08a8eaa55efc3d012cbda816786.tar.gz
update to 1.2.6
changes: mostly bugfixes
Diffstat (limited to 'graphics/cairo')
-rw-r--r--graphics/cairo/Makefile5
-rw-r--r--graphics/cairo/distinfo12
-rw-r--r--graphics/cairo/patches/patch-ac14
-rw-r--r--graphics/cairo/patches/patch-ad16
4 files changed, 23 insertions, 24 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index d75d632da86..c57f6e2697d 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.50 2006/11/09 13:26:36 dsainty Exp $
+# $NetBSD: Makefile,v 1.51 2006/11/09 20:57:40 drochner Exp $
-DISTNAME= cairo-1.2.4
-PKGREVISION= 3
+DISTNAME= cairo-1.2.6
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index b261e63ede2..41d62c1b164 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.26 2006/09/29 13:43:41 drochner Exp $
+$NetBSD: distinfo,v 1.27 2006/11/09 20:57:41 drochner Exp $
-SHA1 (cairo-1.2.4.tar.gz) = 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c
-RMD160 (cairo-1.2.4.tar.gz) = dee558b7489aa089de6963d909a8352725e10bdd
-Size (cairo-1.2.4.tar.gz) = 2882781 bytes
+SHA1 (cairo-1.2.6.tar.gz) = b86b4017a9abd565ef11c72b7faee9082a04118f
+RMD160 (cairo-1.2.6.tar.gz) = 4469a661b294e342ee77e726c1cefccd4837ae2e
+Size (cairo-1.2.6.tar.gz) = 2973689 bytes
SHA1 (patch-aa) = 1b8ac1d495214c80b2e0ba28490bbc212f727773
SHA1 (patch-ab) = 14f3122cea953ad460b96cb2cf2347e5ed007450
-SHA1 (patch-ac) = 71c66c051673a40b816c80cd8a67bfb4d0b6000b
-SHA1 (patch-ad) = 60ebdcbbcd0a7bd97ba4d25e79500547008ede34
+SHA1 (patch-ac) = 5f3e97e89b8353e03ed4bf78c1cfb73765199bf2
+SHA1 (patch-ad) = b4500f17e6769ecd05902b20bb54c07887a6f6fe
SHA1 (patch-ae) = 9ce7cab8e4f1394efdd516d5f83d2d53edb02064
SHA1 (patch-af) = 257e2c4e73842e4a2f236765b9dae1c6f355c8b4
diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac
index 4a15393033c..1dce48eed59 100644
--- a/graphics/cairo/patches/patch-ac
+++ b/graphics/cairo/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.2 2006/08/10 13:50:37 wiz Exp $
+$NetBSD: patch-ac,v 1.3 2006/11/09 20:57:41 drochner Exp $
---- src/cairoint.h.orig 2006-08-08 07:19:51.000000000 +0000
+--- src/cairoint.h.orig 2006-11-02 23:53:40.000000000 +0100
+++ src/cairoint.h
-@@ -67,7 +67,7 @@
+@@ -72,7 +72,7 @@
CAIRO_BEGIN_DECLS
-#if __GNUC__ >= 3 && defined(__ELF__)
+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
- # define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name)
- # define slim_hidden_def(name) slim_hidden_def1(name, INT_##name)
- # define slim_hidden_proto1(name, internal) \
-@@ -95,7 +95,7 @@ CAIRO_BEGIN_DECLS
+ # define slim_hidden_proto(name) slim_hidden_proto1(name, slim_hidden_int_name(name))
+ # define slim_hidden_def(name) slim_hidden_def1(name, slim_hidden_int_name(name))
+ # define slim_hidden_int_name(name) INT_##name
+@@ -101,7 +101,7 @@ CAIRO_BEGIN_DECLS
#endif
/* slim_internal.h */
diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad
index a658d787e1e..899bb2d1ad1 100644
--- a/graphics/cairo/patches/patch-ad
+++ b/graphics/cairo/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2006/08/10 13:50:37 wiz Exp $
+$NetBSD: patch-ad,v 1.3 2006/11/09 20:57:41 drochner Exp $
---- pixman/src/slim_internal.h.orig 2006-07-09 01:01:35.889958000 +1200
+--- pixman/src/slim_internal.h.orig 2006-11-01 17:48:53.000000000 +0100
+++ pixman/src/slim_internal.h
@@ -47,7 +47,7 @@
/* ??? Not marked with "slim" because that makes it look too much
@@ -9,14 +9,14 @@ $NetBSD: patch-ad,v 1.2 2006/08/10 13:50:37 wiz Exp $
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__)
+#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) && defined(__ELF__) && !defined(__sun)
#define pixman_private __attribute__((__visibility__("hidden")))
- #else
- #define pixman_private
-@@ -77,7 +77,7 @@
+ #elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+ #define pixman_private __hidden
+@@ -79,7 +79,7 @@
the C symbol "EXT_foo", which is renamed to "foo" at the assembly
level. */
-#if __GNUC__ >= 3 && defined(__ELF__)
+#if __GNUC__ >= 3 && defined(__ELF__) && !defined(__sun)
- # define slim_hidden_proto(name) slim_hidden_proto1(name, INT_##name)
- # define slim_hidden_def(name) slim_hidden_def1(name, INT_##name)
- # define slim_hidden_proto1(name, internal) \
+ # define slim_hidden_proto(name) slim_hidden_proto1(name, slim_hidden_int_name(name))
+ # define slim_hidden_def(name) slim_hidden_def1(name, slim_hidden_int_name(name))
+ # define slim_hidden_int_name(name) INT_##name