mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-17 20:59:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade glib

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2358 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2007-08-04 09:52:03 +00:00
parent 3ff099a44e
commit 7ea7a1d8e4
5 changed files with 6 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meta/conf/distro/poky-bleeding.conf
View File

@@ -1,4 +1,4 @@
PREFERRED_VERSION_glib-2.0 ?= "2.13.7"
PREFERRED_VERSION_glib-2.0 ?= "2.14.0"
PREFERRED_VERSION_pango ?= "1.17.5"
PREFERRED_VERSION_gtk+ ?= "2.11.6"

40
meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch vendored
View File

@@ -1,40 +0,0 @@
Index: glib/gthread.c
===================================================================
--- glib/gthread.c (revision 5636)
+++ glib/gthread.c (revision 5639)
@@ -223,11 +223,11 @@
g_once_init_leave (volatile gsize *value_location,
gsize initialization_value)
{
- g_return_if_fail (g_atomic_pointer_get (value_location) == 0);
+ g_return_if_fail (g_atomic_pointer_get ((void**) value_location) == 0);
g_return_if_fail (initialization_value != 0);
g_return_if_fail (g_once_init_list != NULL);
- g_atomic_pointer_set (value_location, initialization_value);
+ g_atomic_pointer_set ((void**) value_location, (void*) initialization_value);
g_mutex_lock (g_once_mutex);
g_once_init_list = g_slist_remove (g_once_init_list, (void*) value_location);
g_cond_broadcast (g_once_cond);
@@ -255,7 +255,7 @@
g_mutex_lock (g_once_mutex);
if (!(*mutex))
- g_atomic_pointer_set (mutex, g_mutex_new());
+ g_atomic_pointer_set ((void**) mutex, g_mutex_new());
g_mutex_unlock (g_once_mutex);
Index: glib/gthread.h
===================================================================
--- glib/gthread.h (revision 5636)
+++ glib/gthread.h (revision 5639)
@@ -332,7 +332,7 @@
G_INLINE_FUNC gboolean
g_once_init_enter (volatile gsize *value_location)
{
- if G_LIKELY (g_atomic_pointer_get (value_location) !=0)
+ if G_LIKELY (g_atomic_pointer_get ((void**) value_location) !=0)
return FALSE;
else
return g_once_init_enter_impl (value_location);

0
meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch → meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch vendored
View File

8
meta/packages/glib-2.0/glib-2.0_2.13.7.bb vendored
View File

@@ -1,8 +0,0 @@
require glib.inc
PR = "r1"
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.13/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1 \
file://casts.patch;patch=1;pnum=0"

5
meta/packages/glib-2.0/glib-2.0_2.14.0.bb vendored Normal file
View File

@@ -0,0 +1,5 @@
require glib.inc
SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glib/2.14/glib-${PV}.tar.bz2 \
file://glibconfig-sysdefs.h \
file://configure-libtool.patch;patch=1"