~ruther/guix-local

eb4bd0ea6e84331bc3912453830370ae3842b633 — Ashvith Shetty 1 year, 2 months ago bc7915d
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>
M gnu/local.mk => gnu/local.mk +1 -0
@@ 1055,6 1055,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/bdb-4-5-configure.patch                  \
  %D%/packages/patches/bdb-5.3-atomics-on-gcc-9.patch		\
  %D%/packages/patches/biboumi-cmake-ignore-git.patch		\
  %D%/packages/patches/brasero-fix-gcc-14-build-failure.patch	\
  %D%/packages/patches/brightnessctl-elogind-support.patch	\
  %D%/packages/patches/bsd-games-2.17-64bit.patch		\
  %D%/packages/patches/bsd-games-add-configure-config.patch	\

M gnu/packages/gnome.scm => gnu/packages/gnome.scm +3 -1
@@ 321,7 321,9 @@
                                 "brasero-" version ".tar.xz"))
             (sha256
              (base32
               "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47"))))
               "05gabybkl7xfinwx97i4scp9hic0dlxj7gh03dyj0hd16fp9wx47"))
             (patches
              (search-patches "brasero-fix-gcc-14-build-failure.patch"))))
    (build-system glib-or-gtk-build-system)
    (arguments
     `(#:configure-flags (list

A gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch => gnu/packages/patches/brasero-fix-gcc-14-build-failure.patch +76 -0
@@ 0,0 1,76 @@
From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001
From: sid <sidtosh4@gmail.com>
Date: Mon, 3 Jun 2024 18:51:08 +0100
Subject: [PATCH] Fix gcc 14.x build failure (due to
 -Wincompatible-pointer-types)

The changes for 'brasero-drive-properties.c' are kept inline with
'brasero-burn-options.c' (public API) for the sake of consistency.

Fixes: https://gitlab.gnome.org/GNOME/brasero/-/issues/370
---
 libbrasero-burn/brasero-drive-properties.c | 10 +++-------
 libbrasero-utils/brasero-metadata.c        |  2 +-
 libbrasero-utils/brasero-pk.c              |  2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libbrasero-burn/brasero-drive-properties.c b/libbrasero-burn/brasero-drive-properties.c
index cfb2db147..22593cc16 100644
--- a/libbrasero-burn/brasero-drive-properties.c
+++ b/libbrasero-burn/brasero-drive-properties.c
@@ -835,23 +835,19 @@ brasero_drive_properties_set_property (GObject *object,
 				       GParamSpec *pspec)
 {
 	BraseroDrivePropertiesPrivate *priv;
-	BraseroBurnSession *session;
 
 	priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (object);
 
 	switch (property_id) {
 	case PROP_SESSION: /* Readable and only writable at creation time */
-		/* NOTE: no need to unref a potential previous session since
-		 * it's only set at construct time */
-		session = g_value_get_object (value);
-		priv->session = g_object_ref (session);
+		priv->session = g_object_ref (g_value_get_object (value));
 
 		brasero_drive_properties_update (BRASERO_DRIVE_PROPERTIES (object));
-		priv->valid_sig = g_signal_connect (session,
+		priv->valid_sig = g_signal_connect (priv->session,
 						    "is-valid",
 						    G_CALLBACK (brasero_drive_properties_is_valid_cb),
 						    object);
-		priv->output_sig = g_signal_connect (session,
+		priv->output_sig = g_signal_connect (priv->session,
 						     "output-changed",
 						     G_CALLBACK (brasero_drive_properties_output_changed_cb),
 						     object);
diff --git a/libbrasero-utils/brasero-metadata.c b/libbrasero-utils/brasero-metadata.c
index 194336899..ddfce8e7b 100644
--- a/libbrasero-utils/brasero-metadata.c
+++ b/libbrasero-utils/brasero-metadata.c
@@ -665,7 +665,7 @@ brasero_metadata_install_missing_plugins (BraseroMetadata *self)
 
 	context = gst_install_plugins_context_new ();
 	gst_install_plugins_context_set_xid (context, brasero_metadata_get_xid (self));
-	status = gst_install_plugins_async ((gchar **) details->pdata,
+	status = gst_install_plugins_async ((const gchar* const*) details->pdata,
 					    context,
 					    brasero_metadata_install_plugins_result,
 					    downloads);
diff --git a/libbrasero-utils/brasero-pk.c b/libbrasero-utils/brasero-pk.c
index aa71901f9..5f5ba21aa 100644
--- a/libbrasero-utils/brasero-pk.c
+++ b/libbrasero-utils/brasero-pk.c
@@ -230,7 +230,7 @@ brasero_pk_install_gstreamer_plugin (BraseroPK *package,
 
 	context = gst_install_plugins_context_new ();
 	gst_install_plugins_context_set_xid (context, xid);
-	status = gst_install_plugins_async ((gchar **) gst_plugins->pdata,
+	status = gst_install_plugins_async ((const gchar* const*) gst_plugins->pdata,
 	                                    context,
 	                                    brasero_pk_install_gst_plugin_result,
 	                                    package);
-- 
GitLab