CVS commit: pkgsrc/graphics/cairo

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Sep 22 18:29:47 UTC 2026

Modified Files:
        pkgsrc/graphics/cairo: Makefile PLIST buildlink3.mk distinfo

Log Message:
cairo: updated to 1.18.6

1.18.6

A new stable release.

The XCB surface triggered an UAF warning when building with GCC.

The clipping code was accessing various fields in a guard value, and
causing a crash inside Inkscape. See: https://gitlab.com/inkscape/inkscape/-/issues/5631

Multiple fixes for the Windows backends, including improvements in the
thread safety of the DirectWrite code.

The DirectWrite backend now supports COLRv1 fonts.

Multiple fixes for building with MSVC and ClangCL.

A leak in the PDF surfaces has been fixed. [!644]

Various gaps between abutting rectangles when drawing with ANTIALIAS_NONE
were removed by using absolute coordinates and avoiding rounding
errors.

Remove an overflow when computing the buffer size in the XRender code.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 pkgsrc/graphics/cairo/Makefile
cvs rdiff -u -r1.48 -r1.49 pkgsrc/graphics/cairo/PLIST
cvs rdiff -u -r1.75 -r1.76 pkgsrc/graphics/cairo/buildlink3.mk
cvs rdiff -u -r1.103 -r1.104 pkgsrc/graphics/cairo/distinfo

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/cairo/Makefile
diff -u pkgsrc/graphics/cairo/Makefile:1.169 pkgsrc/graphics/cairo/Makefile:1.170
--- pkgsrc/graphics/cairo/Makefile:1.169        Wed Sep  2 19:02:31 2026
+++ pkgsrc/graphics/cairo/Makefile      Tue Sep 22 18:29:46 2026
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.169 2026/09/02 19:02:31 wiz Exp $
+# $NetBSD: Makefile,v 1.170 2026/09/22 18:29:46 adam Exp $
 
-DISTNAME=      cairo-1.18.4
-PKGREVISION=   4
+DISTNAME=      cairo-1.18.6
 CATEGORIES=    graphics
 MASTER_SITES=  https://cairographics.org/releases/
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/graphics/cairo/PLIST
diff -u pkgsrc/graphics/cairo/PLIST:1.48 pkgsrc/graphics/cairo/PLIST:1.49
--- pkgsrc/graphics/cairo/PLIST:1.48    Tue Jan 27 08:31:50 2026
+++ pkgsrc/graphics/cairo/PLIST Tue Sep 22 18:29:46 2026
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2026/01/27 08:31:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.49 2026/09/22 18:29:46 adam Exp $
 ${PLIST.trace}bin/cairo-trace
 include/cairo/cairo-deprecated.h
 include/cairo/cairo-features.h
@@ -21,13 +21,13 @@ ${PLIST.trace}lib/cairo/libcairo-fdr.so
 ${PLIST.trace}lib/cairo/libcairo-trace.so
 lib/libcairo-gobject.so
 lib/libcairo-gobject.so.2
-lib/libcairo-gobject.so.2.11804.4
+lib/libcairo-gobject.so.2.11806.6
 lib/libcairo-script-interpreter.so
 lib/libcairo-script-interpreter.so.2
-lib/libcairo-script-interpreter.so.2.11804.4
+lib/libcairo-script-interpreter.so.2.11806.6
 lib/libcairo.so
 lib/libcairo.so.2
-lib/libcairo.so.2.11804.4
+lib/libcairo.so.2.11806.6
 lib/pkgconfig/cairo-fc.pc
 lib/pkgconfig/cairo-ft.pc
 lib/pkgconfig/cairo-gobject.pc

Index: pkgsrc/graphics/cairo/buildlink3.mk
diff -u pkgsrc/graphics/cairo/buildlink3.mk:1.75 pkgsrc/graphics/cairo/buildlink3.mk:1.76
--- pkgsrc/graphics/cairo/buildlink3.mk:1.75    Wed Sep  2 19:02:31 2026
+++ pkgsrc/graphics/cairo/buildlink3.mk Tue Sep 22 18:29:46 2026
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.75 2026/09/02 19:02:31 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.76 2026/09/22 18:29:46 adam Exp $
 
 BUILDLINK_TREE+=       cairo
 
@@ -7,7 +7,7 @@ CAIRO_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.0.0nb2
 BUILDLINK_ABI_DEPENDS.cairo+=  cairo>=1.18.4nb4
-BUILDLINK_PKGSRCDIR.cairo=     ../../graphics/cairo
+BUILDLINK_PKGSRCDIR.cairo?=    ../../graphics/cairo
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/graphics/cairo/distinfo
diff -u pkgsrc/graphics/cairo/distinfo:1.103 pkgsrc/graphics/cairo/distinfo:1.104
--- pkgsrc/graphics/cairo/distinfo:1.103        Thu Aug 14 10:14:48 2025
+++ pkgsrc/graphics/cairo/distinfo      Tue Sep 22 18:29:46 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.103 2025/08/14 10:14:48 wiz Exp $
+$NetBSD: distinfo,v 1.104 2026/09/22 18:29:46 adam Exp $
 
-BLAKE2s (cairo-1.18.4.tar.xz) = 54a70468f46aef501497461765cebf5c44d0c80579ea5d5165dbec67ba9cfdbd
-SHA512 (cairo-1.18.4.tar.xz) = 863679f817ed67dc2c916c035d740916e27e7e69c04fca63936e37d274e7f4c79848d16c8f7c481798864602e8847c489f698df89b785cbc576c925dbd513316
-Size (cairo-1.18.4.tar.xz) = 32578804 bytes
+BLAKE2s (cairo-1.18.6.tar.xz) = 0ee88f14fe601a396c75b3107e380c19c5dba0071dbabdad835a5cad2a97e2b3
+SHA512 (cairo-1.18.6.tar.xz) = a38bc075ef562a8cc027a3389490f970ed0af3d1c914cfafc91203f7fc8c9d2f6b44b0976d861655f346a2dc51d95a2abceb88e02d0e4999ecb19febf87c4ea6
+Size (cairo-1.18.6.tar.xz) = 32725456 bytes
 SHA1 (patch-meson.build) = 3187c754af123be69e1b5651165f6310c8786558
 SHA1 (patch-src_cairo-bentley-ottmann-rectangular.c) = 7284b21954a35729ca92b248b99d1dca3496f9b5
 SHA1 (patch-src_cairo-colr-glyph-render.c) = 3dc6dc2b0a808b1bd6e2323645f895e276f0a8af