summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/libcanberra/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/libcanberra/files')
-rw-r--r--meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch94
-rw-r--r--meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch65
-rw-r--r--meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch65
3 files changed, 0 insertions, 224 deletions
diff --git a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch b/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
deleted file mode 100644
index 89f31f7946..0000000000
--- a/meta-oe/recipes-support/libcanberra/files/0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch
+++ /dev/null
@@ -1,94 +0,0 @@
1From 4a89ddffbb14d747adbe3365ace4db87de52ba39 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Mon, 16 Sep 2013 16:08:28 +0200
4Subject: [PATCH] build gtk- and gtk3-version for canberra_gtk_play
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
10---
11Upstream-Status: Pending
12
13 src/Makefile.am | 25 +++++++++++++++----------
14 1 files changed, 15 insertions(+), 10 deletions(-)
15
16diff --git a/src/Makefile.am b/src/Makefile.am
17index 56ed96d..fc72e1f 100644
18--- a/src/Makefile.am
19+++ b/src/Makefile.am
20@@ -319,9 +319,6 @@ endif
21
22 if HAVE_GTK_ANY
23
24-bin_PROGRAMS += \
25- canberra-gtk-play
26-
27 include_HEADERS += \
28 canberra-gtk.h
29
30@@ -329,6 +326,9 @@ endif
31
32 if HAVE_GTK3
33
34+bin_PROGRAMS += \
35+ canberra-gtk3-play
36+
37 lib_LTLIBRARIES += \
38 libcanberra-gtk3.la
39
40@@ -367,6 +367,9 @@ endif
41
42 if HAVE_GTK
43
44+bin_PROGRAMS += \
45+ canberra-gtk-play
46+
47 lib_LTLIBRARIES += \
48 libcanberra-gtk.la
49
50@@ -399,14 +402,17 @@ endif
51
52 if HAVE_GTK3
53
54-canberra_gtk_play_LDADD = \
55+canberra_gtk3_play_LDADD = \
56 $(GTK3_LIBS) \
57 libcanberra.la \
58 libcanberra-gtk3.la
59-canberra_gtk_play_CFLAGS = \
60+canberra_gtk3_play_CFLAGS = \
61 $(GTK3_CFLAGS)
62
63-else
64+canberra_gtk3_play_SOURCES = \
65+ canberra-gtk-play.c
66+
67+endif
68 if HAVE_GTK
69
70 canberra_gtk_play_LDADD = \
71@@ -416,7 +422,9 @@ canberra_gtk_play_LDADD = \
72 canberra_gtk_play_CFLAGS = \
73 $(GTK_CFLAGS)
74
75-endif
76+canberra_gtk_play_SOURCES = \
77+ canberra-gtk-play.c
78+
79 endif
80
81 if HAVE_GTK_ANY
82@@ -424,9 +432,6 @@ if HAVE_GTK_ANY
83 dist_gsdgtkmodules_DATA = \
84 canberra-gtk-module.desktop
85
86-canberra_gtk_play_SOURCES = \
87- canberra-gtk-play.c
88-
89 EXTRA_DIST += \
90 libcanberra-login-sound.desktop.in \
91 libcanberra-ready-sound.desktop.in \
92--
931.7.6.5
94
diff --git a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch b/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
deleted file mode 100644
index 1e45441ff9..0000000000
--- a/meta-oe/recipes-support/libcanberra/files/0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From c0620e432650e81062c1967cc669829dbd29b310 Mon Sep 17 00:00:00 2001
2From: Michael Meeks <michael.meeks@suse.com>
3Date: Fri, 9 Nov 2012 16:16:40 +0000
4Subject: [PATCH] gtk: Don't assume all GdkDisplays are GdkX11Displays:
5 broadway/wayland
6
7---
8Upstream-Status: Pending
9
10 src/canberra-gtk-module.c | 15 +++++++++++++++
11 src/canberra-gtk.c | 5 +++++
12 2 files changed, 20 insertions(+)
13
14--- a/src/canberra-gtk-module.c
15+++ b/src/canberra-gtk-module.c
16@@ -307,6 +307,11 @@ static gint window_get_desktop(GdkDispla
17 guchar *data = NULL;
18 gint ret = -1;
19
20+#ifdef GDK_IS_X11_DISPLAY
21+ if (!GDK_IS_X11_DISPLAY(d))
22+ return 0;
23+#endif
24+
25 if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
26 gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
27 0, G_MAXLONG, False, XA_CARDINAL, &type_return,
28@@ -335,6 +340,11 @@ static gint display_get_desktop(GdkDispl
29 guchar *data = NULL;
30 gint ret = -1;
31
32+#ifdef GDK_IS_X11_DISPLAY
33+ if (!GDK_IS_X11_DISPLAY(d))
34+ return 0;
35+#endif
36+
37 if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), DefaultRootWindow(GDK_DISPLAY_XDISPLAY(d)),
38 gdk_x11_get_xatom_by_name_for_display(d, "_NET_CURRENT_DESKTOP"),
39 0, G_MAXLONG, False, XA_CARDINAL, &type_return,
40@@ -365,6 +375,11 @@ static gboolean window_is_xembed(GdkDisp
41 gboolean ret = FALSE;
42 Atom xembed;
43
44+#ifdef GDK_IS_X11_DISPLAY
45+ if (!GDK_IS_X11_DISPLAY(d))
46+ return FALSE;
47+#endif
48+
49 /* Gnome Panel applets are XEMBED windows. We need to make sure we
50 * ignore them */
51
52--- a/src/canberra-gtk.c
53+++ b/src/canberra-gtk.c
54@@ -185,6 +185,11 @@ static gint window_get_desktop(GdkDispla
55 guchar *data = NULL;
56 gint ret = -1;
57
58+#ifdef GDK_IS_X11_DISPLAY
59+ if (!GDK_IS_X11_DISPLAY(d))
60+ return 0;
61+#endif
62+
63 if (XGetWindowProperty(GDK_DISPLAY_XDISPLAY(d), GDK_WINDOW_XID(w),
64 gdk_x11_get_xatom_by_name_for_display(d, "_NET_WM_DESKTOP"),
65 0, G_MAXLONG, False, XA_CARDINAL, &type_return,
diff --git a/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch b/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch
deleted file mode 100644
index 57f5486084..0000000000
--- a/meta-oe/recipes-support/libcanberra/files/0001-remove-dropped-templates.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From dfd3ef4caac300f517f8eeb378f0b0f9ba6a9b06 Mon Sep 17 00:00:00 2001
2From: Markus Volk <f_l_k@t-online.de>
3Date: Tue, 15 Aug 2023 15:41:03 +0200
4Subject: [PATCH] remove dropped gtkdoc templates
5
6Signed-off-by: Markus Volk <f_l_k@t-online.de>
7
8Upstream-Status: Pending
9---
10--- a/gtkdoc/gtk-doc.make 2011-08-25 23:20:22.000000000 +0200
11+++ b/gtkdoc/gtk-doc.make 2023-08-15 18:08:02.430729073 +0200
12@@ -33,9 +33,9 @@
13 $(HTML_IMAGES) \
14 $(SETUP_FILES)
15
16-DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
17+DOC_STAMPS=setup-build.stamp scan-build.stamp sgml-build.stamp \
18 html-build.stamp pdf-build.stamp \
19- tmpl.stamp sgml.stamp html.stamp pdf.stamp
20+ sgml.stamp html.stamp pdf.stamp
21
22 SCANOBJ_FILES = \
23 $(DOC_MODULE).args \
24@@ -120,27 +120,12 @@
25 $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
26 @true
27
28-#### templates ####
29-
30-tmpl-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
31- @echo ' DOC Rebuilding template files'
32- @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
33- @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
34- if test -w $(abs_srcdir) ; then \
35- cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
36- fi \
37- fi
38- @touch tmpl-build.stamp
39-
40-tmpl.stamp: tmpl-build.stamp
41- @true
42-
43 $(srcdir)/tmpl/*.sgml:
44 @true
45
46 #### xml ####
47
48-sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
49+sgml-build.stamp: $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
50 @echo ' DOC Building XML'
51 @-chmod -R u+w $(srcdir)
52 @_source_dir='' ; \
53 --- a/gtkdoc/Makefile.am 2009-01-21 21:52:46.000000000 +0100
54+++ b/gtkdoc/Makefile.am 2023-08-15 17:41:59.002498772 +0200
55@@ -31,10 +31,6 @@
56 # e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
57 MKDB_OPTIONS=--sgml-mode --output-format=xml
58
59-# Extra options to supply to gtkdoc-mktmpl
60-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
61-MKTMPL_OPTIONS=
62-
63 # Extra options to supply to gtkdoc-fixref. Not normally needed.
64 # e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
65 FIXXREF_OPTIONS=
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-31 03:24:50 +0000