diff options
author | Markus Volk <f_l_k@t-online.de> | 2022-05-29 14:43:32 +0200 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2022-05-29 06:39:14 -0700 |
commit | 7d56093619d027fba39ada0e0206402ba6f60972 (patch) | |
tree | b357f0e8432f3629fc691d05c687920400c2dfef /meta-gnome | |
parent | 753b2161164ef0d508c5f7c3d3cdb985cd38a269 (diff) | |
download | meta-openembedded-7d56093619d027fba39ada0e0206402ba6f60972.tar.gz |
gnome-disk-utility: fix build for wayland only
libcanberra-gtk3 module isn't buildable for wayland.
Remove its dpendency.
Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-gnome')
2 files changed, 140 insertions, 3 deletions
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 new file mode 100644 index 000000000..675f4635b --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-gnome-disk-utility-remove-libcanberra-dependency.patch | |||
@@ -0,0 +1,135 @@ | |||
1 | From 36cbdd82f21e4ef37da9f05c1c5e770b6cd66df2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Markus Volk <f_l_k@t-online.de> | ||
3 | Date: Sun, 29 May 2022 06:35:26 +0200 | ||
4 | Subject: [PATCH] gnome-disk-utility: remove libcanberra dependency | ||
5 | |||
6 | libcanberra-gtk3 module isn't buildable for wayland. | ||
7 | Remove its dpendency. | ||
8 | |||
9 | Signed-off-by: Markus Volk <f_l_k@t-online.de> | ||
10 | |||
11 | Upstream-Status: Inappropriate | ||
12 | --- | ||
13 | meson.build | 1 - | ||
14 | src/disks/gducreatediskimagedialog.c | 27 ++------------------------- | ||
15 | src/disks/gdurestorediskimagedialog.c | 20 +------------------- | ||
16 | src/disks/meson.build | 1 - | ||
17 | 4 files changed, 3 insertions(+), 46 deletions(-) | ||
18 | |||
19 | diff --git a/meson.build b/meson.build | ||
20 | index 0daf7f82..cba6c74b 100644 | ||
21 | --- a/meson.build | ||
22 | +++ b/meson.build | ||
23 | @@ -72,7 +72,6 @@ dvdread_dep = dependency('dvdread', version: '>= 4.2.0') | ||
24 | gio_unix_dep = dependency('gio-unix-2.0', version: '>= 2.31.0') | ||
25 | gmodule_dep = dependency('gmodule-2.0') | ||
26 | gtk_dep = dependency('gtk+-3.0', version: '>= 3.16.0') | ||
27 | -libcanberra_dep = dependency('libcanberra-gtk3', version: '>= 0.1') | ||
28 | # Keep the version here synchronised with subprojects/libhandy.wrap | ||
29 | libhandy_dep = dependency('libhandy-1', version: '>= 1.5.0', fallback: ['libhandy', 'libhandy_dep']) | ||
30 | liblzma_dep = dependency('liblzma', version: '>= 5.0.5') | ||
31 | diff --git a/src/disks/gducreatediskimagedialog.c b/src/disks/gducreatediskimagedialog.c | ||
32 | index 181b2892..a22004cf 100644 | ||
33 | --- a/src/disks/gducreatediskimagedialog.c | ||
34 | +++ b/src/disks/gducreatediskimagedialog.c | ||
35 | @@ -21,8 +21,6 @@ | ||
36 | #include <sys/ioctl.h> | ||
37 | #include <linux/fs.h> | ||
38 | |||
39 | -#include <canberra-gtk.h> | ||
40 | - | ||
41 | #include "gduapplication.h" | ||
42 | #include "gduwindow.h" | ||
43 | #include "gducreatediskimagedialog.h" | ||
44 | @@ -297,19 +295,7 @@ create_disk_image_populate (DialogData *data) | ||
45 | |||
46 | static void | ||
47 | play_read_error_sound (DialogData *data) | ||
48 | -{ | ||
49 | - const gchar *sound_message; | ||
50 | - | ||
51 | - /* Translators: A descriptive string for the sound played when | ||
52 | - * there's a read error that's being ignored, see | ||
53 | - * CA_PROP_EVENT_DESCRIPTION | ||
54 | - */ | ||
55 | - sound_message = _("Disk image read error"); | ||
56 | - ca_gtk_play_for_widget (GTK_WIDGET (data->window), 0, | ||
57 | - CA_PROP_EVENT_ID, "dialog-warning", | ||
58 | - CA_PROP_EVENT_DESCRIPTION, sound_message, | ||
59 | - NULL); | ||
60 | -} | ||
61 | +{} | ||
62 | |||
63 | /* ---------------------------------------------------------------------------------------------------- */ | ||
64 | |||
65 | @@ -403,16 +389,7 @@ update_job (DialogData *data, | ||
66 | |||
67 | static void | ||
68 | play_complete_sound (DialogData *data) | ||
69 | -{ | ||
70 | - const gchar *sound_message; | ||
71 | - | ||
72 | - /* Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION */ | ||
73 | - sound_message = _("Disk image copying complete"); | ||
74 | - ca_gtk_play_for_widget (GTK_WIDGET (data->window), 0, | ||
75 | - CA_PROP_EVENT_ID, "complete", | ||
76 | - CA_PROP_EVENT_DESCRIPTION, sound_message, | ||
77 | - NULL); | ||
78 | -} | ||
79 | +{} | ||
80 | |||
81 | /* ---------------------------------------------------------------------------------------------------- */ | ||
82 | |||
83 | diff --git a/src/disks/gdurestorediskimagedialog.c b/src/disks/gdurestorediskimagedialog.c | ||
84 | index bccf97e9..e7ec81cb 100644 | ||
85 | --- a/src/disks/gdurestorediskimagedialog.c | ||
86 | +++ b/src/disks/gdurestorediskimagedialog.c | ||
87 | @@ -17,8 +17,6 @@ | ||
88 | #include <sys/ioctl.h> | ||
89 | #include <linux/fs.h> | ||
90 | |||
91 | -#include <canberra-gtk.h> | ||
92 | - | ||
93 | #include "gduapplication.h" | ||
94 | #include "gduwindow.h" | ||
95 | #include "gdurestorediskimagedialog.h" | ||
96 | @@ -606,23 +604,7 @@ update_job (DialogData *data, | ||
97 | |||
98 | static void | ||
99 | play_complete_sound (DialogData *data) | ||
100 | -{ | ||
101 | - const gchar *sound_message; | ||
102 | - | ||
103 | - /* Translators: A descriptive string for the 'complete' sound, see CA_PROP_EVENT_DESCRIPTION */ | ||
104 | - sound_message = _("Disk image copying complete"); | ||
105 | - ca_gtk_play_for_widget (GTK_WIDGET (data->dialog), 0, | ||
106 | - CA_PROP_EVENT_ID, "complete", | ||
107 | - CA_PROP_EVENT_DESCRIPTION, sound_message, | ||
108 | - NULL); | ||
109 | - | ||
110 | - if (data->inhibit_cookie > 0) | ||
111 | - { | ||
112 | - gtk_application_uninhibit (GTK_APPLICATION (gdu_window_get_application (data->window)), | ||
113 | - data->inhibit_cookie); | ||
114 | - data->inhibit_cookie = 0; | ||
115 | - } | ||
116 | -} | ||
117 | +{} | ||
118 | |||
119 | /* ---------------------------------------------------------------------------------------------------- */ | ||
120 | |||
121 | diff --git a/src/disks/meson.build b/src/disks/meson.build | ||
122 | index 35b2f103..6fc367b4 100644 | ||
123 | --- a/src/disks/meson.build | ||
124 | +++ b/src/disks/meson.build | ||
125 | @@ -85,7 +85,6 @@ deps = [ | ||
126 | dvdread_dep, | ||
127 | gio_unix_dep, | ||
128 | gmodule_dep, | ||
129 | - libcanberra_dep, | ||
130 | libgdu_dep, | ||
131 | libhandy_dep, | ||
132 | liblzma_dep, | ||
133 | -- | ||
134 | 2.25.1 | ||
135 | |||
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb index e9724748c..c3789b0c1 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_42.0.bb | |||
@@ -7,7 +7,6 @@ SECTION = "x11/gnome" | |||
7 | DEPENDS = " \ | 7 | DEPENDS = " \ |
8 | gtk+3 \ | 8 | gtk+3 \ |
9 | libdvdread \ | 9 | libdvdread \ |
10 | libcanberra \ | ||
11 | libnotify \ | 10 | libnotify \ |
12 | libsecret \ | 11 | libsecret \ |
13 | libpwquality \ | 12 | libpwquality \ |
@@ -19,13 +18,16 @@ GNOMEBASEBUILDCLASS = "meson" | |||
19 | 18 | ||
20 | inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg | 19 | inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg |
21 | 20 | ||
22 | REQUIRED_DISTRO_FEATURES = "x11 polkit" | 21 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" |
22 | REQUIRED_DISTRO_FEATURES = "polkit" | ||
23 | 23 | ||
24 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" | 24 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)}" |
25 | 25 | ||
26 | # As soon as elogind is of interest this needs rework: meson option is combo | 26 | # As soon as elogind is of interest this needs rework: meson option is combo |
27 | PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" | 27 | PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" |
28 | PACKAGECONFIG[x11] = ",,libcanberra" | ||
28 | 29 | ||
30 | SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" | ||
29 | SRC_URI[archive.sha256sum] = "1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b" | 31 | SRC_URI[archive.sha256sum] = "1b6564454d67426322cb3bfc5a5558653bfc7dfeea2ae0825b1d08629f01090b" |
30 | 32 | ||
31 | EXTRA_OEMESON = "-Dman=false" | 33 | EXTRA_OEMESON = "-Dman=false" |