From 4a68bfbdf9645e2ce0a3606cbae4b26937c3cea6 Mon Sep 17 00:00:00 2001 From: Ondrej Holy Date: Fri, 28 Jun 2024 13:42:55 +0200 Subject: [PATCH] Update to 1.54.2 Resolves: RHEL-45604 --- gvfs.spec | 11 +- sources | 2 +- ...reate-cdda-volumes-when-backend-is-d.patch | 118 ------------------ 3 files changed, 6 insertions(+), 125 deletions(-) delete mode 100644 udisks2-Do-not-create-cdda-volumes-when-backend-is-d.patch diff --git a/gvfs.spec b/gvfs.spec index 0f1b118..53b4bb3 100644 --- a/gvfs.spec +++ b/gvfs.spec @@ -21,8 +21,8 @@ %global udisks2_version 1.97 Name: gvfs -Version: 1.54.1 -Release: 3%{?dist} +Version: 1.54.2 +Release: 1%{?dist} Summary: Backends for the gio framework in GLib License: LGPL-2.0-or-later AND GPL-3.0-only AND MPL-2.0 AND BSD-3-Clause-Sun @@ -30,8 +30,6 @@ License: LGPL-2.0-or-later AND GPL-3.0-only AND MPL-2.0 AND BSD-3-Clause-Sun URL: https://wiki.gnome.org/Projects/gvfs Source0: https://download.gnome.org/sources/gvfs/1.54/gvfs-%{version}.tar.xz -Patch: udisks2-Do-not-create-cdda-volumes-when-backend-is-d.patch - BuildRequires: meson BuildRequires: gcc BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -306,7 +304,6 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/gvfs/mounts/dav+sd.mount %{_datadir}/gvfs/mounts/http.mount %{_datadir}/gvfs/mounts/localtest.mount -%{_datadir}/gvfs/mounts/burn.mount %{_datadir}/gvfs/mounts/dns-sd.mount %{_datadir}/gvfs/mounts/network.mount %{_datadir}/gvfs/mounts/ftp.mount @@ -336,7 +333,6 @@ killall -USR1 gvfsd >&/dev/null || : %{_libexecdir}/gvfsd-dav %{_libexecdir}/gvfsd-http %{_libexecdir}/gvfsd-localtest -%{_libexecdir}/gvfsd-burn %{_libexecdir}/gvfsd-dnssd %{_libexecdir}/gvfsd-network %{_libexecdir}/gvfsd-metadata @@ -447,6 +443,9 @@ killall -USR1 gvfsd >&/dev/null || : %{_datadir}/installed-tests %changelog +* Fri Jun 28 2024 Ondrej Holy - 1.54.2-1 +- Update to 1.54.2 + * Mon Jun 24 2024 Troy Dawson - 1.54.1-3 - Bump release for June 2024 mass rebuild diff --git a/sources b/sources index 7d64602..4a2b60e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gvfs-1.54.1.tar.xz) = aa0b99958fad724d9447250cb67f27fa41f18849797e79e18086a6f5b336aae1e4d266aae8dcc93da88ea5cd401ade0bb5cc38f311fe7bb089496300d2dc3916 +SHA512 (gvfs-1.54.2.tar.xz) = a9a1bd599c4ad68ceee633147c4e0b04ef4db3377ff2c0c136d08ce9a3377940bf8aa4d533f38f8c2a0131c82266e6eb2efe6cef88ffe5ead3844fc76e25a072 diff --git a/udisks2-Do-not-create-cdda-volumes-when-backend-is-d.patch b/udisks2-Do-not-create-cdda-volumes-when-backend-is-d.patch deleted file mode 100644 index 1db777b..0000000 --- a/udisks2-Do-not-create-cdda-volumes-when-backend-is-d.patch +++ /dev/null @@ -1,118 +0,0 @@ -From cf4a82c388e97230219fc99620e504c86f479ef2 Mon Sep 17 00:00:00 2001 -From: Ondrej Holy -Date: Tue, 28 May 2024 10:19:14 +0200 -Subject: [PATCH] udisks2: Do not create cdda volumes when backend is disabled - -Currently, the udisks2 volume monitor creates volumes for audio CDs -regardless of the fact the cdda backend is disabled using the -`-Dcdda=false` build option and thus there is no way to mount them. -Let's ignore audio CDs in this case instead. - -Related: https://issues.redhat.com/browse/RHEL-38130 ---- - meson.build | 2 ++ - monitor/udisks2/gvfsudisks2volume.c | 2 ++ - monitor/udisks2/gvfsudisks2volumemonitor.c | 31 ++++++++++++++++++---- - 3 files changed, 30 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index 4bb9ca3e..a7d15201 100644 ---- a/meson.build -+++ b/meson.build -@@ -416,6 +416,8 @@ if enable_cdda - - libcdio_paranoia_dep = dependency('libcdio_paranoia', version: '>= 0.78.2') - config_h.set('HAVE_PARANOIA_NEW_INCLUDES', cc.has_header('cdio/paranoia/paranoia.h', dependencies: libcdio_paranoia_dep)) -+ -+ config_h.set('HAVE_CDDA', enable_cdda) - endif - - # *** Check if we should build with Google backend *** -diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c -index 30078846..9af6c3da 100644 ---- a/monitor/udisks2/gvfsudisks2volume.c -+++ b/monitor/udisks2/gvfsudisks2volume.c -@@ -386,11 +386,13 @@ update_volume (GVfsUDisks2Volume *volume) - g_free (volume->name); - volume->name = g_strdup (media_desc); - } -+#ifdef HAVE_CDDA - else if (volume->activation_root != NULL && g_file_has_uri_scheme (volume->activation_root, "cdda")) - { - g_free (volume->name); - volume->name = g_strdup (_("Audio Disc")); - } -+#endif - - volume->icon = media_icon != NULL ? g_object_ref (media_icon) : NULL; - volume->symbolic_icon = media_symbolic_icon != NULL ? g_object_ref (media_symbolic_icon) : NULL; -diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c -index 618f35b7..e6fe2944 100644 ---- a/monitor/udisks2/gvfsudisks2volumemonitor.c -+++ b/monitor/udisks2/gvfsudisks2volumemonitor.c -@@ -973,6 +973,25 @@ should_include_drive (GVfsUDisks2VolumeMonitor *monitor, - return ret; - } - -+static gboolean -+should_include_disc (GVfsUDisks2VolumeMonitor *monitor, -+ UDisksDrive *drive) -+{ -+ gboolean ret = FALSE; -+ -+ /* only consider blank and audio discs */ -+ -+ if (udisks_drive_get_optical_blank (drive)) -+ ret = TRUE; -+ -+#ifdef HAVE_CDDA -+ if (udisks_drive_get_optical_num_audio_tracks (drive) > 0) -+ ret = TRUE; -+#endif -+ -+ return ret; -+} -+ - /* ---------------------------------------------------------------------------------------------------- */ - - static gint -@@ -1830,9 +1849,7 @@ update_discs (GVfsUDisks2VolumeMonitor *monitor, - if (!should_include_drive (monitor, udisks_drive)) - continue; - -- /* only consider blank and audio discs */ -- if (!(udisks_drive_get_optical_blank (udisks_drive) || -- udisks_drive_get_optical_num_audio_tracks (udisks_drive) > 0)) -+ if (!should_include_disc (monitor, udisks_drive)) - continue; - - block = udisks_client_get_block_for_drive (monitor->client, udisks_drive, FALSE); -@@ -1881,19 +1898,23 @@ update_discs (GVfsUDisks2VolumeMonitor *monitor, - udisks_drive = udisks_client_get_drive_for_block (monitor->client, block); - if (udisks_drive != NULL) - { -- gchar *uri; -+ gchar *uri = NULL; - GFile *activation_root; - - if (udisks_drive_get_optical_blank (udisks_drive)) - { - uri = g_strdup ("burn://"); - } -- else -+ -+#ifdef HAVE_CDDA -+ if (udisks_drive_get_optical_num_audio_tracks (udisks_drive) > 0) - { - gchar *basename = g_path_get_basename (udisks_block_get_device (block)); - uri = g_strdup_printf ("cdda://%s", basename); - g_free (basename); - } -+#endif -+ - activation_root = g_file_new_for_uri (uri); - volume = gvfs_udisks2_volume_new (monitor, - block, --- -2.45.1 -