Author: hawk Date: Tue Dec 13 11:15:24 2011 GMT Module: packages Tag: XFCE_4_6_1 ---- Log message: - glib >= 2.29.x fixes
---- Files affected: packages/libxfce4util: libxfce4util.spec (1.58 -> 1.58.4.1) , libxfce4util-gchar.patch (NONE -> 1.1.2.1) (NEW) ---- Diffs: ================================================================ Index: packages/libxfce4util/libxfce4util.spec diff -u packages/libxfce4util/libxfce4util.spec:1.58 packages/libxfce4util/libxfce4util.spec:1.58.4.1 --- packages/libxfce4util/libxfce4util.spec:1.58 Thu Nov 11 21:48:02 2010 +++ packages/libxfce4util/libxfce4util.spec Tue Dec 13 12:15:18 2011 @@ -13,6 +13,7 @@ Group: Libraries Source0: http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2 # Source0-md5: eac51d58179cbcadc3f802450a8ec9cd +Patch0: %{name}-gchar.patch URL: http://www.xfce.org/projects/libraries/ BuildRequires: autoconf >= 2.50 BuildRequires: automake @@ -84,6 +85,7 @@ %prep %setup -q +%patch0 -p1 %build %{__libtoolize} @@ -149,6 +151,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.58.4.1 2011/12/13 11:15:18 hawk +- glib >= 2.29.x fixes + Revision 1.58 2010/11/11 20:48:02 baggins - rel 3 - dirs cleanup ================================================================ Index: packages/libxfce4util/libxfce4util-gchar.patch diff -u /dev/null packages/libxfce4util/libxfce4util-gchar.patch:1.1.2.1 --- /dev/null Tue Dec 13 12:15:24 2011 +++ packages/libxfce4util/libxfce4util-gchar.patch Tue Dec 13 12:15:18 2011 @@ -0,0 +1,48 @@ +diff -ur libxfce4util-4.6.1.orig//libxfce4util/xfce-desktopentry.c libxfce4util-4.6.1/libxfce4util/xfce-desktopentry.c +--- libxfce4util-4.6.1.orig//libxfce4util/xfce-desktopentry.c 2009-04-07 20:27:02.000000000 +0000 ++++ libxfce4util-4.6.1/libxfce4util/xfce-desktopentry.c 2011-12-13 10:58:47.082022968 +0000 +@@ -472,7 +472,7 @@ + * 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 -ur libxfce4util-4.6.1.orig//libxfce4util/xfce-desktopentry.h libxfce4util-4.6.1/libxfce4util/xfce-desktopentry.h +--- libxfce4util-4.6.1.orig//libxfce4util/xfce-desktopentry.h 2009-04-07 20:27:02.000000000 +0000 ++++ libxfce4util-4.6.1/libxfce4util/xfce-desktopentry.h 2011-12-13 10:58:02.269085323 +0000 +@@ -68,7 +68,7 @@ + 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 -ur libxfce4util-4.6.1.orig//libxfce4util/xfce-i18n.c libxfce4util-4.6.1/libxfce4util/xfce-i18n.c +--- libxfce4util-4.6.1.orig//libxfce4util/xfce-i18n.c 2009-04-07 20:27:02.000000000 +0000 ++++ libxfce4util-4.6.1/libxfce4util/xfce-i18n.c 2011-12-13 10:58:40.314023026 +0000 +@@ -179,7 +179,7 @@ + * + * Deprecated:4.4: Use g_strip_context() instead. + **/ +-G_CONST_RETURN gchar* ++const gchar* + xfce_strip_context (const gchar *msgid, + const gchar *msgval) + { +diff -ur libxfce4util-4.6.1.orig//libxfce4util/xfce-i18n.h libxfce4util-4.6.1/libxfce4util/xfce-i18n.h +--- libxfce4util-4.6.1.orig//libxfce4util/xfce-i18n.h 2009-04-07 20:27:02.000000000 +0000 ++++ libxfce4util-4.6.1/libxfce4util/xfce-i18n.h 2011-12-13 10:58:28.969022954 +0000 +@@ -70,7 +70,7 @@ + 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 + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libxfce4util/libxfce4util.spec?r1=1.58&r2=1.58.4.1&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
