pool/glib2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=34

Browse Source
This commit is contained in:
OBS User unknown 2008-04-25 13:11:30 +00:00 committed by Git OBS Bridge
parent b896df2bf8
commit 0ee9ca1851
3 changed files with 8 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
glib2-cast.patch
View File

@ -1,171 +0,0 @@
=== modified file 'gio/gioenumtypes.c.template'
Index: gio/gioenumtypes.c.template
===================================================================
--- gio/gioenumtypes.c.template.orig
+++ gio/gioenumtypes.c.template
@@ -12,7 +12,7 @@
GType
@enum_name@_get_type (void)
{
- static volatile gsize g_define_type_id__volatile = 0;
+ static volatile gpointer g_define_type_id__volatile = 0;
if (g_once_init_enter (&g_define_type_id__volatile))
{
@@ -28,10 +28,10 @@ GType
};
GType g_define_type_id =
g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+ g_once_init_leave (&g_define_type_id__volatile, (gpointer) g_define_type_id);
}
- return g_define_type_id__volatile;
+ return (GType) g_define_type_id__volatile;
}
/*** END value-tail ***/
Index: gio/gvfs.c
===================================================================
--- gio/gvfs.c.orig
+++ gio/gvfs.c
@@ -241,8 +241,8 @@ g_vfs_get_local (void)
{
static gsize vfs = 0;
- if (g_once_init_enter (&vfs))
- g_once_init_leave (&vfs, (gsize)_g_local_vfs_new ());
+ if (g_once_init_enter ((gpointer) &vfs))
+ g_once_init_leave ((gpointer) &vfs, (gpointer) _g_local_vfs_new ());
return G_VFS (vfs);
}
Index: glib/garray.h
===================================================================
--- glib/garray.h.orig
+++ glib/garray.h
@@ -61,7 +61,7 @@ struct _GPtrArray
#define g_array_append_val(a,v) g_array_append_vals (a, &(v), 1)
#define g_array_prepend_val(a,v) g_array_prepend_vals (a, &(v), 1)
#define g_array_insert_val(a,i,v) g_array_insert_vals (a, i, &(v), 1)
-#define g_array_index(a,t,i) (((t*) (void *) (a)->data) [(i)])
+#define g_array_index(a,t,i) (((t*) ((void *) ((a)->data))) [(i)])
GArray* g_array_new (gboolean zero_terminated,
gboolean clear_,
Index: glib/gthread.c
===================================================================
--- glib/gthread.c.orig
+++ glib/gthread.c
@@ -200,7 +200,7 @@ g_once_impl (GOnce *once,
}
gboolean
-g_once_init_enter_impl (volatile gsize *value_location)
+g_once_init_enter_impl (volatile gpointer *value_location)
{
gboolean need_init = FALSE;
g_mutex_lock (g_once_mutex);
@@ -221,8 +221,8 @@ g_once_init_enter_impl (volatile gsize *
}
void
-g_once_init_leave (volatile gsize *value_location,
- gsize initialization_value)
+g_once_init_leave (volatile gpointer *value_location,
+ gpointer initialization_value)
{
g_return_if_fail (g_atomic_pointer_get ((void**) value_location) == NULL);
g_return_if_fail (initialization_value != 0);
Index: glib/gthread.h
===================================================================
--- glib/gthread.h.orig
+++ glib/gthread.h
@@ -324,13 +324,13 @@ gpointer g_once_impl (GOnce *once, GThre
#endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
/* initialize-once guards, keyed by value_location */
-G_INLINE_FUNC gboolean g_once_init_enter (volatile gsize *value_location);
-gboolean g_once_init_enter_impl (volatile gsize *value_location);
-void g_once_init_leave (volatile gsize *value_location,
- gsize initialization_value);
+G_INLINE_FUNC gboolean g_once_init_enter (volatile gpointer *value_location);
+gboolean g_once_init_enter_impl (volatile gpointer *value_location);
+void g_once_init_leave (volatile gpointer *value_location,
+ gpointer initialization_value);
#if defined (G_CAN_INLINE) || defined (__G_THREAD_C__)
G_INLINE_FUNC gboolean
-g_once_init_enter (volatile gsize *value_location)
+g_once_init_enter (volatile gpointer *value_location)
{
if G_LIKELY (g_atomic_pointer_get ((void*volatile*) value_location) != NULL)
return FALSE;
Index: gobject/gtype.h
===================================================================
--- gobject/gtype.h.orig
+++ gobject/gtype.h
@@ -368,7 +368,7 @@ static void type_name##_class_intern
GType \
type_name##_get_type (void) \
{ \
- static volatile gsize g_define_type_id__volatile = 0; \
+ static volatile gpointer g_define_type_id__volatile = 0; \
if (g_once_init_enter (&g_define_type_id__volatile)) \
{ \
GType g_define_type_id = \
@@ -383,9 +383,9 @@ type_name##_get_type (void) \
#define _G_DEFINE_TYPE_EXTENDED_END() \
/* following custom code */ \
} \
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+ g_once_init_leave (&g_define_type_id__volatile, (gpointer) g_define_type_id); \
} \
- return g_define_type_id__volatile; \
+ return (GType) g_define_type_id__volatile; \
} /* closes type_name##_get_type() */
Index: gio/gdesktopappinfo.c
===================================================================
--- gio/gdesktopappinfo.c.orig
+++ gio/gdesktopappinfo.c
@@ -1671,7 +1671,7 @@ g_app_info_get_default_for_type (const c
GAppInfo *
g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
{
- static gsize lookup = 0;
+ static gpointer lookup = 0;
if (g_once_init_enter (&lookup))
{
@@ -1711,7 +1711,7 @@ g_app_info_get_default_for_uri_scheme (c
if (lookup_instance != NULL)
setup_value = (gsize)lookup_instance;
- g_once_init_leave (&lookup, setup_value);
+ g_once_init_leave (&lookup, (gpointer) setup_value);
}
if (lookup == 1)
Index: gobject/tests/threadtests.c
===================================================================
--- gobject/tests/threadtests.c.orig
+++ gobject/tests/threadtests.c
@@ -30,7 +30,7 @@ static void type_name##_default_init (T
GType \
type_name##_get_type (void) \
{ \
- static volatile gsize g_define_type_id__volatile = 0; \
+ static volatile gpointer g_define_type_id__volatile = 0; \
if (g_once_init_enter (&g_define_type_id__volatile)) \
{ \
GType g_define_type_id = \
@@ -47,7 +47,7 @@ type_name##_get_type (void) \
#define _G_DEFINE_INTERFACE_EXTENDED_END() \
/* following custom code */ \
} \
- g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+ g_once_init_leave (&g_define_type_id__volatile, (gpointer) g_define_type_id); \
} \
return g_define_type_id__volatile; \
} /* closes type_name##_get_type() */

5
glib2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 22 03:55:09 CEST 2008 - hpj@suse.de
- Dropped previously disabled glib2-cast.patch.
-------------------------------------------------------------------
Mon Apr 14 23:54:54 CEST 2008 - maw@suse.de

7
glib2.spec
View File

@ -18,7 +18,7 @@ License: LGPL v2.1 or later
Group: Development/Libraries/C and C++
AutoReqProv: on
Version: 2.16.3
Release: 4
Release: 6
Summary: A Library with Convenient Functions Written in C
Url: http://www.gtk.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2
@ -34,8 +34,6 @@ Source5: gtk-doc.m4
Patch0: glib2-mkinstalldirs.patch
# PATCH-FIX-OPENSUSE glib2-aclocal.patch
Patch1: glib2-aclocal.patch
# PATCH-FIX-NEEDS-REBASE glib2-cast.patch -- This patch doesn't necessarily need a rebase; it might be better off dropped entirely instead.
Patch2: glib2-cast.patch
# PATCH-FIX-UPSTREAM glib2-allocsize.patch bgo523019 meissner@suse.de -- marks malloc-style functions to detect memory problems at compile time
Patch3: glib2-allocsize.patch
# PATCH-FIX-UPSTREAM glib2-bnc373149-bgo518160-gbookmark-optimizations.diff bnc373149 bgo518160 federico@novell.com -- backport GBookmark optimizations (1)
@ -369,7 +367,6 @@ Authors:
%setup -q -n %{_name}-%{version}
%patch0
%patch1
### %patch2
%patch3
%patch4 -p1
%patch5 -p1
@ -505,6 +502,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/gtk-doc/html
%changelog
* Tue Apr 22 2008 hpj@suse.de
- Dropped previously disabled glib2-cast.patch.
* Tue Apr 15 2008 maw@suse.de
- Add glib2-fix-bookmark-leak.diff.
* Mon Apr 14 2008 sbrabec@suse.cz