[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1997: another set of fixes, plus const deprecations, from bug 3548
Mats Wichmann
mats at linuxfoundation.org
Wed Oct 24 14:07:13 UTC 2012
------------------------------------------------------------
revno: 1997
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2012-10-24 08:07:13 -0600
message:
another set of fixes, plus const deprecations, from bug 3548
modified:
headers/All/3.1/glib-2.0/glib.h.defs
headers/All/3.2/glib-2.0/glib.h.defs
headers/All/4.0/glib-2.0/glib.h.defs
headers/All/4.1/glib-2.0/glib.h.defs
headers/All/5.0/glib-2.0/glib.h.defs
headers/IA32/5.0/glib-2.0/glib.h.defs
headers/IA64/5.0/glib-2.0/glib.h.defs
headers/PPC32/5.0/glib-2.0/glib.h.defs
headers/PPC64/5.0/glib-2.0/glib.h.defs
headers/S390/5.0/glib-2.0/glib.h.defs
headers/S390X/5.0/glib-2.0/glib.h.defs
headers/glib-2.0/glib.h
headers/x86-64/5.0/glib-2.0/glib.h.defs
package/Makefile
-------------- next part --------------
=== modified file 'headers/All/3.1/glib-2.0/glib.h.defs'
--- a/headers/All/3.1/glib-2.0/glib.h.defs 2012-10-23 15:02:08 +0000
+++ b/headers/All/3.1/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -2,12 +2,12 @@
#define GLIB_HAVE_ALLOCA_H
#define GLIB_HAVE_SYS_POLL_H
#define G_GINT32_MODIFIER ""
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
+#define G_GNUC_FUNCTION "" /* DEPRECATED */
+#define G_GNUC_PRETTY_FUNCTION "" /* DEPRECATED */
#define G_OPTION_REMAINING ""
#define G_OS_UNIX
#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
+#define G_THREADS_IMPL_POSIX /* DEPRECATED */
#define G_WIN32_DLLMAIN_FOR_DLL_NAME(static,dll_name)
#define G_CSET_LATINC \
"\300\301\302\303\304\305\306" \
@@ -375,7 +375,7 @@
#define G_CSET_A_2_Z "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define G_CSET_a_2_z "abcdefghijklmnopqrstuvwxyz"
#define g_alloca(size) alloca (size)
-#define G_CONST_RETURN const
+#define G_CONST_RETURN const /* DEPRECATED */
#define G_MAXDOUBLE DBL_MAX
#define G_MINDOUBLE DBL_MIN
#define GLIB_VAR extern
=== modified file 'headers/All/3.2/glib-2.0/glib.h.defs'
--- a/headers/All/3.2/glib-2.0/glib.h.defs 2012-10-23 15:02:08 +0000
+++ b/headers/All/3.2/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -2,12 +2,12 @@
#define GLIB_HAVE_ALLOCA_H
#define GLIB_HAVE_SYS_POLL_H
#define G_GINT32_MODIFIER ""
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
+#define G_GNUC_FUNCTION "" /* DEPRECATED */
+#define G_GNUC_PRETTY_FUNCTION "" /* DEPRECATED */
#define G_OPTION_REMAINING ""
#define G_OS_UNIX
#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
+#define G_THREADS_IMPL_POSIX /* DEPRECATED */
#define G_WIN32_DLLMAIN_FOR_DLL_NAME(static,dll_name)
#define G_CSET_LATINC \
"\300\301\302\303\304\305\306" \
@@ -375,7 +375,7 @@
#define G_CSET_A_2_Z "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define G_CSET_a_2_z "abcdefghijklmnopqrstuvwxyz"
#define g_alloca(size) alloca (size)
-#define G_CONST_RETURN const
+#define G_CONST_RETURN const /* DEPRECATED */
#define G_MAXDOUBLE DBL_MAX
#define G_MINDOUBLE DBL_MIN
#define GLIB_VAR extern
=== modified file 'headers/All/4.0/glib-2.0/glib.h.defs'
--- a/headers/All/4.0/glib-2.0/glib.h.defs 2012-10-23 15:02:08 +0000
+++ b/headers/All/4.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -12,12 +12,12 @@
# define G_END_DECLS
#endif
#define G_GINT32_MODIFIER ""
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
+#define G_GNUC_FUNCTION "" /* DEPRECATED */
+#define G_GNUC_PRETTY_FUNCTION "" /* DEPRECATED */
#define G_OPTION_REMAINING ""
#define G_OS_UNIX
#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
+#define G_THREADS_IMPL_POSIX /* DEPRECATED */
#define G_WIN32_DLLMAIN_FOR_DLL_NAME(static,dll_name)
#define G_CSET_LATINC \
"\300\301\302\303\304\305\306" \
@@ -385,7 +385,7 @@
#define G_CSET_A_2_Z "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define G_CSET_a_2_z "abcdefghijklmnopqrstuvwxyz"
#define g_alloca(size) alloca (size)
-#define G_CONST_RETURN const
+#define G_CONST_RETURN const /* DEPRECATED */
#define G_MAXDOUBLE DBL_MAX
#define G_MINDOUBLE DBL_MIN
#define GLIB_VAR extern
=== modified file 'headers/All/4.1/glib-2.0/glib.h.defs'
--- a/headers/All/4.1/glib-2.0/glib.h.defs 2012-10-23 15:02:08 +0000
+++ b/headers/All/4.1/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -12,12 +12,12 @@
# define G_END_DECLS
#endif
#define G_GINT32_MODIFIER ""
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
+#define G_GNUC_FUNCTION "" /* DEPRECATED */
+#define G_GNUC_PRETTY_FUNCTION "" /* DEPRECATED */
#define G_OPTION_REMAINING ""
#define G_OS_UNIX
#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
+#define G_THREADS_IMPL_POSIX /* DEPRECATED */
#define G_WIN32_DLLMAIN_FOR_DLL_NAME(static,dll_name)
#define G_CSET_LATINC \
"\300\301\302\303\304\305\306" \
@@ -387,7 +387,7 @@
#define G_CSET_A_2_Z "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define G_CSET_a_2_z "abcdefghijklmnopqrstuvwxyz"
#define g_alloca(size) alloca (size)
-#define G_CONST_RETURN const
+#define G_CONST_RETURN const /* DEPRECATED */
#define G_MAXDOUBLE DBL_MAX
#define G_MINDOUBLE DBL_MIN
#define GLIB_VAR extern
=== modified file 'headers/All/5.0/glib-2.0/glib.h.defs'
--- a/headers/All/5.0/glib-2.0/glib.h.defs 2012-10-23 15:02:08 +0000
+++ b/headers/All/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -12,12 +12,12 @@
# define G_END_DECLS
#endif
#define G_GINT32_MODIFIER ""
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
+#define G_GNUC_FUNCTION "" /* DEPRECATED */
+#define G_GNUC_PRETTY_FUNCTION "" /* DEPRECATED */
#define G_OPTION_REMAINING ""
#define G_OS_UNIX
#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
+#define G_THREADS_IMPL_POSIX /* DEPRECATED */
#define G_WIN32_DLLMAIN_FOR_DLL_NAME(static,dll_name)
#define G_CSET_LATINC \
"\300\301\302\303\304\305\306" \
@@ -144,9 +144,6 @@
G_STRLOC) : (fail))
#define G_THREAD_CF(op,fail,arg) \
(g_thread_supported () ? G_THREAD_UF (op, arg) : (fail))
-#define g_static_mutex_get_mutex(mutex) \
- (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \
- g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
#define G_LOCK_DEFINE(name) \
GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT
#define g_datalist_remove_no_notify(dl,k) \
@@ -385,7 +382,7 @@
#define G_CSET_A_2_Z "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define G_CSET_a_2_z "abcdefghijklmnopqrstuvwxyz"
#define g_alloca(size) alloca (size)
-#define G_CONST_RETURN const
+#define G_CONST_RETURN const /* DEPRECATED */
#define G_MAXDOUBLE DBL_MAX
#define G_MINDOUBLE DBL_MIN
#define GLIB_VAR extern
@@ -421,6 +418,7 @@
#define G_MARKUP_ERROR g_markup_error_quark ()
#define G_SHELL_ERROR g_shell_error_quark ()
#define G_SPAWN_ERROR g_spawn_error_quark ()
+#define g_static_mutex_get_mutex(mutex) g_static_mutex_get_mutex_impl
#define G_LOCK(name) g_static_mutex_lock (&G_LOCK_NAME (name))
#define G_TRYLOCK(name) g_static_mutex_trylock (&G_LOCK_NAME (name))
#define G_UNLOCK(name) g_static_mutex_unlock (&G_LOCK_NAME (name))
@@ -471,6 +469,7 @@
#define G_STATIC_PRIVATE_INIT { 0 }
#define G_ONCE_INIT { G_ONCE_STATUS_NOTCALLED, NULL }
#define G_STATIC_REC_MUTEX_INIT { G_STATIC_MUTEX_INIT }
+#define G_STATIC_MUTEX_INIT { NULL }
typedef float gfloat;
@@ -2222,7 +2221,7 @@
extern GError *g_error_new_literal(GQuark domain, gint code,
const gchar * message);
extern GError *g_error_new_valist(GQuark domain, gint code,
- const gchar * format, void args);
+ const gchar * format, va_list args);
extern GFileError g_file_error_from_errno(gint err_no);
extern GQuark g_file_error_quark(void);
extern gboolean g_file_get_contents(const gchar * filename,
@@ -3506,7 +3505,7 @@
reserved_chars_allowed,
gboolean allow_utf8);
extern void g_string_append_vprintf(GString * string, const gchar * format,
- void args);
+ va_list args);
extern GString *g_string_ascii_down(GString * string);
extern GString *g_string_ascii_up(GString * string);
extern GString *g_string_assign(GString * string, const gchar * rval);
@@ -3548,7 +3547,7 @@
extern GString *g_string_truncate(GString * string, gsize len);
extern GString *g_string_up(GString * string);
extern void g_string_vprintf(GString * string, const gchar * format,
- void args);
+ va_list args);
extern const gchar *g_strip_context(const gchar * msgid,
const gchar * msgval);
extern gchar *g_strjoin(const gchar * separator, ...);
=== modified file 'headers/IA32/5.0/glib-2.0/glib.h.defs'
--- a/headers/IA32/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/IA32/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,7 +1,5 @@
#define G_GSIZE_MODIFIER ""
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (p))
#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
=== modified file 'headers/IA64/5.0/glib-2.0/glib.h.defs'
--- a/headers/IA64/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/IA64/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,6 +1,4 @@
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
=== modified file 'headers/PPC32/5.0/glib-2.0/glib.h.defs'
--- a/headers/PPC32/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/PPC32/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,7 +1,5 @@
#define G_GSIZE_MODIFIER ""
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (p))
#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
=== modified file 'headers/PPC64/5.0/glib-2.0/glib.h.defs'
--- a/headers/PPC64/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/PPC64/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,6 +1,4 @@
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
=== modified file 'headers/S390/5.0/glib-2.0/glib.h.defs'
--- a/headers/S390/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/S390/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,7 +1,5 @@
#define G_GSIZE_MODIFIER ""
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (p))
#define GLONG_TO_BE(val) ((glong) GINT32_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT32_TO_LE (val))
=== modified file 'headers/S390X/5.0/glib-2.0/glib.h.defs'
--- a/headers/S390X/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/S390X/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,6 +1,4 @@
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h 2012-10-23 15:02:08 +0000
+++ b/headers/glib-2.0/glib.h 2012-10-24 14:07:13 +0000
@@ -25,8 +25,8 @@
#define GLIB_HAVE_ALLOCA_H
#define GLIB_HAVE_SYS_POLL_H
#define G_GINT32_MODIFIER ""
-#define G_GNUC_FUNCTION ""
-#define G_GNUC_PRETTY_FUNCTION ""
+#define G_GNUC_FUNCTION "" /* DEPRECATED */
+#define G_GNUC_PRETTY_FUNCTION "" /* DEPRECATED */
#if defined __i386__
#define G_GSIZE_MODIFIER ""
#endif
@@ -39,7 +39,7 @@
#define G_OPTION_REMAINING ""
#define G_OS_UNIX
#define G_THREADS_ENABLED
-#define G_THREADS_IMPL_POSIX
+#define G_THREADS_IMPL_POSIX /* DEPRECATED */
#define G_WIN32_DLLMAIN_FOR_DLL_NAME(static,dll_name)
#define G_CSET_LATINC \
"\300\301\302\303\304\305\306" \
@@ -166,9 +166,6 @@
G_STRLOC) : (fail))
#define G_THREAD_CF(op,fail,arg) \
(g_thread_supported () ? G_THREAD_UF (op, arg) : (fail))
-#define g_static_mutex_get_mutex(mutex) \
- (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \
- g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
#define G_LOCK_DEFINE(name) \
GStaticMutex G_LOCK_NAME (name) = G_STATIC_MUTEX_INIT
#define g_datalist_remove_no_notify(dl,k) \
@@ -262,34 +259,6 @@
__attribute__((__format__ (__scanf__, format_idx, arg_idx)))
#define G_STATIC_RW_LOCK_INIT \
{ G_STATIC_MUTEX_INIT, NULL, NULL, 0, FALSE, 0, 0 }
-#if defined __ia64__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
-#if defined __powerpc64__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
-#if defined __x86_64__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
-#if defined __s390x__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
-#if defined __i386__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
-#if defined __powerpc__ && !defined __powerpc64__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
-#if defined __s390__ && !defined __s390x__
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
-#endif
#define G_STRINGIFY_ARG(contents) #contents
#define G_DIR_SEPARATOR '/'
#define G_SEARCHPATH_SEPARATOR ':'
@@ -745,7 +714,7 @@
#define G_CSET_A_2_Z "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define G_CSET_a_2_z "abcdefghijklmnopqrstuvwxyz"
#define g_alloca(size) alloca (size)
-#define G_CONST_RETURN const
+#define G_CONST_RETURN const /* DEPRECATED */
#define G_MAXDOUBLE DBL_MAX
#define G_MINDOUBLE DBL_MIN
#define GLIB_VAR extern
@@ -1019,6 +988,40 @@
#define GLIB_MICRO_VERSION 6
#endif /* __LSB_VERSION__ < 4.1 */
+#if __LSB_VERSION__ < 50
+#define g_static_mutex_get_mutex(mutex) \
+ (g_thread_use_default_impl ? ((GMutex*) &((mutex)->static_mutex)) : \
+ g_static_mutex_get_mutex_impl_shortcut (&((mutex)->runtime_mutex)))
+#if defined __ia64__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#if defined __powerpc64__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#if defined __x86_64__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#if defined __s390x__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#if defined __i386__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#if defined __powerpc__ && !defined __powerpc64__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#if defined __s390__ && !defined __s390x__
+#define G_STATIC_MUTEX_INIT \
+ { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
+#endif
+#endif /* __LSB_VERSION__ < 5.0 */
+
#if __LSB_VERSION__ >= 40
#ifdef __cplusplus
# define G_BEGIN_DECLS extern "C" {
@@ -1049,6 +1052,8 @@
#if __LSB_VERSION__ >= 50
#define GLIB_MICRO_VERSION 1
#define GLIB_MINOR_VERSION 32
+#define g_static_mutex_get_mutex(mutex) g_static_mutex_get_mutex_impl
+#define G_STATIC_MUTEX_INIT { NULL }
#endif /* __LSB_VERSION__ >= 5.0 */
@@ -4942,7 +4947,7 @@
extern gchar **g_environ_unsetenv(gchar * *envp,
const gchar * variable);
extern GError *g_error_new_valist(GQuark domain, gint code,
- const gchar * format, void args);
+ const gchar * format, va_list args);
extern gchar *g_format_size(guint64 size);
extern gchar *g_format_size_for_display(void) LSB_DECL_DEPRECATED;
extern gchar *g_format_size_full(guint64 size, GFormatSizeFlags flags);
@@ -5364,7 +5369,8 @@
reserved_chars_allowed,
gboolean allow_utf8);
extern void g_string_append_vprintf(GString * string,
- const gchar * format, void args);
+ const gchar * format,
+ va_list args);
extern void g_string_chunk_clear(GStringChunk * chunk);
/* g_string_down is deprecated and should not be used in newly-written code. This function uses the locale-specific tolower() function, which is almost never the right thing. Use g_string_ascii_down or g_utf8_strdown instead. */
extern GString *g_string_down(GString * string) LSB_DECL_DEPRECATED;
@@ -5375,7 +5381,7 @@
/* g_string_up is deprecated and should not be used in newly-written code. This function uses the locale-specific toupper() function, which is almost never the right thing. Use g_string_ascii_up or g_utf8_strup instead. */
extern GString *g_string_up(GString * string) LSB_DECL_DEPRECATED;
extern void g_string_vprintf(GString * string, const gchar * format,
- void args);
+ va_list args);
/* g_strncasecmp is deprecated and should not be used in newly-written code. This function is broken if your string is guaranteed to be ASCII, since it's locale-sensitive, and it's broken if your string is localized, since it doesn't work on many encodings at all, including UTF-8, EUC-JP, etc. There are therefore two replacement functions: g_ascii_strncasecmp, which only works on ASCII and is not locale-sensitive, and g_utf8_casefold, which is good for case-insensitive sorting of UTF-8. */
extern gint g_strncasecmp(const char *s1, const char *s2,
guint n) LSB_DECL_DEPRECATED;
=== modified file 'headers/x86-64/5.0/glib-2.0/glib.h.defs'
--- a/headers/x86-64/5.0/glib-2.0/glib.h.defs 2009-11-03 20:41:16 +0000
+++ b/headers/x86-64/5.0/glib-2.0/glib.h.defs 2012-10-24 14:07:13 +0000
@@ -1,6 +1,4 @@
-#define G_STATIC_MUTEX_INIT \
- { NULL, { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0} } }
#define GPOINTER_TO_INT(p) ((gint) (glong) (p))
#define GLONG_TO_BE(val) ((glong) GINT64_TO_BE (val))
#define GLONG_TO_LE(val) ((glong) GINT64_TO_LE (val))
=== modified file 'package/Makefile'
--- a/package/Makefile 2012-10-23 23:56:11 +0000
+++ b/package/Makefile 2012-10-24 14:07:13 +0000
@@ -46,7 +46,7 @@
# We define this here instead of directly in the spec file as
# we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=1
+RPM_PACKAGE_RELEASE=2
# Initialize LIB64 to proper value for 64-bit architectures
export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)
More information about the lsb-messages
mailing list