From patchwork Fri Jan 9 11:48:21 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Volk X-Patchwork-Id: 78332 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 85629D1681B for ; Fri, 9 Jan 2026 11:49:17 +0000 (UTC) Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.8424.1767959354527666812 for ; Fri, 09 Jan 2026 03:49:15 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: t-online.de, ip: 194.25.134.19, mailfrom: f_l_k@t-online.de) Received: from fwd74.aul.t-online.de (fwd74.aul.t-online.de [10.223.144.100]) by mailout06.t-online.de (Postfix) with SMTP id 51AE19EE for ; Fri, 9 Jan 2026 12:49:12 +0100 (CET) Received: from intel-corei7-64.fritz.box ([79.219.239.35]) by fwd74.t-online.de with (TLSv1.3:TLS_AES_256_GCM_SHA384 encrypted) esmtp id 1veAzP-243q9R0; Fri, 9 Jan 2026 12:49:11 +0100 From: Markus Volk To: openembedded-devel@lists.openembedded.org Subject: [meta-gnome][PATCHv2] gnome-disk-utility: remove outdated patch Date: Fri, 9 Jan 2026 12:48:21 +0100 Message-ID: <20260109114821.95446-1-f_l_k@t-online.de> X-Mailer: git-send-email 2.52.0 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1767959351-4EFFA85C-983E1F15/0/0 CLEAN NORMAL X-TOI-MSGID: 1429d344-fc04-4643-a962-613c339c68c4 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 09 Jan 2026 11:49:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/123296 Dont remove libcanberra dependency. Meanwhile it can be built without pulling in gtk2 Signed-off-by: Markus Volk --- ...tility-remove-libcanberra-dependency.patch | 135 ------------------ .../gnome-disk-utility_46.1.bb | 7 +- 2 files changed, 3 insertions(+), 139 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch deleted file mode 100644 index 675f4635ba..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch +++ /dev/null @@ -1,135 +0,0 @@ -From 36cbdd82f21e4ef37da9f05c1c5e770b6cd66df2 Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Sun, 29 May 2022 06:35:26 +0200 -Subject: [PATCH] gnome-disk-utility: remove libcanberra dependency - -libcanberra-gtk3 module isn't buildable for wayland. -Remove its dpendency. - -Signed-off-by: Markus Volk - -Upstream-Status: Inappropriate ---- - meson.build | 1 - - src/disks/gducreatediskimagedialog.c | 27 ++------------------------- - src/disks/gdurestorediskimagedialog.c | 20 +------------------- - src/disks/meson.build | 1 - - 4 files changed, 3 insertions(+), 46 deletions(-) - -diff --git a/meson.build b/meson.build -index 0daf7f82..cba6c74b 100644 ---- a/meson.build -+++ b/meson.build -@@ -72,7 +72,6 @@ dvdread_dep = dependency('dvdread', version: '>= 4.2.0') - gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.31.0') - gmodule_dep = dependency('gmodule-2.0') - gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0') --libcanberra_dep = dependency('libcanberra-gtk3', version: '>= 0.1') - # Keep the version here synchronised with subprojects/libhandy.wrap - libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0', fallback: ['libhandy', 'libhandy_dep']) - liblzma_dep = dependency('liblzma', version: '>= 5.0.5') -diff --git a/src/disks/gducreatediskimagedialog.c b/src/disks/gducreatediskimagedialog.c -index 181b2892..a22004cf 100644 ---- a/src/disks/gducreatediskimagedialog.c -+++ b/src/disks/gducreatediskimagedialog.c -@@ -21,8 +21,6 @@ - #include - #include - --#include -- - #include "gduapplication.h" - #include "gduwindow.h" - #include "gducreatediskimagedialog.h" -@@ -297,19 +295,7 @@ create_disk_image_populate (DialogData *data) - - static void - play_read_error_sound (DialogData *data) --{ -- const gchar *sound_message; -- -- /* Translators: A descriptive string for the sound played when -- * there's a read error that's being ignored, see -- * CA_PROP_EVENT_DESCRIPTION -- */ -- sound_message = _("Disk image read error"); -- ca_gtk_play_for_widget (GTK_WIDGET (data->window), 0, -- CA_PROP_EVENT_ID, "dialog-warning", -- CA_PROP_EVENT_DESCRIPTION, sound_message, -- NULL); --} -+{} - - /* ---------------------------------------------------------------------------------------------------- */ - -@@ -403,16 +389,7 @@ update_job (DialogData *data, - - static void - play_complete_sound (DialogData *data) --{ -- const gchar *sound_message; -- -- /* Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION */ -- sound_message = _("Disk image copying complete"); -- ca_gtk_play_for_widget (GTK_WIDGET (data->window), 0, -- CA_PROP_EVENT_ID, "complete", -- CA_PROP_EVENT_DESCRIPTION, sound_message, -- NULL); --} -+{} - - /* ---------------------------------------------------------------------------------------------------- */ - -diff --git a/src/disks/gdurestorediskimagedialog.c b/src/disks/gdurestorediskimagedialog.c -index bccf97e9..e7ec81cb 100644 ---- a/src/disks/gdurestorediskimagedialog.c -+++ b/src/disks/gdurestorediskimagedialog.c -@@ -17,8 +17,6 @@ - #include - #include - --#include -- - #include "gduapplication.h" - #include "gduwindow.h" - #include "gdurestorediskimagedialog.h" -@@ -606,23 +604,7 @@ update_job (DialogData *data, - - static void - play_complete_sound (DialogData *data) --{ -- const gchar *sound_message; -- -- /* Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION */ -- sound_message = _("Disk image copying complete"); -- ca_gtk_play_for_widget (GTK_WIDGET (data->dialog), 0, -- CA_PROP_EVENT_ID, "complete", -- CA_PROP_EVENT_DESCRIPTION, sound_message, -- NULL); -- -- if (data->inhibit_cookie > 0) -- { -- gtk_application_uninhibit (GTK_APPLICATION (gdu_window_get_application (data->window)), -- data->inhibit_cookie); -- data->inhibit_cookie = 0; -- } --} -+{} - - /* ---------------------------------------------------------------------------------------------------- */ - -diff --git a/src/disks/meson.build b/src/disks/meson.build -index 35b2f103..6fc367b4 100644 ---- a/src/disks/meson.build -+++ b/src/disks/meson.build -@@ -85,7 +85,6 @@ deps = [ - dvdread_dep, - gio_unix_dep, - gmodule_dep, -- libcanberra_dep, - libgdu_dep, - libhandy_dep, - liblzma_dep, --- -2.25.1 - diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb index 6f910c4c13..08854befa8 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb @@ -2,11 +2,12 @@ SUMMARY = "GNOME disk utility" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SECTION = "x11/gnome" +SECTION = "gnome" DEPENDS = " \ desktop-file-utils-native \ gtk+3 \ + libcanberra \ libdvdread \ libnotify \ libsecret \ @@ -22,13 +23,11 @@ inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "polkit" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}" +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" # As soon as elogind is of interest this needs rework: meson option is combo PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" -PACKAGECONFIG[x11] = ",,libcanberra" -SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" SRC_URI[archive.sha256sum] = "c24e9439a04d70bcfae349ca134c7005435fe2b6f452114df878bff0b89bbffe" EXTRA_OEMESON = "-Dman=false"