[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1995: fixes to uplifted glib.h (bug 3548)

Mats Wichmann mats at linuxfoundation.org
Tue Oct 23 15:02:08 UTC 2012


------------------------------------------------------------
revno: 1995
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Tue 2012-10-23 09:02:08 -0600
message:
  fixes to uplifted glib.h (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/glib-2.0/glib.h
  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-19 18:13:40 +0000
+++ b/headers/All/3.1/glib-2.0/glib.h.defs	2012-10-23 15:02:08 +0000
@@ -558,15 +558,7 @@
 typedef const void *gconstpointer;
 typedef guint(*GHashFunc) (gconstpointer);
 typedef gboolean(*GEqualFunc) (gconstpointer, gconstpointer);
-typedef struct _GStaticMutex {
-    struct _GMutex *runtime_mutex;
-    union {
-	char pad[GLIB_LSB_PADDING_SIZE];
-	double dummy_double;
-	void *dummy_pointer;
-	long int dummy_long;
-    } static_mutex;
-} GStaticMutex;
+typedef struct _GMutex GMutex;
 typedef union _GSystemThread {
     char data[GLIB_LSB_DATA_SIZE];
     double dummy_double;
@@ -966,7 +958,15 @@
     G_NORMALIZE_ALL_COMPOSE = 3,
     G_NORMALIZE_NFKC = 3
 } GNormalizeMode;
-typedef struct _GMutex GMutex;
+typedef struct _GStaticMutex {
+    struct _GMutex *runtime_mutex;
+    union {
+	char pad[GLIB_LSB_PADDING_SIZE];
+	double dummy_double;
+	void *dummy_pointer;
+	long int dummy_long;
+    } static_mutex;
+} GStaticMutex;
 typedef struct _GStaticPrivate {
     guint index;
 } GStaticPrivate;

=== 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-19 18:13:40 +0000
+++ b/headers/All/3.2/glib-2.0/glib.h.defs	2012-10-23 15:02:08 +0000
@@ -558,15 +558,7 @@
 typedef const void *gconstpointer;
 typedef guint(*GHashFunc) (gconstpointer);
 typedef gboolean(*GEqualFunc) (gconstpointer, gconstpointer);
-typedef struct _GStaticMutex {
-    struct _GMutex *runtime_mutex;
-    union {
-	char pad[GLIB_LSB_PADDING_SIZE];
-	double dummy_double;
-	void *dummy_pointer;
-	long int dummy_long;
-    } static_mutex;
-} GStaticMutex;
+typedef struct _GMutex GMutex;
 typedef union _GSystemThread {
     char data[GLIB_LSB_DATA_SIZE];
     double dummy_double;
@@ -966,7 +958,15 @@
     G_NORMALIZE_ALL_COMPOSE = 3,
     G_NORMALIZE_NFKC = 3
 } GNormalizeMode;
-typedef struct _GMutex GMutex;
+typedef struct _GStaticMutex {
+    struct _GMutex *runtime_mutex;
+    union {
+	char pad[GLIB_LSB_PADDING_SIZE];
+	double dummy_double;
+	void *dummy_pointer;
+	long int dummy_long;
+    } static_mutex;
+} GStaticMutex;
 typedef struct _GStaticPrivate {
     guint index;
 } GStaticPrivate;

=== 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-19 18:13:40 +0000
+++ b/headers/All/4.0/glib-2.0/glib.h.defs	2012-10-23 15:02:08 +0000
@@ -568,15 +568,7 @@
 typedef const void *gconstpointer;
 typedef guint(*GHashFunc) (gconstpointer);
 typedef gboolean(*GEqualFunc) (gconstpointer, gconstpointer);
-typedef struct _GStaticMutex {
-    struct _GMutex *runtime_mutex;
-    union {
-	char pad[GLIB_LSB_PADDING_SIZE];
-	double dummy_double;
-	void *dummy_pointer;
-	long int dummy_long;
-    } static_mutex;
-} GStaticMutex;
+typedef struct _GMutex GMutex;
 typedef union _GSystemThread {
     char data[GLIB_LSB_DATA_SIZE];
     double dummy_double;
@@ -976,7 +968,15 @@
     G_NORMALIZE_ALL_COMPOSE = 3,
     G_NORMALIZE_NFKC = 3
 } GNormalizeMode;
-typedef struct _GMutex GMutex;
+typedef struct _GStaticMutex {
+    struct _GMutex *runtime_mutex;
+    union {
+	char pad[GLIB_LSB_PADDING_SIZE];
+	double dummy_double;
+	void *dummy_pointer;
+	long int dummy_long;
+    } static_mutex;
+} GStaticMutex;
 typedef struct _GStaticPrivate {
     guint index;
 } GStaticPrivate;

=== 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-19 18:13:40 +0000
+++ b/headers/All/4.1/glib-2.0/glib.h.defs	2012-10-23 15:02:08 +0000
@@ -579,15 +579,7 @@
 typedef const void *gconstpointer;
 typedef guint(*GHashFunc) (gconstpointer);
 typedef gboolean(*GEqualFunc) (gconstpointer, gconstpointer);
-typedef struct _GStaticMutex {
-    struct _GMutex *runtime_mutex;
-    union {
-	char pad[GLIB_LSB_PADDING_SIZE];
-	double dummy_double;
-	void *dummy_pointer;
-	long int dummy_long;
-    } static_mutex;
-} GStaticMutex;
+typedef struct _GMutex GMutex;
 typedef union _GSystemThread {
     char data[GLIB_LSB_DATA_SIZE];
     double dummy_double;
@@ -987,7 +979,15 @@
     G_NORMALIZE_ALL_COMPOSE = 3,
     G_NORMALIZE_NFKC = 3
 } GNormalizeMode;
-typedef struct _GMutex GMutex;
+typedef struct _GStaticMutex {
+    struct _GMutex *runtime_mutex;
+    union {
+	char pad[GLIB_LSB_PADDING_SIZE];
+	double dummy_double;
+	void *dummy_pointer;
+	long int dummy_long;
+    } static_mutex;
+} GStaticMutex;
 typedef struct _GStaticPrivate {
     guint index;
 } GStaticPrivate;

=== 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-19 18:13:40 +0000
+++ b/headers/All/5.0/glib-2.0/glib.h.defs	2012-10-23 15:02:08 +0000
@@ -579,6 +579,10 @@
 typedef const void *gconstpointer;
 typedef guint(*GHashFunc) (gconstpointer);
 typedef gboolean(*GEqualFunc) (gconstpointer, gconstpointer);
+typedef union _GMutex {
+    gpointer p;
+    guint i[2];
+} GMutex;
 typedef union _GSystemThread {
     char data[GLIB_LSB_DATA_SIZE];
     double dummy_double;
@@ -981,7 +985,9 @@
     G_NORMALIZE_ALL_COMPOSE = 3,
     G_NORMALIZE_NFKC = 3
 } GNormalizeMode;
-typedef struct _GMutex GMutex;
+typedef struct {
+    GMutex *mutex;
+} GStaticMutex;
 typedef struct _GStaticPrivate {
     guint index;
 } GStaticPrivate;
@@ -1640,9 +1646,6 @@
     gpointer p;
     guint i[2];
 };
-struct GStaticMutex {
-    GMutex *mutex;
-};
 typedef gint64 GTimeSpan;
 typedef struct _GDateTime GDateTime;
 extern void g_allocator_free(GAllocator * allocator);
@@ -3641,7 +3644,7 @@
 extern void g_thread_foreach(GFunc thread_func, gpointer user_data);
 extern GThreadFunctions g_thread_functions_for_glib_use;
 extern gboolean g_thread_get_initialized(void);
-extern guint64(*) (void) g_thread_gettime;
+extern guint64 *g_thread_gettime(void);
 extern void g_thread_init(GThreadFunctions * vtable);
 extern void g_thread_init_with_errorcheck_mutexes(GThreadFunctions *
 						  vtable);

=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h	2012-10-19 18:13:40 +0000
+++ b/headers/glib-2.0/glib.h	2012-10-23 15:02:08 +0000
@@ -1590,8 +1590,6 @@
 	G_NORMALIZE_NFKC = 3
     } GNormalizeMode;
 
