- downgrade to glib-2.23.1
This commit is contained in:
Stephan Raue 2010-03-20 02:21:45 +01:00
parent b3b8817b82
commit 97cd12b922
3 changed files with 16 additions and 71 deletions

View File

@ -1,70 +0,0 @@
diff -Naur glib-2.23.5/gio/Makefile.am glib-2.23.5.patch/gio/Makefile.am
--- glib-2.23.5/gio/Makefile.am 2010-03-06 17:51:40.000000000 +0100
+++ glib-2.23.5.patch/gio/Makefile.am 2010-03-09 09:38:50.205664589 +0100
@@ -466,6 +466,7 @@
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gthread/libgthread-2.0.la \
libgio-2.0.la \
$(NULL)
diff -Naur glib-2.23.5/gio/Makefile.in glib-2.23.5.patch/gio/Makefile.in
--- glib-2.23.5/gio/Makefile.in 2010-03-08 16:35:06.000000000 +0100
+++ glib-2.23.5.patch/gio/Makefile.in 2010-03-09 09:39:16.717664516 +0100
@@ -824,6 +824,7 @@
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
$(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gthread/libgthread-2.0.la \
libgio-2.0.la \
$(NULL)
diff -Naur glib-2.23.5/gio/tests/Makefile.am glib-2.23.5.patch/gio/tests/Makefile.am
--- glib-2.23.5/gio/tests/Makefile.am 2010-03-06 17:51:40.000000000 +0100
+++ glib-2.23.5.patch/gio/tests/Makefile.am 2010-03-09 09:39:44.816664472 +0100
@@ -14,6 +14,8 @@
progs_ldadd = \
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gthread/libgthread-2.0.la \
$(top_builddir)/gio/libgio-2.0.la
diff -Naur glib-2.23.5/gio/tests/Makefile.in glib-2.23.5.patch/gio/tests/Makefile.in
--- glib-2.23.5/gio/tests/Makefile.in 2010-03-08 16:35:07.000000000 +0100
+++ glib-2.23.5.patch/gio/tests/Makefile.in 2010-03-09 09:40:11.250664543 +0100
@@ -448,6 +448,8 @@
progs_ldadd = \
$(top_builddir)/glib/libglib-2.0.la \
$(top_builddir)/gobject/libgobject-2.0.la \
+ $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gthread/libgthread-2.0.la \
$(top_builddir)/gio/libgio-2.0.la
SAMPLE_PROGS = \
diff -Naur glib-2.23.5/tests/Makefile.am glib-2.23.5.patch/tests/Makefile.am
--- glib-2.23.5/tests/Makefile.am 2010-01-22 03:57:55.000000000 +0100
+++ glib-2.23.5.patch/tests/Makefile.am 2010-03-09 09:36:39.805664621 +0100
@@ -86,7 +86,7 @@
assert_msg_test_LDADD = $(libglib)
if ENABLE_TIMELOOP
timeloop_LDADD = $(libglib)
-timeloop_closure_LDADD = $(libglib) $(libgobject)
+timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread)
endif
test_programs = \
diff -Naur glib-2.23.5/tests/Makefile.in glib-2.23.5.patch/tests/Makefile.in
--- glib-2.23.5/tests/Makefile.in 2010-03-08 16:35:08.000000000 +0100
+++ glib-2.23.5.patch/tests/Makefile.in 2010-03-09 09:37:22.598664379 +0100
@@ -692,7 +692,7 @@
errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS)
assert_msg_test_LDADD = $(libglib)
@ENABLE_TIMELOOP_TRUE@timeloop_LDADD = $(libglib)
-@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject)
+@ENABLE_TIMELOOP_TRUE@timeloop_closure_LDADD = $(libglib) $(libgobject) $(libgthread)
test_programs = \
atomic-test \
base64-test \

View File

@ -0,0 +1,15 @@
diff -up glib-2.16.6/configure.atomic glib-2.16.6/configure
--- glib-2.16.6/configure.atomic 2008-10-27 18:24:20.000000000 -0400
+++ glib-2.16.6/configure 2008-10-27 18:24:31.000000000 -0400
@@ -42742,11 +42742,6 @@ $as_echo_n "checking whether to use asse
if test x"$GCC" = xyes; then
case $host_cpu in
- i386)
- { $as_echo "$as_me:$LINENO: result: none" >&5
-$as_echo "none" >&6; }
- glib_memory_barrier_needed=no
- ;;
i?86)
{ $as_echo "$as_me:$LINENO: result: i486" >&5
$as_echo "i486" >&6; }

View File

@ -1 +1 @@
http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-2.23.5.tar.bz2
http://ftp.gnome.org/pub/GNOME/sources/glib/2.23/glib-2.23.1.tar.bz2