texlive[69519] Build/source/libs/cairo: cast pixman_*_image pointers

[commits+karl at tug.org]

Revision: 69519
          https://tug.org/svn/texlive?view=revision&revision=69519
Author:   karl
Date:     2024-01-21 18:40:41 +0100 (Sun, 21 Jan 2024)
Log Message:
-----------
cast pixman_*_image pointers to void** to placate -Wincompatible-pointer-types in gcc14

Modified Paths:
--------------
    trunk/Build/source/libs/cairo/ChangeLog
    trunk/Build/source/libs/cairo/TLpatches/ChangeLog
    trunk/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c

Added Paths:
-----------
    trunk/Build/source/libs/cairo/TLpatches/patch-04-void-casts

Modified: trunk/Build/source/libs/cairo/ChangeLog
===================================================================
--- trunk/Build/source/libs/cairo/ChangeLog	2024-01-21 11:13:43 UTC (rev 69518)
+++ trunk/Build/source/libs/cairo/ChangeLog	2024-01-21 17:40:41 UTC (rev 69519)
@@ -1,3 +1,11 @@
+2024-01-21  Karl Berry  <karl at freefriends.org>
+
+	* cairo-src/src/cairo-image-source.c: cast
+	__pixman_{transparent,black,white}_image pointers to void**
+	to placate -Wincompatible-pointer-types, which is likely
+	to become an error in GCC 14.
+	https://tug.org/pipermail/tex-live/2024-January/049794.html
+
 2021-02-28  David Seifert  <soap at gentoo.org>
 
 	* m4/float.m4: allow users to override 'strings', e.g.,

Modified: trunk/Build/source/libs/cairo/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/libs/cairo/TLpatches/ChangeLog	2024-01-21 11:13:43 UTC (rev 69518)
+++ trunk/Build/source/libs/cairo/TLpatches/ChangeLog	2024-01-21 17:40:41 UTC (rev 69519)
@@ -1,3 +1,5 @@
+(see ../ChangeLog for later updates.)
+
 2018-10-20  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import cairo-1.16.0.

Added: trunk/Build/source/libs/cairo/TLpatches/patch-04-void-casts
===================================================================
--- trunk/Build/source/libs/cairo/TLpatches/patch-04-void-casts	                        (rev 0)
+++ trunk/Build/source/libs/cairo/TLpatches/patch-04-void-casts	2024-01-21 17:40:41 UTC (rev 69519)
@@ -0,0 +1,36 @@
+Cast __pixman_{transparent,black,white}_image pointers to void**
+to placate -Wincompatible-pointer-types, which is likely
+to become an error in GCC 14.
+https://tug.org/pipermail/tex-live/2024-January/049794.html
+
+Index: cairo-image-source.c
+===================================================================
+--- cairo-image-source.c	(revision 69517)
++++ cairo-image-source.c	(working copy)
+@@ -86,7 +86,7 @@
+ 	if (unlikely (image == NULL))
+ 	    return NULL;
+ 
+-	if (_cairo_atomic_ptr_cmpxchg (&__pixman_transparent_image,
++	if (_cairo_atomic_ptr_cmpxchg ((void **) &__pixman_transparent_image,
+ 				       NULL, image))
+ 	{
+ 	    pixman_image_ref (image);
+@@ -118,7 +118,7 @@
+ 	if (unlikely (image == NULL))
+ 	    return NULL;
+ 
+-	if (_cairo_atomic_ptr_cmpxchg (&__pixman_black_image,
++	if (_cairo_atomic_ptr_cmpxchg ((void **) &__pixman_black_image,
+ 				       NULL, image))
+ 	{
+ 	    pixman_image_ref (image);
+@@ -150,7 +150,7 @@
+ 	if (unlikely (image == NULL))
+ 	    return NULL;
+ 
+-	if (_cairo_atomic_ptr_cmpxchg (&__pixman_white_image,
++	if (_cairo_atomic_ptr_cmpxchg ((void **) &__pixman_white_image,
+ 				       NULL, image))
+ 	{
+ 	    pixman_image_ref (image);

Modified: trunk/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c
===================================================================
--- trunk/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c	2024-01-21 11:13:43 UTC (rev 69518)
+++ trunk/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c	2024-01-21 17:40:41 UTC (rev 69519)
@@ -86,7 +86,7 @@
 	if (unlikely (image == NULL))
 	    return NULL;
 
-	if (_cairo_atomic_ptr_cmpxchg (&__pixman_transparent_image,
+	if (_cairo_atomic_ptr_cmpxchg ((void **) &__pixman_transparent_image,
 				       NULL, image))
 	{
 	    pixman_image_ref (image);
@@ -118,7 +118,7 @@
 	if (unlikely (image == NULL))
 	    return NULL;
 
-	if (_cairo_atomic_ptr_cmpxchg (&__pixman_black_image,
+	if (_cairo_atomic_ptr_cmpxchg ((void **) &__pixman_black_image,
 				       NULL, image))
 	{
 	    pixman_image_ref (image);
@@ -150,7 +150,7 @@
 	if (unlikely (image == NULL))
 	    return NULL;
 
-	if (_cairo_atomic_ptr_cmpxchg (&__pixman_white_image,
+	if (_cairo_atomic_ptr_cmpxchg ((void **) &__pixman_white_image,
 				       NULL, image))
 	{
 	    pixman_image_ref (image);