temp/gtk+3.0: fix build (MR 3557)
Pick some patches from gtk 3.24.34 to fix compilation under GCC 12. [ci:skip-vercheck] [ci:skip-build]: already built successfully in CI
This commit is contained in:
Luca Weiss
Oliver Smith
parent
c49180f8cf
commit
5985852e77
3 changed files with 280 additions and 0 deletions
189
temp/gtk+3.0/0001-gtkimagedefinition-Check-array-bounds.patch
Normal file
189
temp/gtk+3.0/0001-gtkimagedefinition-Check-array-bounds.patch
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
From a5d208adafec044b2c9e36ec5eb0f43db8be0564 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
|
||||
Date: Fri, 29 Apr 2022 22:06:12 -0400
|
||||
Subject: [PATCH 1/2] gtkimagedefinition: Check array bounds
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
`jhbuild build gtk+-3` with GCC 12 fails with:
|
||||
```
|
||||
In function ‘gtk_image_definition_ref’,
|
||||
inlined from ‘gtk_image_definition_new_empty’
|
||||
at ../../../../jhbuild/checkout/gtk+-3/gtk/gtkimagedefinition.c:107:10:
|
||||
../../../../jhbuild/checkout/gtk+-3/gtk/gtkimagedefinition.c:241:13: error:
|
||||
array subscript ‘GtkImageDefinition {aka union _GtkImageDefinition}[0]’
|
||||
is partly outside array bounds of ‘GtkImageDefinitionEmpty[1]’
|
||||
{aka ‘struct _GtkImageDefinitionEmpty[1]’} [-Werror=array-bounds]
|
||||
241 | def->empty.ref_count++;
|
||||
| ~~~~~~~~~~^~~~~~~~~~
|
||||
../../../../jhbuild/checkout/gtk+-3/gtk/gtkimagedefinition.c:
|
||||
In function ‘gtk_image_definition_new_empty’:
|
||||
../../../../jhbuild/checkout/gtk+-3/gtk/gtkimagedefinition.c:105:34: note:
|
||||
object ‘empty’ of size 8
|
||||
105 | static GtkImageDefinitionEmpty empty = { GTK_IMAGE_EMPTY, 1 };
|
||||
| ^~~~~
|
||||
```
|
||||
and many similar errors.
|
||||
|
||||
Fix it by casting `GtkImageDefinition` to `GtkImageDefinitionEmpty` or
|
||||
similar, as appropriate.
|
||||
|
||||
Essentially backports 4dcd02e85315f487310e2e01fe9412706a77dc35 from main to gtk-3-24.
|
||||
---
|
||||
gtk/gtkimagedefinition.c | 43 +++++++++++++++++++++++++++++-----------
|
||||
1 file changed, 31 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkimagedefinition.c b/gtk/gtkimagedefinition.c
|
||||
index bd59420d5c..9ef8223911 100644
|
||||
--- a/gtk/gtkimagedefinition.c
|
||||
+++ b/gtk/gtkimagedefinition.c
|
||||
@@ -121,12 +121,14 @@ gtk_image_definition_alloc (GtkImageType type)
|
||||
sizeof (GtkImageDefinitionSurface)
|
||||
};
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionEmpty *empty_def;
|
||||
|
||||
g_assert (type < G_N_ELEMENTS (sizes));
|
||||
|
||||
def = g_malloc0 (sizes[type]);
|
||||
- def->type = type;
|
||||
- def->empty.ref_count = 1;
|
||||
+ empty_def = (GtkImageDefinitionEmpty *) def;
|
||||
+ empty_def->type = type;
|
||||
+ empty_def->ref_count = 1;
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -136,13 +138,15 @@ gtk_image_definition_new_pixbuf (GdkPixbuf *pixbuf,
|
||||
int scale)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionPixbuf *pixbuf_def;
|
||||
|
||||
if (pixbuf == NULL || scale <= 0)
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_PIXBUF);
|
||||
- def->pixbuf.pixbuf = g_object_ref (pixbuf);
|
||||
- def->pixbuf.scale = scale;
|
||||
+ pixbuf_def = (GtkImageDefinitionPixbuf *) def;
|
||||
+ pixbuf_def->pixbuf = g_object_ref (pixbuf);
|
||||
+ pixbuf_def->scale = scale;
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -151,12 +155,14 @@ GtkImageDefinition *
|
||||
gtk_image_definition_new_stock (const char *stock_id)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionStock *stock_def;
|
||||
|
||||
if (stock_id == NULL || stock_id[0] == '\0')
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_STOCK);
|
||||
- def->stock.id = g_strdup (stock_id);
|
||||
+ stock_def = (GtkImageDefinitionStock *) def;
|
||||
+ stock_def->id = g_strdup (stock_id);
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -165,13 +171,15 @@ GtkImageDefinition *
|
||||
gtk_image_definition_new_icon_set (GtkIconSet *icon_set)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionIconSet *icon_set_def;
|
||||
|
||||
if (icon_set == NULL)
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_ICON_SET);
|
||||
+ icon_set_def = (GtkImageDefinitionIconSet *) def;
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
|
||||
- def->icon_set.icon_set = gtk_icon_set_ref (icon_set);
|
||||
+ icon_set_def->icon_set = gtk_icon_set_ref (icon_set);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS;
|
||||
|
||||
return def;
|
||||
@@ -182,13 +190,15 @@ gtk_image_definition_new_animation (GdkPixbufAnimation *animation,
|
||||
int scale)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionAnimation *animation_def;
|
||||
|
||||
if (animation == NULL || scale <= 0)
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_ANIMATION);
|
||||
- def->animation.animation = g_object_ref (animation);
|
||||
- def->animation.scale = scale;
|
||||
+ animation_def = (GtkImageDefinitionAnimation *) def;
|
||||
+ animation_def->animation = g_object_ref (animation);
|
||||
+ animation_def->scale = scale;
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -197,12 +207,14 @@ GtkImageDefinition *
|
||||
gtk_image_definition_new_icon_name (const char *icon_name)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionIconName *icon_name_def;
|
||||
|
||||
if (icon_name == NULL || icon_name[0] == '\0')
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_ICON_NAME);
|
||||
- def->icon_name.icon_name = g_strdup (icon_name);
|
||||
+ icon_name_def = (GtkImageDefinitionIconName *) def;
|
||||
+ icon_name_def->icon_name = g_strdup (icon_name);
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -211,12 +223,14 @@ GtkImageDefinition *
|
||||
gtk_image_definition_new_gicon (GIcon *gicon)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionGIcon *gicon_def;
|
||||
|
||||
if (gicon == NULL)
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_GICON);
|
||||
- def->gicon.gicon = g_object_ref (gicon);
|
||||
+ gicon_def = (GtkImageDefinitionGIcon *) def;
|
||||
+ gicon_def->gicon = g_object_ref (gicon);
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -225,12 +239,14 @@ GtkImageDefinition *
|
||||
gtk_image_definition_new_surface (cairo_surface_t *surface)
|
||||
{
|
||||
GtkImageDefinition *def;
|
||||
+ GtkImageDefinitionSurface *surface_def;
|
||||
|
||||
if (surface == NULL)
|
||||
return NULL;
|
||||
|
||||
def = gtk_image_definition_alloc (GTK_IMAGE_SURFACE);
|
||||
- def->surface.surface = cairo_surface_reference (surface);
|
||||
+ surface_def = (GtkImageDefinitionSurface *) def;
|
||||
+ surface_def->surface = cairo_surface_reference (surface);
|
||||
|
||||
return def;
|
||||
}
|
||||
@@ -238,7 +254,10 @@ gtk_image_definition_new_surface (cairo_surface_t *surface)
|
||||
GtkImageDefinition *
|
||||
gtk_image_definition_ref (GtkImageDefinition *def)
|
||||
{
|
||||
- def->empty.ref_count++;
|
||||
+ GtkImageDefinitionEmpty *empty_def;
|
||||
+
|
||||
+ empty_def = (GtkImageDefinitionEmpty *) def;
|
||||
+ empty_def->ref_count++;
|
||||
|
||||
return def;
|
||||
}
|
||||
--
|
||||
2.38.0
|
||||
|
||||
|
|
@ -0,0 +1,87 @@
|
|||
From 54d319bc32bc2c6ac6c77671bfd419bdeff6edcb Mon Sep 17 00:00:00 2001
|
||||
From: Peter Bloomfield <PeterBloomfield@bellsouth.net>
|
||||
Date: Sat, 30 Apr 2022 12:59:48 -0400
|
||||
Subject: [PATCH 2/2] gtkimagedefinition: Extend commit b38266c0
|
||||
|
||||
Similarly, uses casts in `gtk_image_definition_unref()`. Compilation
|
||||
succeeds without them, unlike in `gtk_image_definition_ref()`, because
|
||||
`gtk_image_definition_unref()` is not called internally, unlike
|
||||
`gtk_image_definition_ref()`. But the build would fail if some function
|
||||
defined in the module were changed in the future to call
|
||||
`gtk_image_definition_unref()`, and we can future-proof it now. This
|
||||
also removes an inconsistency in how we access the members of the union.
|
||||
---
|
||||
gtk/gtkimagedefinition.c | 35 ++++++++++++++++++++++++++---------
|
||||
1 file changed, 26 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/gtk/gtkimagedefinition.c b/gtk/gtkimagedefinition.c
|
||||
index 9ef8223911..a26d6eb15c 100644
|
||||
--- a/gtk/gtkimagedefinition.c
|
||||
+++ b/gtk/gtkimagedefinition.c
|
||||
@@ -265,9 +265,19 @@ gtk_image_definition_ref (GtkImageDefinition *def)
|
||||
void
|
||||
gtk_image_definition_unref (GtkImageDefinition *def)
|
||||
{
|
||||
- def->empty.ref_count--;
|
||||
+ GtkImageDefinitionEmpty *empty_def;
|
||||
+ GtkImageDefinitionPixbuf *pixbuf_def;
|
||||
+ GtkImageDefinitionAnimation *animation_def;
|
||||
+ GtkImageDefinitionSurface *surface_def;
|
||||
+ GtkImageDefinitionStock *stock_def;
|
||||
+ GtkImageDefinitionIconSet *icon_set_def;
|
||||
+ GtkImageDefinitionIconName *icon_name_def;
|
||||
+ GtkImageDefinitionGIcon *gicon_def;
|
||||
+
|
||||
+ empty_def = (GtkImageDefinitionEmpty *) def;
|
||||
+ empty_def->ref_count--;
|
||||
|
||||
- if (def->empty.ref_count > 0)
|
||||
+ if (empty_def->ref_count > 0)
|
||||
return;
|
||||
|
||||
switch (def->type)
|
||||
@@ -277,27 +287,34 @@ gtk_image_definition_unref (GtkImageDefinition *def)
|
||||
g_assert_not_reached ();
|
||||
break;
|
||||
case GTK_IMAGE_PIXBUF:
|
||||
- g_object_unref (def->pixbuf.pixbuf);
|
||||
+ pixbuf_def = (GtkImageDefinitionPixbuf *) def;
|
||||
+ g_object_unref (pixbuf_def->pixbuf);
|
||||
break;
|
||||
case GTK_IMAGE_ANIMATION:
|
||||
- g_object_unref (def->animation.animation);
|
||||
+ animation_def = (GtkImageDefinitionAnimation *) def;
|
||||
+ g_object_unref (animation_def->animation);
|
||||
break;
|
||||
case GTK_IMAGE_SURFACE:
|
||||
- cairo_surface_destroy (def->surface.surface);
|
||||
+ surface_def = (GtkImageDefinitionSurface *) def;
|
||||
+ cairo_surface_destroy (surface_def->surface);
|
||||
break;
|
||||
case GTK_IMAGE_STOCK:
|
||||
- g_free (def->stock.id);
|
||||
+ stock_def = (GtkImageDefinitionStock *) def;
|
||||
+ g_free (stock_def->id);
|
||||
break;
|
||||
case GTK_IMAGE_ICON_SET:
|
||||
+ icon_set_def = (GtkImageDefinitionIconSet *) def;
|
||||
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
|
||||
- gtk_icon_set_unref (def->icon_set.icon_set);
|
||||
+ gtk_icon_set_unref (icon_set_def->icon_set);
|
||||
G_GNUC_END_IGNORE_DEPRECATIONS;
|
||||
break;
|
||||
case GTK_IMAGE_ICON_NAME:
|
||||
- g_free (def->icon_name.icon_name);
|
||||
+ icon_name_def = (GtkImageDefinitionIconName *) def;
|
||||
+ g_free (icon_name_def->icon_name);
|
||||
break;
|
||||
case GTK_IMAGE_GICON:
|
||||
- g_object_unref (def->gicon.gicon);
|
||||
+ gicon_def = (GtkImageDefinitionGIcon *) def;
|
||||
+ g_object_unref (gicon_def->gicon);
|
||||
break;
|
||||
}
|
||||
|
||||
--
|
||||
2.38.0
|
||||
|
||||
|
|
@ -60,6 +60,8 @@ checkdepends="
|
|||
"
|
||||
source="https://source.puri.sm/Librem5/gtk/-/archive/$_commit/gtk-$_commit.tar.gz
|
||||
0001-Avoid-diagnostics-for-gcc-11-false-positive-out-of-b.patch
|
||||
0001-gtkimagedefinition-Check-array-bounds.patch
|
||||
0002-gtkimagedefinition-Extend-commit-b38266c0.patch
|
||||
"
|
||||
|
||||
builddir="$srcdir/gtk-$_commit"
|
||||
|
|
@ -139,4 +141,6 @@ doc() {
|
|||
sha512sums="
|
||||
942d2e24bdb4e9fea7fc5bbd3d41ab203b69f6352566f43164e59842d49163e37d638858032cf2322b9b4c279c8c9a07a63d58fa7ec8554f3194c17ae3185fd7 gtk-f05e4021ed82bfbabf566398d0511b6745a5745e.tar.gz
|
||||
346514bb7c1853afcbeff4a5a25a2b9800e135e44271e48cdf400dc607dadd41af57d89ee4f4e24aedc358292d9c45db931dbbd84dae6a10886d8ae633ca8434 0001-Avoid-diagnostics-for-gcc-11-false-positive-out-of-b.patch
|
||||
8dc58f1b5d702e193018899350baadda54a9edf16a88f5afb1fa8bdff3f3e9e923b838a59bf17c672c768d8f67aceafcb41047547dbdc67d3f9b27829aa5e089 0001-gtkimagedefinition-Check-array-bounds.patch
|
||||
25ef673787fd236199980e3eadc6731771d0486ef0ddced92ca654eabe0180a7b445b86354fe4198839b6729dd50bd0c528f38d5411802dd13af72e7843ea493 0002-gtkimagedefinition-Extend-commit-b38266c0.patch
|
||||
"
|
||||
|
|
|
|||
Loading…
Reference in a new issue