CVS commit: pkgsrc/graphics/cairo

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Thu Nov 23 10:57:45 UTC 2023

Modified Files:
        pkgsrc/graphics/cairo: Makefile distinfo
Added Files:
        pkgsrc/graphics/cairo/patches: patch-perf_cairo-perf-print.c
            patch-src_cairo-colr-glyph-render.c

Log Message:
cairo: SunOS build fixes.


To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 pkgsrc/graphics/cairo/Makefile
cvs rdiff -u -r1.99 -r1.100 pkgsrc/graphics/cairo/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/cairo/patches/patch-perf_cairo-perf-print.c \
    pkgsrc/graphics/cairo/patches/patch-src_cairo-colr-glyph-render.c

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.158 pkgsrc/graphics/cairo/Makefile:1.159
--- pkgsrc/graphics/cairo/Makefile:1.158        Fri Nov 17 08:17:04 2023
+++ pkgsrc/graphics/cairo/Makefile      Thu Nov 23 10:57:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.158 2023/11/17 08:17:04 nia Exp $
+# $NetBSD: Makefile,v 1.159 2023/11/23 10:57:44 jperkin Exp $
 
 DISTNAME=      cairo-1.18.0
 CATEGORIES=    graphics
@@ -17,6 +17,7 @@ USE_TOOLS+=           pkg-config
 
 # For snprintf() and ctime_r()
 CPPFLAGS.SunOS+=       -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
+LDFLAGS.SunOS+=                -lsocket
 
 PKGCONFIG_OVERRIDE_STAGE=      post-build
 PKGCONFIG_OVERRIDE+=           output/meson-private/*.pc

Index: pkgsrc/graphics/cairo/distinfo
diff -u pkgsrc/graphics/cairo/distinfo:1.99 pkgsrc/graphics/cairo/distinfo:1.100
--- pkgsrc/graphics/cairo/distinfo:1.99 Tue Nov 14 20:43:36 2023
+++ pkgsrc/graphics/cairo/distinfo      Thu Nov 23 10:57:44 2023
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.99 2023/11/14 20:43:36 prlw1 Exp $
+$NetBSD: distinfo,v 1.100 2023/11/23 10:57:44 jperkin Exp $
 
 BLAKE2s (cairo-1.18.0.tar.xz) = d17e3d7a1b32769f02500ff3edaf8a7e18974873a128c61e607f05e5216e8a63
 SHA512 (cairo-1.18.0.tar.xz) = 6366c7d5e3fd3e12df2edc43aa4ed4c3a517de2ef0b1b3b30dfa8b69a7cae1dd55765801228cec308d2e9792037d0704ae49d95b7b12c06f20df092fa0534e1c
 Size (cairo-1.18.0.tar.xz) = 33761148 bytes
 SHA1 (patch-meson.build) = 3187c754af123be69e1b5651165f6310c8786558
+SHA1 (patch-perf_cairo-perf-print.c) = e1330a9b8a13337915c06cba93a7191af4cfe568
+SHA1 (patch-src_cairo-colr-glyph-render.c) = 3dc6dc2b0a808b1bd6e2323645f895e276f0a8af
 SHA1 (patch-src_cairo-image-surface.c) = 3ae5966abf7851dfdb74742c39d2033b4655d7f7
 SHA1 (patch-test_pdf-structure.c) = dd3e5ee2cdbc19e77c2d5a60dab98195ecbe82bb
 SHA1 (patch-util_cairo-missing_getline.c) = a1068a37113b162ccfe14d7f1bd0baa9df7e5530

Added files:

Index: pkgsrc/graphics/cairo/patches/patch-perf_cairo-perf-print.c
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-perf_cairo-perf-print.c:1.1
--- /dev/null   Thu Nov 23 10:57:45 2023
+++ pkgsrc/graphics/cairo/patches/patch-perf_cairo-perf-print.c Thu Nov 23 10:57:44 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-perf_cairo-perf-print.c,v 1.1 2023/11/23 10:57:44 jperkin Exp $
+
+SunOS needs sys/termios.h for TIOCGWINSZ.
+
+--- perf/cairo-perf-print.c.orig       2023-11-23 10:44:50.499929610 +0000
++++ perf/cairo-perf-print.c
+@@ -43,6 +43,9 @@
+ #if USE_TERMINAL_SIZE
+ #include <unistd.h>
+ #include <sys/ioctl.h>
++#ifdef __sun
++#include <sys/termios.h>
++#endif
+ #endif
+ 
+ static void
Index: pkgsrc/graphics/cairo/patches/patch-src_cairo-colr-glyph-render.c
diff -u /dev/null pkgsrc/graphics/cairo/patches/patch-src_cairo-colr-glyph-render.c:1.1
--- /dev/null   Thu Nov 23 10:57:45 2023
+++ pkgsrc/graphics/cairo/patches/patch-src_cairo-colr-glyph-render.c   Thu Nov 23 10:57:44 2023
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_cairo-colr-glyph-render.c,v 1.1 2023/11/23 10:57:44 jperkin Exp $
+
+SunOS needs alloca.h.
+
+--- src/cairo-colr-glyph-render.c.orig 2023-11-23 10:39:05.280692069 +0000
++++ src/cairo-colr-glyph-render.c
+@@ -38,6 +38,9 @@
+ #include "cairo-path-private.h"
+ #include "cairo-pattern-private.h"
+ 
++#ifdef __sun
++#include <alloca.h>
++#endif
+ #include <assert.h>
+ #include <math.h>
+ #include <stdio.h>