diff options
| author | Ross Burton <ross@openedhand.com> | 2007-08-04 09:52:03 +0000 |
|---|---|---|
| committer | Ross Burton <ross@openedhand.com> | 2007-08-04 09:52:03 +0000 |
| commit | 7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b (patch) | |
| tree | 7d484f1f8c14be936370ce1b2ee73f91516099d9 /meta/packages | |
| parent | 3ff099a44e8521863cc7b773314d6c77fef33eb5 (diff) | |
| download | openembedded-core-7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b.tar.gz openembedded-core-7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b.tar.bz2 openembedded-core-7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b.tar.xz openembedded-core-7ea7a1d8e4f88426e290575a2639b6ab1c1eab2b.zip | |
Upgrade glib
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2358 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch | 40 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch (renamed from meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0_2.13.7.bb | 8 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/glib-2.0_2.14.0.bb | 5 |
4 files changed, 5 insertions, 48 deletions
diff --git a/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch b/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch deleted file mode 100644 index d48072e20..000000000 --- a/meta/packages/glib-2.0/glib-2.0-2.13.7/casts.patch +++ /dev/null @@ -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); diff --git a/meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch b/meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch index a52327c8c..a52327c8c 100644 --- a/meta/packages/glib-2.0/glib-2.0-2.13.7/configure-libtool.patch +++ b/meta/packages/glib-2.0/glib-2.0-2.14.0/configure-libtool.patch diff --git a/meta/packages/glib-2.0/glib-2.0_2.13.7.bb b/meta/packages/glib-2.0/glib-2.0_2.13.7.bb deleted file mode 100644 index 7542ed2e1..000000000 --- a/meta/packages/glib-2.0/glib-2.0_2.13.7.bb +++ /dev/null @@ -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" diff --git a/meta/packages/glib-2.0/glib-2.0_2.14.0.bb b/meta/packages/glib-2.0/glib-2.0_2.14.0.bb new file mode 100644 index 000000000..995efbd11 --- /dev/null +++ b/meta/packages/glib-2.0/glib-2.0_2.14.0.bb @@ -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" |