From 0946cc3755bbeea556000de6bd38060bdfcb40ea Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Tue, 14 Nov 2023 16:01:45 +0000
Subject: [PATCH] cairomm1.16: update to 1.18.0.

1.18.0 (stable):

Meson build:
* The boost-shared option defaults to true
  (Kjell Ahlstedt)


1.17.1 (unstable):

* Add SaveGuard save/restore object
  (Jason Rhinelander, Kjell Ahlstedt) Issue #9 (Ian Britten)
* Add Surface::set/get_device_scale()
  (Thomas Holder) Merge request !22
* ScaledFont: Add get_text_extents() and get_glyph_extents()
  (Vitaly Dyachkov) Issue #30
* Use callback functions with C linkage
  (Kjell Ahlstedt) Issue glibmm#1 (Murray Cumming)

Documentation:
* Surface: Use cairomm names where possible
  (Kjell Ahlstedt)
* Context: Fix some typos
  (Daniel Boles) Merge request !26
* Update Visual Studio build docs
  (Chun-wei Fan) Merge request !28
* Remove AUTHORS and MAINTAINERS; add info to README.md
  (Kjell Ahlstedt) Issue gtkmm#140

Build:
* Meson build: Re-organize warnings-related compiler flags for MSVC
  (Chun-wei Fan) Merge request !24
* Autotools build: Add --disable-deprecated-api
  (Kjell Ahlstedt) Issue #29 (bbhtt)
* Require cairo >= 1.14.0
  (Kjell Ahlstedt)
* Meson build: Detect if we build from a git subtree
  (William Roy) Merge request gtkmm!72
* Meson build: Don't copy files with configure_file()
  (Kjell Ahlstedt)
* Meson build: Fix the evaluation of is_git_build on Windows
  (Kjell Ahlstedt) Issue gtkmm#131 (William Roy)
---
 graphics/cairomm1.16/Makefile | 24 ++++++------------------
 graphics/cairomm1.16/distinfo |  8 ++++----
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/graphics/cairomm1.16/Makefile b/graphics/cairomm1.16/Makefile
index 25e84732cdcb..ab3fc1e6c1a8 100644
--- a/graphics/cairomm1.16/Makefile
+++ b/graphics/cairomm1.16/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2023/11/14 14:01:58 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/11/14 16:01:45 wiz Exp $
 
-DISTNAME=	cairomm-1.16.2
+DISTNAME=	cairomm-1.18.0
 PKGNAME=	${DISTNAME:S/cairomm/cairomm1.16/}
-PKGREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	https://cairographics.org/releases/
 EXTRACT_SUFX=	.tar.xz
@@ -14,27 +13,16 @@ LICENSE=	gnu-lgpl-v2
 
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl pkg-config
-# TODO: update
-PKGCONFIG_OVERRIDE+=	data/cairomm-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-ft-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-pdf-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-png-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-ps-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-quartz-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-quartz-font-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-quartz-image-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-svg-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-win32-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-win32-font-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-xlib-1.0.pc.in
-PKGCONFIG_OVERRIDE+=	data/cairomm-xlib-xrender-1.0.pc.in
+
+PKGCONFIG_OVERRIDE+=		output/data/*.pc
+PKGCONFIG_OVERRIDE_STAGE=	post-build
 
 PLIST_VARS+=	x11 quartz
 
 .include "../../devel/libsigc++3/buildlink3.mk"
 .include "../../devel/meson/build.mk"
 .include "../../devel/mm-common/buildlink3.mk"
-BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.12
+BUILDLINK_API_DEPENDS.cairo+=	cairo>=1.14
 .include "../../graphics/cairo/buildlink3.mk"
 .if ${PKG_BUILD_OPTIONS.cairo:Mx11}
 PLIST.x11=	yes
diff --git a/graphics/cairomm1.16/distinfo b/graphics/cairomm1.16/distinfo
index 06f6d0d2bd52..9dd49a6bcaf7 100644
--- a/graphics/cairomm1.16/distinfo
+++ b/graphics/cairomm1.16/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2023/02/14 16:09:21 wiz Exp $
+$NetBSD: distinfo,v 1.6 2023/11/14 16:01:45 wiz Exp $
 
-BLAKE2s (cairomm-1.16.2.tar.xz) = 84c603c2d0edca5f204ea9530c5ae974e9bac62680f4ee3ffe9b9caeef760d63
-SHA512 (cairomm-1.16.2.tar.xz) = 61dc639eabe8502e1262c53c92fe57c5647e5ab9931f86ed51e657df1b7d0e3e58c2571910a05236cc0dca8d52f1f693aed99a553430f14d0fb87be1832a6b62
-Size (cairomm-1.16.2.tar.xz) = 593504 bytes
+BLAKE2s (cairomm-1.18.0.tar.xz) = faa9ea186999fe16f3233eafc4725eb0d75090d9ad38b555ad1c0cd5cec90b96
+SHA512 (cairomm-1.18.0.tar.xz) = d358a765136e244773b4a0fdcb2d9c81dd0b76f7a27c7108f94df9765f2d790f5f50b5645c09c292efce3e012528f85114d51916450c5fe6fa87d09f5a405d4c
+Size (cairomm-1.18.0.tar.xz) = 632520 bytes