pool/glib2
SHA256
2
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=11

Browse Source
This commit is contained in:
OBS User unknown 2007-08-09 13:25:12 +00:00 committed by Git OBS Bridge
parent 174d1c3885
commit ccc1eca23c
3 changed files with 104 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
glib-cast.patch Normal file
View File

@ -0,0 +1,66 @@
--- glib/gthread.c
+++ 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;
g_mutex_lock (g_once_mutex);
@@ -220,8 +220,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 (value_location) == 0);
g_return_if_fail (initialization_value != 0);
--- glib/gthread.h
+++ 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 (value_location) !=0)
return FALSE;
--- gobject/gtype.h
+++ 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() */

17
glib2.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Wed Aug 8 17:49:41 CEST 2007 - maw@suse.de
- Use %fdupes
- Split off a -lang subpackage
- s#%run_ldconfig#/sbin/ldconfig/ in %post and %postun.
-------------------------------------------------------------------
Sun Aug 5 23:10:49 CEST 2007 - maw@suse.de
- The previous changelog entry refers to #297636.
-------------------------------------------------------------------
Sun Aug 5 19:30:17 CEST 2007 - schwab@suse.de
- Fix broken interface.
-------------------------------------------------------------------
Thu Jul 19 17:34:48 CEST 2007 - maw@suse.de

26
glib2.spec
View File

@ -12,12 +12,12 @@
Name: glib2
%define _name glib
BuildRequires: gtk-doc pkg-config
BuildRequires: fdupes gtk-doc pkg-config
License: LGPL v2 or later
Group: Development/Libraries/C and C++
Autoreqprov: on
Version: 2.13.7
Release: 1
Release: 7
Summary: A Library with Convenient Functions Written in C
URL: http://www.gtk.org/
Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.13/%{_name}-%{version}.tar.bz2
@ -25,7 +25,9 @@ Source1: glib2.sh
Source2: glib2.csh
Patch0: glib-mkinstalldirs.patch
Patch1: glib-aclocal.patch
Patch2: glib-cast.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-lang = %{version}
# For temporary %%pre script only.
PreReq: coreutils
@ -113,10 +115,12 @@ Authors:
Owen Taylor <otaylor@gtk.org>
Sebastian Wilhelmi <wilhelmi@ira.uka.de>
%lang_package
%prep
%setup -q -n %{_name}-%{version}
%patch0
%patch1
%patch2
%build
autoreconf -f -i
@ -133,21 +137,25 @@ cp -a %{S:1} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.sh
cp -a %{S:2} $RPM_BUILD_ROOT/etc/profile.d/zzz-glib2.csh
%find_lang %{_name}20
%fdupes $RPM_BUILD_ROOT
%post
%run_ldconfig
/sbin/ldconfig
%postun
%run_ldconfig
/sbin/ldconfig
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %files -f %{_name}20.lang
%files
%defattr(-,root,root)
%doc AUTHORS COPYING README NEWS ChangeLog
%{_libdir}/lib*.so.*
/etc/profile.d/zzz-glib2.*
%files lang -f %{_name}20.lang
%files devel
%defattr(-,root,root)
%{_bindir}/*
@ -166,6 +174,14 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/gtk-doc/html/gobject
%changelog
* Wed Aug 08 2007 - maw@suse.de
- Use %%fdupes
- Split off a -lang subpackage
- s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun.
* Sun Aug 05 2007 - maw@suse.de
- The previous changelog entry refers to #297636.
* Sun Aug 05 2007 - schwab@suse.de
- Fix broken interface.
* Thu Jul 19 2007 - maw@suse.de
- Update to version 2.13.7
* The memory corruption warning from the slice allocator that