diff options
| author | Ashvith Shetty <ashvith@noreply.codeberg.org> | 2025-08-02 03:31:41 +0530 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-08-02 21:50:09 +0200 |
| commit | eb4bd0ea6e84331bc3912453830370ae3842b633 (patch) | |
| tree | b5f2d80ba7389838c2fa94d08c7dae37ea796313 | |
| parent | bc7915de7e0b09c6610ae7090f7c6056167c35d1 (diff) | |
gnu: brasero: Fix build with gcc@14.
* gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch: New patch.
* gnu/local.mk (dist_patch_DATA): Register new patch.
* gnu/packages/gnome.scm (brasero)[source]: Use new patch.
Fixes: guix/guix#1759
Change-Id: Ifa8462d9c77d8e5716e41b1079a2b0ce46284c89
Signed-off-by: Andreas Enge <andreas@enge.fr>
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 4 | ||||
| -rw-r--r-- | gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch | 76 |
3 files changed, 80 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index c8ee08b753b..140c2415a13 100644 --- a/gnu/local.mk +++ b/gnu/local.mk | |||
| @@ -1055,6 +1055,7 @@ dist_patch_DATA = \ | |||
| 1055 | %D%/packages/patches/bdb-4-5-configure.patch \ | 1055 | %D%/packages/patches/bdb-4-5-configure.patch \ |
| 1056 | %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ | 1056 | %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch \ |
| 1057 | %D%/packages/patches/biboumi-cmake-ignore-git.patch \ | 1057 | %D%/packages/patches/biboumi-cmake-ignore-git.patch \ |
| 1058 | %D%/packages/patches/brasero-fix-gcc-14-build-failure.patch \ | ||
| 1058 | %D%/packages/patches/brightnessctl-elogind-support.patch \ | 1059 | %D%/packages/patches/brightnessctl-elogind-support.patch \ |
| 1059 | %D%/packages/patches/bsd-games-2.17-64bit.patch \ | 1060 | %D%/packages/patches/bsd-games-2.17-64bit.patch \ |
| 1060 | %D%/packages/patches/bsd-games-add-configure-config.patch \ | 1061 | %D%/packages/patches/bsd-games-add-configure-config.patch \ |
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bf2bc90fbe6..4d178e5a88e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -321,7 +321,9 @@ | |||
| 321 | "brasero-" version ".tar.xz")) | 321 | "brasero-" version ".tar.xz")) |
| 322 | (sha256 | 322 | (sha256 |
| 323 | (base32 | 323 | (base32 |
| 324 | "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47")))) | 324 | "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47")) |
| 325 | (patches | ||
| 326 | (search-patches "brasero-fix-gcc-14-build-failure.patch")))) | ||
| 325 | (build-system glib-or-gtk-build-system) | 327 | (build-system glib-or-gtk-build-system) |
| 326 | (arguments | 328 | (arguments |
| 327 | `(#:configure-flags (list | 329 | `(#:configure-flags (list |
diff --git a/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch b/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch new file mode 100644 index 00000000000..7a4b63d93e1 --- /dev/null +++ b/gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch | |||
| @@ -0,0 +1,76 @@ | |||
| 1 | From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001 | ||
| 2 | From: sid <sidtosh4@gmail.com> | ||
| 3 | Date: Mon, 3 Jun 2024 18:51:08 +0100 | ||
| 4 | Subject: [PATCH] Fix gcc 14.x build failure (due to | ||
| 5 | -Wincompatible-pointer-types) | ||
| 6 | |||
| 7 | The changes for 'brasero-drive-properties.c' are kept inline with | ||
| 8 | 'brasero-burn-options.c' (public API) for the sake of consistency. | ||
| 9 | |||
| 10 | Fixes: https://gitlab.gnome.org/GNOME/brasero/-/issues/370 | ||
| 11 | --- | ||
| 12 | libbrasero-burn/brasero-drive-properties.c | 10 +++------- | ||
| 13 | libbrasero-utils/brasero-metadata.c | 2 +- | ||
| 14 | libbrasero-utils/brasero-pk.c | 2 +- | ||
| 15 | 3 files changed, 5 insertions(+), 9 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c | ||
| 18 | index cfb2db147..22593cc16 100644 | ||
| 19 | --- a/libbrasero-burn/brasero-drive-properties.c | ||
| 20 | +++ b/libbrasero-burn/brasero-drive-properties.c | ||
| 21 | @@ -835,23 +835,19 @@ brasero_drive_properties_set_property (GObject *object, | ||
| 22 | GParamSpec *pspec) | ||
| 23 | { | ||
| 24 | BraseroDrivePropertiesPrivate *priv; | ||
| 25 | - BraseroBurnSession *session; | ||
| 26 | |||
| 27 | priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (object); | ||
| 28 | |||
| 29 | switch (property_id) { | ||
| 30 | case PROP_SESSION: /* Readable and only writable at creation time */ | ||
| 31 | - /* NOTE: no need to unref a potential previous session since | ||
| 32 | - * it's only set at construct time */ | ||
| 33 | - session = g_value_get_object (value); | ||
| 34 | - priv->session = g_object_ref (session); | ||
| 35 | + priv->session = g_object_ref (g_value_get_object (value)); | ||
| 36 | |||
| 37 | brasero_drive_properties_update (BRASERO_DRIVE_PROPERTIES (object)); | ||
| 38 | - priv->valid_sig = g_signal_connect (session, | ||
| 39 | + priv->valid_sig = g_signal_connect (priv->session, | ||
| 40 | "is-valid", | ||
| 41 | G_CALLBACK (brasero_drive_properties_is_valid_cb), | ||
| 42 | object); | ||
| 43 | - priv->output_sig = g_signal_connect (session, | ||
| 44 | + priv->output_sig = g_signal_connect (priv->session, | ||
| 45 | "output-changed", | ||
| 46 | G_CALLBACK (brasero_drive_properties_output_changed_cb), | ||
| 47 | object); | ||
| 48 | diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c | ||
| 49 | index 194336899..ddfce8e7b 100644 | ||
| 50 | --- a/libbrasero-utils/brasero-metadata.c | ||
| 51 | +++ b/libbrasero-utils/brasero-metadata.c | ||
| 52 | @@ -665,7 +665,7 @@ brasero_metadata_install_missing_plugins (BraseroMetadata *self) | ||
| 53 | |||
| 54 | context = gst_install_plugins_context_new (); | ||
| 55 | gst_install_plugins_context_set_xid (context, brasero_metadata_get_xid (self)); | ||
| 56 | - status = gst_install_plugins_async ((gchar **) details->pdata, | ||
| 57 | + status = gst_install_plugins_async ((const gchar* const*) details->pdata, | ||
| 58 | context, | ||
| 59 | brasero_metadata_install_plugins_result, | ||
| 60 | downloads); | ||
| 61 | diff --git a/libbrasero-utils/brasero-pk.c b/libbrasero-utils/brasero-pk.c | ||
| 62 | index aa71901f9..5f5ba21aa 100644 | ||
| 63 | --- a/libbrasero-utils/brasero-pk.c | ||
| 64 | +++ b/libbrasero-utils/brasero-pk.c | ||
| 65 | @@ -230,7 +230,7 @@ brasero_pk_install_gstreamer_plugin (BraseroPK *package, | ||
| 66 | |||
| 67 | context = gst_install_plugins_context_new (); | ||
| 68 | gst_install_plugins_context_set_xid (context, xid); | ||
| 69 | - status = gst_install_plugins_async ((gchar **) gst_plugins->pdata, | ||
| 70 | + status = gst_install_plugins_async ((const gchar* const*) gst_plugins->pdata, | ||
| 71 | context, | ||
| 72 | brasero_pk_install_gst_plugin_result, | ||
| 73 | package); | ||
| 74 | -- | ||
| 75 | GitLab | ||
| 76 | |||