-    typedef struct _GMutex GMutex;
-
     typedef struct _GStaticPrivate GStaticPrivate;
 
     typedef enum {
@@ -1872,6 +1870,8 @@
     } GShellError;
 
 #if __LSB_VERSION__ < 50
+    typedef struct _GMutex GMutex;
+
     typedef struct _GStaticMutex GStaticMutex;
 
 #endif				/* __LSB_VERSION__ < 5.0 */
@@ -1898,6 +1898,12 @@
 #endif				/* __LSB_VERSION__ >= 4.1 */
 
 #if __LSB_VERSION__ >= 50
+    typedef union _GMutex GMutex;
+
+    typedef struct {
+	GMutex *mutex;
+    } GStaticMutex;
+
     typedef struct _GSourcePrivate GSourcePrivate;
 
     typedef struct GTestCase GTestCase;
@@ -2313,10 +2319,6 @@
 	guint i[2];
     };
 
-    struct GStaticMutex {
-	GMutex *mutex;
-    };
-
 #endif				/* __LSB_VERSION__ >= 5.0 */
 
     struct _GThread {
@@ -5447,7 +5449,7 @@
 				    gboolean joinable,
 				    GError * *error) LSB_DECL_DEPRECATED;
     extern gboolean g_thread_get_initialized(void);
-    extern guint64(*) (void) g_thread_gettime;
+    extern guint64 *g_thread_gettime(void);
     extern GThread *g_thread_new(const char *name, GThreadFunc func,
 				 void *data);
     extern gboolean g_thread_pool_push(GThreadPool * pool, gpointer data,

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-10-19 18:13:40 +0000
+++ b/package/Makefile	2012-10-23 15:02:08 +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