commit 3b7dca4931bd030330cb9b727268c04eb5c9e1cb
Author: Jan Rękorajski <[email protected]>
Date: Fri Dec 20 11:01:00 2024 +0100
- rel 2
- fix building with gcc 14
- update nautilus BR
brasero.spec | 6 +++--
gcc14.patch | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+), 2 deletions(-)
---
diff --git a/brasero.spec b/brasero.spec
index 922da6a..520f12c 100644
--- a/brasero.spec
+++ b/brasero.spec
@@ -6,11 +6,12 @@ Summary: Disc burning application for GNOME
Summary(pl.UTF-8): Program do wypalania płyt dla GNOME
Name: brasero
Version: 3.12.3
-Release: 1
+Release: 2
License: GPL v2+
Group: X11/Applications
Source0:
https://download.gnome.org/sources/brasero/3.12/%{name}-%{version}.tar.xz
# Source0-md5: ae48248dd36f89282d573eb7a0a1391f
+Patch0: gcc14.patch
URL: https://wiki.gnome.org/Apps/Brasero
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.6
@@ -31,7 +32,7 @@ BuildRequires: libisofs-devel >= 0.6.4
BuildRequires: libnotify-devel >= 0.6.1
BuildRequires: libtool >= 2:2.2
BuildRequires: libxml2-devel >= 1:2.6.31
-%{?with_nautilus:BuildRequires: nautilus-devel >= 3.0.0}
+%{?with_nautilus:BuildRequires: nautilus3-devel >= 3.0.0}
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(find_lang) >= 1.23
@@ -131,6 +132,7 @@ Dodaje integrację Brasero z Nautilusem.
%prep
%setup -q
+%patch -P 0 -p1
%build
%{__gtkdocize}
diff --git a/gcc14.patch b/gcc14.patch
new file mode 100644
index 0000000..7a4b63d
--- /dev/null
+++ b/gcc14.patch
@@ -0,0 +1,76 @@
+From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001
+From: sid <[email protected]>
+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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/brasero.git/commitdiff/3b7dca4931bd030330cb9b727268c04eb5c9e1cb
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
