summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2006-09-20 12:58:32 +0000
committerjoerg <joerg@pkgsrc.org>2006-09-20 12:58:32 +0000
commitc910dc2fbe821ebf05ded2e4f2c8113888d711b3 (patch)
tree421cbf3ba2c3bf5f57cf7f6bd029c554448582fc /graphics
parentb6368304eef21c8b3b6998a7c94846cc51a28803 (diff)
downloadpkgsrc-c910dc2fbe821ebf05ded2e4f2c8113888d711b3.tar.gz
Fix ABI regression compared to pkgsrc's cairo-1.0. Bump revision.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/cairo/Makefile4
-rw-r--r--graphics/cairo/distinfo3
-rw-r--r--graphics/cairo/patches/patch-af30
3 files changed, 34 insertions, 3 deletions
diff --git a/graphics/cairo/Makefile b/graphics/cairo/Makefile
index 387f055e861..b7378cdf1d2 100644
--- a/graphics/cairo/Makefile
+++ b/graphics/cairo/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2006/08/31 11:12:58 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.47 2006/09/20 12:58:32 joerg Exp $
DISTNAME= cairo-1.2.4
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://cairographics.org/releases/
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo
index 561189a5b27..d97f3d82abd 100644
--- a/graphics/cairo/distinfo
+++ b/graphics/cairo/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/08/31 11:17:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.25 2006/09/20 12:58:32 joerg Exp $
SHA1 (cairo-1.2.4.tar.gz) = 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c
RMD160 (cairo-1.2.4.tar.gz) = dee558b7489aa089de6963d909a8352725e10bdd
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 14f3122cea953ad460b96cb2cf2347e5ed007450
SHA1 (patch-ac) = 71c66c051673a40b816c80cd8a67bfb4d0b6000b
SHA1 (patch-ad) = 60ebdcbbcd0a7bd97ba4d25e79500547008ede34
SHA1 (patch-ae) = 31141662ea34bc190443f82ed1ceab826bb98c37
+SHA1 (patch-af) = 257e2c4e73842e4a2f236765b9dae1c6f355c8b4
diff --git a/graphics/cairo/patches/patch-af b/graphics/cairo/patches/patch-af
new file mode 100644
index 00000000000..f7ce41918f4
--- /dev/null
+++ b/graphics/cairo/patches/patch-af
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.1 2006/09/20 12:58:32 joerg Exp $
+
+As cairo-1.0 from pkgsrc was shipped with PS and PDF backend enabled,
+ensure that the ABI is not broken.
+
+--- src/cairo-surface.c.orig 2006-09-20 00:06:40.000000000 +0200
++++ src/cairo-surface.c
+@@ -2116,3 +2116,22 @@ _cairo_surface_copy_pattern_for_destinat
+
+ /* LocalWords: rasterized
+ */
++
++#undef cairo_ps_surface_set_dpi
++#undef cairo_pdf_surface_set_dpi
++
++void
++cairo_ps_surface_set_dpi(cairo_surface_t *surface,
++ double x_pixels_per_inch,
++ double y_pixels_per_inch)
++{
++ cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
++}
++
++void
++cairo_pdf_surface_set_dpi(cairo_surface_t *surface,
++ double x_pixels_per_inch,
++ double y_pixels_per_inch)
++{
++ cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
++}