From e84395a61444244e6ddf18559ca14f82d0dc7c8c Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 29 Sep 2023 21:39:59 +0800
Subject: [PATCH] =?UTF-8?q?cairomm:=201.14.4=20=E2=86=92=201.14.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.freedesktop.org/cairo/cairomm/-/compare/1.14.4...1.14.5

The build changes are mostly the same as cairomm_1_16 1.18.0.

Actually build the tests.

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
---
 .../development/libraries/cairomm/default.nix | 35 ++++++++-----------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index 9a5ebfb289ea..d8d908cbc40d 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/pkgs/development/libraries/cairomm/default.nix
@@ -3,9 +3,9 @@
 , lib
 , pkg-config
 , darwin
+, boost
 , cairo
 , fontconfig
-, freetype
 , libsigcxx
 , meson
 , ninja
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cairomm";
-  version = "1.14.4";
+  version = "1.14.5";
 
   outputs = [ "out" "dev" ];
 
   src = fetchurl {
     url = "https://www.cairographics.org/releases/cairomm-${version}.tar.xz";
-    sha256 = "R0nSWisu9nzAwBTKr1yH+kZ5L8Sz7eGG+w/JMtIFUVg=";
+    sha256 = "cBNiA1QMiE6Jzhye37Y2m5lTk39s1ZbZfHjJdYpdSNs=";
   };
 
   nativeBuildInputs = [
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    boost # for tests
     fontconfig
-    freetype
   ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
     ApplicationServices
   ]);
@@ -40,25 +40,20 @@ stdenv.mkDerivation rec {
     libsigcxx
   ];
 
-  doCheck = true;
+  mesonFlags = [
+    "-Dbuild-tests=true"
+  ];
+
+  # Meson is no longer able to pick up Boost automatically.
+  # https://github.com/NixOS/nixpkgs/issues/86131
+  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
+  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
+
+  doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
-    description = "A 2D graphics library with support for multiple output devices";
-
-    longDescription = ''
-      Cairo is a 2D graphics library with support for multiple output
-      devices.  Currently supported output targets include the X
-      Window System, Quartz, Win32, image buffers, PostScript, PDF,
-      and SVG file output.  Experimental backends include OpenGL
-      (through glitz), XCB, BeOS, OS/2, and DirectFB.
-
-      Cairo is designed to produce consistent output on all output
-      media while taking advantage of display hardware acceleration
-      when available (e.g., through the X Render Extension).
-    '';
-
+    description = "C++ bindings for the Cairo vector graphics library";
     homepage = "https://www.cairographics.org/";
-
     license = with licenses; [ lgpl2Plus mpl10 ];
     platforms = platforms.unix;
   };