xfce-base: add patches for newer glib compat

diff --git a/recipes/xfce-base/exo/glib_compat.patch b/recipes/xfce-base/exo/glib_compat.patch
new file mode 100644 (file)
index 0000000..1cfe376
--- /dev/null
+++ b/recipes/xfce-base/exo/glib_compat.patch
@@ -0,0 +1,112 @@
+Only in exo-0.3.107: cscope.out
+diff -urp exo-0.3.107_/exo/exo-string.c exo-0.3.107/exo/exo-string.c
+--- exo-0.3.107_/exo/exo-string.c      2014-10-08 01:23:41.483963780 +0300
++++ exo-0.3.107/exo/exo-string.c       2014-10-08 01:24:12.305976193 +0300
+@@ -403,7 +403,7 @@ exo_strndupv (gchar **strv,
+  *
+  * Since: 0.3.1.1
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ exo_intern_string (const gchar *string)
+ {
+ #if GLIB_CHECK_VERSION(2,9,0)
+@@ -428,7 +428,7 @@ exo_intern_string (const gchar *string)
+  *
+  * Since: 0.3.1.1
+  */
+-G_CONST_RETURN gchar*
++const gchar*
+ exo_intern_static_string (const gchar *string)
+ {
+ #if GLIB_CHECK_VERSION(2,9,0)
+diff -urp exo-0.3.107_/exo/exo-string.h exo-0.3.107/exo/exo-string.h
+--- exo-0.3.107_/exo/exo-string.h      2014-10-08 01:23:41.483963780 +0300
++++ exo-0.3.107/exo/exo-string.h       2014-10-08 01:24:26.953031676 +0300
+@@ -46,8 +46,8 @@ gchar                *exo_strdup_strftim
+ gchar               **exo_strndupv               (gchar          **strv,
+                                                   gint             num) G_GNUC_MALLOC G_GNUC_WARN_UNUSED_RESULT;
+ 
+-G_CONST_RETURN gchar *exo_intern_string          (const gchar     *string);
+-G_CONST_RETURN gchar *exo_intern_static_string   (const gchar     *string);
++const gchar *exo_intern_string          (const gchar     *string);
++const gchar *exo_intern_static_string   (const gchar     *string);
+ 
+ #if GLIB_CHECK_VERSION(2,9,0)
+ #define I_(string) (g_intern_static_string ((string)))
+diff -urp exo-0.3.107_/exo-support/xfce-heading.c exo-0.3.107/exo-support/xfce-heading.c
+--- exo-0.3.107_/exo-support/xfce-heading.c    2014-10-08 01:23:41.475964296 +0300
++++ exo-0.3.107/exo-support/xfce-heading.c     2014-10-08 01:24:04.078507118 +0300
+@@ -609,7 +609,7 @@ xfce_heading_set_icon (XfceHeading *head
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_heading_get_icon_name (XfceHeading *heading)
+ {
+   g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL);
+@@ -662,7 +662,7 @@ xfce_heading_set_icon_name (XfceHeading
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_heading_get_subtitle (XfceHeading *heading)
+ {
+   g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL);
+@@ -713,7 +713,7 @@ xfce_heading_set_subtitle (XfceHeading *
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_heading_get_title (XfceHeading *heading)
+ {
+   g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL);
+diff -urp exo-0.3.107_/exo-support/xfce-heading.h exo-0.3.107/exo-support/xfce-heading.h
+--- exo-0.3.107_/exo-support/xfce-heading.h    2014-10-08 01:23:41.479964038 +0300
++++ exo-0.3.107/exo-support/xfce-heading.h     2014-10-08 01:24:16.909679613 +0300
+@@ -65,15 +65,15 @@ GdkPixbuf            *xfce_heading_get_i
+ void                  xfce_heading_set_icon      (XfceHeading *heading,
+                                                   GdkPixbuf   *icon);
+ 
+-G_CONST_RETURN gchar *xfce_heading_get_icon_name (XfceHeading *heading);
++const gchar *xfce_heading_get_icon_name (XfceHeading *heading);
+ void                  xfce_heading_set_icon_name (XfceHeading *heading,
+                                                   const gchar *icon_name);
+ 
+-G_CONST_RETURN gchar *xfce_heading_get_subtitle  (XfceHeading *heading);
++const gchar *xfce_heading_get_subtitle  (XfceHeading *heading);
+ void                  xfce_heading_set_subtitle  (XfceHeading *heading,
+                                                   const gchar *subtitle);
+ 
+-G_CONST_RETURN gchar *xfce_heading_get_title     (XfceHeading *heading);
++const gchar *xfce_heading_get_title     (XfceHeading *heading);
+ void                  xfce_heading_set_title     (XfceHeading *heading,
+                                                   const gchar *title);
+ 
+diff -urp exo-0.3.107_/exo-support/xfce-titled-dialog.c exo-0.3.107/exo-support/xfce-titled-dialog.c
+--- exo-0.3.107_/exo-support/xfce-titled-dialog.c      2014-10-08 01:23:41.479964038 +0300
++++ exo-0.3.107/exo-support/xfce-titled-dialog.c       2014-10-08 01:24:08.102247256 +0300
+@@ -328,7 +328,7 @@ xfce_titled_dialog_new_with_buttons (con
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog)
+ {
+   g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (titled_dialog), NULL);
+diff -urp exo-0.3.107_/exo-support/xfce-titled-dialog.h exo-0.3.107/exo-support/xfce-titled-dialog.h
+--- exo-0.3.107_/exo-support/xfce-titled-dialog.h      2014-10-08 01:23:41.479964038 +0300
++++ exo-0.3.107/exo-support/xfce-titled-dialog.h       2014-10-08 01:24:21.777365520 +0300
+@@ -66,7 +66,7 @@ GtkWidget            *xfce_titled_dialog
+                                                            const gchar      *first_button_text,
+                                                            ...) G_GNUC_MALLOC;
+ 
+-G_CONST_RETURN gchar *xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
++const gchar *xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
+ void                  xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
+                                                            const gchar      *subtitle);
+ 

diff --git a/recipes/xfce-base/exo_0.3.107.bb b/recipes/xfce-base/exo_0.3.107.bb
index 946f490..020c0f5 100644 (file)
--- a/recipes/xfce-base/exo_0.3.107.bb
+++ b/recipes/xfce-base/exo_0.3.107.bb
@@ -10,6 +10,7 @@ XFCE_VERSION = "4.6.2"
 SRC_URI += " \
     file://exo-no-tests.patch;patch=1 \
     file://configure.patch;patch=1 \
+    file://glib_compat.patch;patch=1 \
 "
 
 # Note: Python checking is broken

diff --git a/recipes/xfce-base/libxfce4util/glib_compat.patch b/recipes/xfce-base/libxfce4util/glib_compat.patch
new file mode 100644 (file)
index 0000000..58472b3
--- /dev/null
+++ b/recipes/xfce-base/libxfce4util/glib_compat.patch
@@ -0,0 +1,48 @@
+diff -urp libxfce4util-4.6.2_/libxfce4util/xfce-desktopentry.c libxfce4util-4.6.2/libxfce4util/xfce-desktopentry.c
+--- libxfce4util-4.6.2_/libxfce4util/xfce-desktopentry.c       2014-10-08 00:55:23.097484024 +0300
++++ libxfce4util-4.6.2/libxfce4util/xfce-desktopentry.c        2014-10-08 00:56:41.272442945 +0300
+@@ -472,7 +472,7 @@ xfce_desktop_entry_new_from_data (const
+  *               by the caller.
+  * Since: 4.2
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_desktop_entry_get_file (XfceDesktopEntry *desktop_entry)
+ {
+     g_return_val_if_fail (XFCE_IS_DESKTOP_ENTRY (desktop_entry), NULL);
+diff -urp libxfce4util-4.6.2_/libxfce4util/xfce-desktopentry.h libxfce4util-4.6.2/libxfce4util/xfce-desktopentry.h
+--- libxfce4util-4.6.2_/libxfce4util/xfce-desktopentry.h       2014-10-08 00:55:23.097484024 +0300
++++ libxfce4util-4.6.2/libxfce4util/xfce-desktopentry.h        2014-10-08 00:56:33.072971645 +0300
+@@ -68,7 +68,7 @@ XfceDesktopEntry      *xfce_desktop_entr
+                                                                  const gchar     **categories,
+                                                                  gint              num_categories) G_GNUC_MALLOC;
+ 
+-G_CONST_RETURN gchar  *xfce_desktop_entry_get_file              (XfceDesktopEntry *desktop_entry);
++const gchar  *xfce_desktop_entry_get_file              (XfceDesktopEntry *desktop_entry);
+ 
+ gboolean               xfce_desktop_entry_get_int               (XfceDesktopEntry *desktop_entry,
+                                                                  const gchar      *key,
+diff -urp libxfce4util-4.6.2_/libxfce4util/xfce-i18n.c libxfce4util-4.6.2/libxfce4util/xfce-i18n.c
+--- libxfce4util-4.6.2_/libxfce4util/xfce-i18n.c       2014-10-08 00:55:23.097484024 +0300
++++ libxfce4util-4.6.2/libxfce4util/xfce-i18n.c        2014-10-08 00:56:47.396048058 +0300
+@@ -182,7 +182,7 @@ xfce_textdomain (const gchar *package,
+  *
+  * Deprecated:4.4: Use g_strip_context() instead.
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_strip_context (const gchar *msgid,
+                     const gchar *msgval)
+ {
+diff -urp libxfce4util-4.6.2_/libxfce4util/xfce-i18n.h libxfce4util-4.6.2/libxfce4util/xfce-i18n.h
+--- libxfce4util-4.6.2_/libxfce4util/xfce-i18n.h       2014-10-08 00:55:23.089484517 +0300
++++ libxfce4util-4.6.2/libxfce4util/xfce-i18n.h        2014-10-08 00:56:44.180255414 +0300
+@@ -70,7 +70,7 @@ void                  xfce_textdomain
+                                                  const gchar *encoding);
+ 
+ #if !defined(XFCE_DISABLE_DEPRECATED)
+-G_CONST_RETURN gchar* xfce_strip_context        (const gchar *msgid,
++const gchar* xfce_strip_context        (const gchar *msgid,
+                                                  const gchar *msgval);
+ #endif
+ 

diff --git a/recipes/xfce-base/libxfce4util_4.6.2.bb b/recipes/xfce-base/libxfce4util_4.6.2.bb
index dc1e184..23baa04 100644 (file)
--- a/recipes/xfce-base/libxfce4util_4.6.2.bb
+++ b/recipes/xfce-base/libxfce4util_4.6.2.bb
@@ -8,6 +8,8 @@ PR = "r1"
 
 inherit xfce46
 
+SRC_URI += " file://glib_compat.patch;patch=1"
+
 EXTRA_OECONF += "--disable-dependency-tracking --disable-static --with-broken-putenv=yes"
 
 MACROS="m4/X11.m4 m4/debug.m4 m4/depends.m4 m4/i18n.m4"

diff --git a/recipes/xfce-base/libxfcegui4/glib_compat.patch b/recipes/xfce-base/libxfcegui4/glib_compat.patch
new file mode 100644 (file)
index 0000000..922877e
--- /dev/null
+++ b/recipes/xfce-base/libxfcegui4/glib_compat.patch
@@ -0,0 +1,203 @@
+Only in libxfcegui4-4.6.4: cscope.out
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/session-client.c libxfcegui4-4.6.4/libxfcegui4/session-client.c
+--- libxfcegui4-4.6.4_/libxfcegui4/session-client.c    2014-10-08 01:09:39.050288062 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/session-client.c     2014-10-08 01:10:24.051386133 +0300
+@@ -1118,27 +1118,27 @@ gchar const* client_session_get_program(
+     return session_client->program;
+ }
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_clone_command(SessionClient * session_client)
++const gchar* const * client_session_get_clone_command(SessionClient * session_client)
+ {
+     return (const gchar * const *) session_client->clone_command;
+ }
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_resign_command(SessionClient * session_client)
++const gchar* const * client_session_get_resign_command(SessionClient * session_client)
+ {
+     return (const gchar * const *) session_client->resign_command;
+ }
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_restart_command(SessionClient * session_client)
++const gchar* const * client_session_get_restart_command(SessionClient * session_client)
+ {
+     return (const gchar * const *) session_client->restart_command;
+ }
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_discard_command(SessionClient * session_client)
++const gchar* const * client_session_get_discard_command(SessionClient * session_client)
+ {
+     return (const gchar * const *) session_client->discard_command;
+ }
+ 
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_shutdown_command(SessionClient * session_client)
++const gchar* const * client_session_get_shutdown_command(SessionClient * session_client)
+ {
+     return (const gchar * const *) session_client->shutdown_command;
+ }
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/session-client.h libxfcegui4-4.6.4/libxfcegui4/session-client.h
+--- libxfcegui4-4.6.4_/libxfcegui4/session-client.h    2014-10-08 01:09:39.054287810 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/session-client.h     2014-10-08 01:10:34.302725115 +0300
+@@ -157,9 +157,9 @@ gchar const* client_session_get_client_i
+ gchar const* client_session_get_given_client_id(SessionClient * session_client);
+ gchar const* client_session_get_current_directory(SessionClient * session_client);
+ gchar const* client_session_get_program(SessionClient * session_client);
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_clone_command(SessionClient * session_client);
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_resign_command(SessionClient * session_client);
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_restart_command(SessionClient * session_client);
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_discard_command(SessionClient * session_client);
+-G_CONST_RETURN gchar* G_CONST_RETURN * client_session_get_shutdown_command(SessionClient * session_client);
++const gchar* const * client_session_get_clone_command(SessionClient * session_client);
++const gchar* const * client_session_get_resign_command(SessionClient * session_client);
++const gchar* const * client_session_get_restart_command(SessionClient * session_client);
++const gchar* const * client_session_get_discard_command(SessionClient * session_client);
++const gchar* const * client_session_get_shutdown_command(SessionClient * session_client);
+ #endif
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-appmenuitem.c libxfcegui4-4.6.4/libxfcegui4/xfce-appmenuitem.c
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-appmenuitem.c  2014-10-08 01:09:39.054287810 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-appmenuitem.c   2014-10-08 01:10:42.186216750 +0300
+@@ -775,7 +775,7 @@ xfce_app_menu_item_set_startup_notificat
+  *
+  * Since 4.1
+  **/
+-G_CONST_RETURN gchar *
++const gchar *
+ xfce_app_menu_item_get_name(XfceAppMenuItem *app_menu_item)
+ {
+     g_return_val_if_fail(XFCE_IS_APP_MENU_ITEM(app_menu_item), NULL);
+@@ -792,7 +792,7 @@ xfce_app_menu_item_get_name(XfceAppMenuI
+  *
+  * Since 4.1
+  **/
+-G_CONST_RETURN gchar *
++const gchar *
+ xfce_app_menu_item_get_icon_name(XfceAppMenuItem *app_menu_item)
+ {
+     g_return_val_if_fail(XFCE_IS_APP_MENU_ITEM(app_menu_item), NULL);
+@@ -809,7 +809,7 @@ xfce_app_menu_item_get_icon_name(XfceApp
+  *
+  * Since 4.1
+  **/
+-G_CONST_RETURN gchar *
++const gchar *
+ xfce_app_menu_item_get_command(XfceAppMenuItem *app_menu_item)
+ {
+     g_return_val_if_fail(XFCE_IS_APP_MENU_ITEM(app_menu_item), NULL);
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-appmenuitem.h libxfcegui4-4.6.4/libxfcegui4/xfce-appmenuitem.h
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-appmenuitem.h  2014-10-08 01:09:39.158281048 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-appmenuitem.h   2014-10-08 01:11:38.114610151 +0300
+@@ -89,11 +89,11 @@ void xfce_app_menu_item_set_startup_noti
+                                                                                                          
+ #define xfce_app_menu_item_set_image(mi, img) gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(mi), img)
+ 
+-G_CONST_RETURN gchar *xfce_app_menu_item_get_name     (XfceAppMenuItem *app_menu_item);
++const gchar *xfce_app_menu_item_get_name     (XfceAppMenuItem *app_menu_item);
+ 
+-G_CONST_RETURN gchar *xfce_app_menu_item_get_icon_name(XfceAppMenuItem *app_menu_item);
++const gchar *xfce_app_menu_item_get_icon_name(XfceAppMenuItem *app_menu_item);
+ 
+-G_CONST_RETURN gchar *xfce_app_menu_item_get_command  (XfceAppMenuItem *app_menu_item);
++const gchar *xfce_app_menu_item_get_command  (XfceAppMenuItem *app_menu_item);
+ 
+ gboolean xfce_app_menu_item_get_needs_term            (XfceAppMenuItem *app_menu_item);
+ 
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-colorbutton.c libxfcegui4-4.6.4/libxfcegui4/xfce-colorbutton.c
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-colorbutton.c  2014-10-08 01:09:39.054287810 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-colorbutton.c   2014-10-08 01:10:51.897590474 +0300
+@@ -107,7 +107,7 @@ xfce_color_button_set_title (GtkColorBut
+ 
+ 
+ 
+-G_CONST_RETURN gchar *
++const gchar *
+ xfce_color_button_get_title (GtkColorButton *color_button)
+ {
+   return gtk_color_button_get_title (color_button);
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-colorbutton.h libxfcegui4-4.6.4/libxfcegui4/xfce-colorbutton.h
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-colorbutton.h  2014-10-08 01:09:39.154281307 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-colorbutton.h   2014-10-08 01:10:59.801080893 +0300
+@@ -55,7 +55,7 @@ void       xfce_color_button_set_use_alp
+ gboolean   xfce_color_button_get_use_alpha (XfceColorButton *color_button);
+ void       xfce_color_button_set_title     (XfceColorButton *color_button,
+                                             const gchar *title);
+-G_CONST_RETURN gchar *xfce_color_button_get_title
++const gchar *xfce_color_button_get_title
+                                            (XfceColorButton *color_button);
+ 
+ #endif  /* ifndef XFCE_DISABLE_DEPRECATED */
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-heading.c libxfcegui4-4.6.4/libxfcegui4/xfce-heading.c
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-heading.c      2014-10-08 01:09:39.054287810 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-heading.c       2014-10-08 01:11:22.455620031 +0300
+@@ -609,7 +609,7 @@ xfce_heading_set_icon (XfceHeading *head
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_heading_get_icon_name (XfceHeading *heading)
+ {
+   g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL);
+@@ -662,7 +662,7 @@ xfce_heading_set_icon_name (XfceHeading
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_heading_get_subtitle (XfceHeading *heading)
+ {
+   g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL);
+@@ -713,7 +713,7 @@ xfce_heading_set_subtitle (XfceHeading *
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_heading_get_title (XfceHeading *heading)
+ {
+   g_return_val_if_fail (XFCE_IS_HEADING (heading), NULL);
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-heading.h libxfcegui4-4.6.4/libxfcegui4/xfce-heading.h
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-heading.h      2014-10-08 01:09:39.166280532 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-heading.h       2014-10-08 01:11:46.378077249 +0300
+@@ -65,15 +65,15 @@ GdkPixbuf            *xfce_heading_get_i
+ void                  xfce_heading_set_icon      (XfceHeading *heading,
+                                                   GdkPixbuf   *icon);
+ 
+-G_CONST_RETURN gchar *xfce_heading_get_icon_name (XfceHeading *heading);
++const gchar *xfce_heading_get_icon_name (XfceHeading *heading);
+ void                  xfce_heading_set_icon_name (XfceHeading *heading,
+                                                   const gchar *icon_name);
+ 
+-G_CONST_RETURN gchar *xfce_heading_get_subtitle  (XfceHeading *heading);
++const gchar *xfce_heading_get_subtitle  (XfceHeading *heading);
+ void                  xfce_heading_set_subtitle  (XfceHeading *heading,
+                                                   const gchar *subtitle);
+ 
+-G_CONST_RETURN gchar *xfce_heading_get_title     (XfceHeading *heading);
++const gchar *xfce_heading_get_title     (XfceHeading *heading);
+ void                  xfce_heading_set_title     (XfceHeading *heading,
+                                                   const gchar *title);
+ 
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-titled-dialog.c libxfcegui4-4.6.4/libxfcegui4/xfce-titled-dialog.c
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-titled-dialog.c        2014-10-08 01:09:39.150281565 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-titled-dialog.c 2014-10-08 01:11:31.147059539 +0300
+@@ -328,7 +328,7 @@ xfce_titled_dialog_new_with_buttons (con
+  *
+  * Since: 4.4.0
+  **/
+-G_CONST_RETURN gchar*
++const gchar*
+ xfce_titled_dialog_get_subtitle (XfceTitledDialog *titled_dialog)
+ {
+   g_return_val_if_fail (XFCE_IS_TITLED_DIALOG (titled_dialog), NULL);
+diff -urp libxfcegui4-4.6.4_/libxfcegui4/xfce-titled-dialog.h libxfcegui4-4.6.4/libxfcegui4/xfce-titled-dialog.h
+--- libxfcegui4-4.6.4_/libxfcegui4/xfce-titled-dialog.h        2014-10-08 01:09:39.166280532 +0300
++++ libxfcegui4-4.6.4/libxfcegui4/xfce-titled-dialog.h 2014-10-08 01:12:00.617159087 +0300
+@@ -66,7 +66,7 @@ GtkWidget            *xfce_titled_dialog
+                                                            const gchar      *first_button_text,
+                                                            ...) G_GNUC_MALLOC;
+ 
+-G_CONST_RETURN gchar *xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
++const gchar *xfce_titled_dialog_get_subtitle     (XfceTitledDialog *titled_dialog);
+ void                  xfce_titled_dialog_set_subtitle     (XfceTitledDialog *titled_dialog,
+                                                            const gchar      *subtitle);
+ 

diff --git a/recipes/xfce-base/libxfcegui4_4.6.4.bb b/recipes/xfce-base/libxfcegui4_4.6.4.bb
index f170e6c..801ffbd 100644 (file)
--- a/recipes/xfce-base/libxfcegui4_4.6.4.bb
+++ b/recipes/xfce-base/libxfcegui4_4.6.4.bb
@@ -9,6 +9,8 @@ PR = "r1"
 
 inherit xfce46
 
+SRC_URI += " file://glib_compat.patch;patch=1"
+
 LEAD_SONAME = "libxfcegui4.so.4"
 
 FILES_${PN} += "${libdir}/xfce4/modules ${libdir}/libglade/2.0/*.so ${datadir}/xfce4/mime ${datadir}/icons/hicolor"