summaryrefslogtreecommitdiff
path: root/Build/source/libs
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2024-01-21 17:40:41 +0000
committerKarl Berry <karl@freefriends.org>2024-01-21 17:40:41 +0000
commit3b78c02b7cc4ac540d209b3d3d2b3da18a9d6b7d (patch)
tree2d22c2b01ecce1bd6dc5c7e66ccbed21f8928458 /Build/source/libs
parent46825947c7b11aac4d828006c2b731a66470ef84 (diff)
cast pixman_*_image pointers to void** to placate -Wincompatible-pointer-types in gcc14
git-svn-id: svn://tug.org/texlive/trunk@69519 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
-rw-r--r--Build/source/libs/cairo/ChangeLog8
-rw-r--r--Build/source/libs/cairo/TLpatches/ChangeLog2
-rw-r--r--Build/source/libs/cairo/TLpatches/patch-04-void-casts36
-rw-r--r--Build/source/libs/cairo/cairo-src/src/cairo-image-source.c6
4 files changed, 49 insertions, 3 deletions
diff --git a/Build/source/libs/cairo/ChangeLog b/Build/source/libs/cairo/ChangeLog
index 14df7cf39d2..99f83ffcbec 100644
--- a/Build/source/libs/cairo/ChangeLog
+++ b/Build/source/libs/cairo/ChangeLog
@@ -1,3 +1,11 @@
+2024-01-21 Karl Berry <karl@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@gentoo.org>
* m4/float.m4: allow users to override 'strings', e.g.,
diff --git a/Build/source/libs/cairo/TLpatches/ChangeLog b/Build/source/libs/cairo/TLpatches/ChangeLog
index 8be6faef5d8..0c83396e22c 100644
--- a/Build/source/libs/cairo/TLpatches/ChangeLog
+++ b/Build/source/libs/cairo/TLpatches/ChangeLog
@@ -1,3 +1,5 @@
+(see ../ChangeLog for later updates.)
+
2018-10-20 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
Import cairo-1.16.0.
diff --git a/Build/source/libs/cairo/TLpatches/patch-04-void-casts b/Build/source/libs/cairo/TLpatches/patch-04-void-casts
new file mode 100644
index 00000000000..db630ad8ddf
--- /dev/null
+++ b/Build/source/libs/cairo/TLpatches/patch-04-void-casts
@@ -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);
diff --git a/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c b/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c
index 0b50afcad32..3702a0c391e 100644
--- a/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c
+++ b/Build/source/libs/cairo/cairo-src/src/cairo-image-source.c
@@ -86,7 +86,7 @@ _pixman_transparent_image (void)
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 @@ _pixman_black_image (void)
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 @@ _pixman_white_image (void)
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);