summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-12 14:21:45 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 13:18:06 +0100
commit5072340621f7c4ab1c0482a0e0b6a8bbfc99f443 (patch)
tree7335745a4e1ad5092ba838c5b73cb091928a6f35
parentbef801045c3ddb36504e7f20b7acd6165a62bb55 (diff)
downloadpoky-5072340621f7c4ab1c0482a0e0b6a8bbfc99f443.tar.gz
libunique: Update to work with glib-2.0
(From OE-Core rev: bcc9ad43c6aa7f8cd91031850fc72d121b64cb9e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat
-rw-r--r--meta/recipes-gnome/libunique/libunique/noconst.patch130
-rw-r--r--meta/recipes-gnome/libunique/libunique_1.1.6.bb5
2 files changed, 133 insertions, 2 deletions
diff --git a/meta/recipes-gnome/libunique/libunique/noconst.patch b/meta/recipes-gnome/libunique/libunique/noconst.patch
new file mode 100644
index 0000000000..2cc03473c5
--- /dev/null
+++ b/meta/recipes-gnome/libunique/libunique/noconst.patch
@@ -0,0 +1,130 @@
1G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid
2build failures.
3
4RP 2011/10/12
5
6Upstream-Status: Pending
7
8Index: libunique-1.1.6/unique/uniqueapp.c
9===================================================================
10--- libunique-1.1.6.orig/unique/uniqueapp.c 2011-10-12 01:21:25.842046488 +0100
11+++ libunique-1.1.6/unique/uniqueapp.c 2011-10-12 01:21:55.062046796 +0100
12@@ -781,7 +781,7 @@
13 }
14
15
16-G_CONST_RETURN gchar *
17+const gchar *
18 unique_command_to_string (UniqueApp *app,
19 gint command)
20 {
21@@ -863,7 +863,7 @@
22 return retval;
23 }
24
25-G_CONST_RETURN gchar *
26+const gchar *
27 unique_response_to_string (UniqueResponse response)
28 {
29 GEnumClass *enum_class;
30Index: libunique-1.1.6/unique/uniquebackend.c
31===================================================================
32--- libunique-1.1.6.orig/unique/uniquebackend.c 2011-10-12 01:21:25.742046323 +0100
33+++ libunique-1.1.6/unique/uniquebackend.c 2011-10-12 01:21:55.062046796 +0100
34@@ -111,7 +111,7 @@
35 *
36 * Return value: FIXME
37 */
38-G_CONST_RETURN gchar *
39+const gchar *
40 unique_backend_get_name (UniqueBackend *backend)
41 {
42 g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
43@@ -154,7 +154,7 @@
44 *
45 * Return value: FIXME
46 */
47-G_CONST_RETURN gchar *
48+const gchar *
49 unique_backend_get_startup_id (UniqueBackend *backend)
50 {
51 g_return_val_if_fail (UNIQUE_IS_BACKEND (backend), NULL);
52Index: libunique-1.1.6/unique/uniquebackend.h
53===================================================================
54--- libunique-1.1.6.orig/unique/uniquebackend.h 2011-10-12 01:21:25.992046521 +0100
55+++ libunique-1.1.6/unique/uniquebackend.h 2011-10-12 01:21:56.512047875 +0100
56@@ -94,10 +94,10 @@
57
58 UniqueBackend * unique_backend_create (void);
59
60-G_CONST_RETURN gchar *unique_backend_get_name (UniqueBackend *backend);
61+const gchar *unique_backend_get_name (UniqueBackend *backend);
62 void unique_backend_set_name (UniqueBackend *backend,
63 const gchar *name);
64-G_CONST_RETURN gchar *unique_backend_get_startup_id (UniqueBackend *backend);
65+const gchar *unique_backend_get_startup_id (UniqueBackend *backend);
66 void unique_backend_set_startup_id (UniqueBackend *backend,
67 const gchar *startup_id);
68 GdkScreen * unique_backend_get_screen (UniqueBackend *backend);
69Index: libunique-1.1.6/unique/uniqueinternals.h
70===================================================================
71--- libunique-1.1.6.orig/unique/uniqueinternals.h 2011-10-12 01:21:25.892046532 +0100
72+++ libunique-1.1.6/unique/uniqueinternals.h 2011-10-12 01:21:56.512047875 +0100
73@@ -44,11 +44,11 @@
74 * and then back into an id
75 */
76 UniqueResponse unique_response_from_string (const gchar *response);
77-G_CONST_RETURN gchar *unique_response_to_string (UniqueResponse response);
78+const gchar *unique_response_to_string (UniqueResponse response);
79
80 gint unique_command_from_string (UniqueApp *app,
81 const gchar *command);
82-G_CONST_RETURN gchar *unique_command_to_string (UniqueApp *app,
83+const gchar *unique_command_to_string (UniqueApp *app,
84 gint command);
85
86 G_END_DECLS
87Index: libunique-1.1.6/unique/uniquemessage.c
88===================================================================
89--- libunique-1.1.6.orig/unique/uniquemessage.c 2011-10-12 01:21:25.942046524 +0100
90+++ libunique-1.1.6/unique/uniquemessage.c 2011-10-12 01:21:55.072046595 +0100
91@@ -185,7 +185,7 @@
92 *
93 * Since: 1.0.2
94 */
95-G_CONST_RETURN guchar *
96+const guchar *
97 unique_message_data_get (UniqueMessageData *message_data,
98 gsize *length)
99 {
100@@ -525,7 +525,7 @@
101 * owned by the #UniqueMessageData structure and should not be
102 * modified or freed
103 */
104-G_CONST_RETURN gchar *
105+const gchar *
106 unique_message_data_get_startup_id (UniqueMessageData *message_data)
107 {
108 g_return_val_if_fail (message_data != NULL, NULL);
109Index: libunique-1.1.6/unique/uniquemessage.h
110===================================================================
111--- libunique-1.1.6.orig/unique/uniquemessage.h 2011-10-12 01:21:25.792046596 +0100
112+++ libunique-1.1.6/unique/uniquemessage.h 2011-10-12 01:21:56.512047875 +0100
113@@ -48,7 +48,7 @@
114 void unique_message_data_set (UniqueMessageData *message_data,
115 const guchar *data,
116 gsize length);
117-G_CONST_RETURN guchar *unique_message_data_get (UniqueMessageData *message_data,
118+const guchar *unique_message_data_get (UniqueMessageData *message_data,
119 gsize *length);
120
121 gboolean unique_message_data_set_text (UniqueMessageData *message_data,
122@@ -63,7 +63,7 @@
123 gchar * unique_message_data_get_filename (UniqueMessageData *message_data);
124
125 GdkScreen * unique_message_data_get_screen (UniqueMessageData *message_data);
126-G_CONST_RETURN gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
127+const gchar * unique_message_data_get_startup_id (UniqueMessageData *message_data);
128 guint unique_message_data_get_workspace (UniqueMessageData *message_data);
129
130 G_END_DECLS
diff --git a/meta/recipes-gnome/libunique/libunique_1.1.6.bb b/meta/recipes-gnome/libunique/libunique_1.1.6.bb
index 4f3cdb6086..9435e9787c 100644
--- a/meta/recipes-gnome/libunique/libunique_1.1.6.bb
+++ b/meta/recipes-gnome/libunique/libunique_1.1.6.bb
@@ -3,12 +3,13 @@ HOMEPAGE = "http://live.gnome.org/LibUnique"
3BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique" 3BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=libunique"
4 4
5SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \ 5SRC_URI = "${GNOME_MIRROR}/libunique/1.1/libunique-${PV}.tar.bz2 \
6 file://fix_for_compile_with_gcc-4.6.0.patch" 6 file://fix_for_compile_with_gcc-4.6.0.patch \
7 file://noconst.patch"
7 8
8SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d" 9SRC_URI[md5sum] = "7955769ef31f1bc4f83446dbb3625e6d"
9SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb" 10SRC_URI[sha256sum] = "e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
10 11
11PR = "r3" 12PR = "r4"
12 13
13DEPENDS = "glib-2.0 gtk+ dbus" 14DEPENDS = "glib-2.0 gtk+ dbus"
14 15
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 18:26:18 +0000