diff options
Diffstat (limited to 'meta/packages/glib-2.0/files')
| -rw-r--r-- | meta/packages/glib-2.0/files/atomic_fix.patch | 16 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/files/glib-gettextize-dir.patch | 11 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/files/glibconfig-sysdefs.h | 6 | ||||
| -rw-r--r-- | meta/packages/glib-2.0/files/glibinclude.patch | 18 |
4 files changed, 51 insertions, 0 deletions
diff --git a/meta/packages/glib-2.0/files/atomic_fix.patch b/meta/packages/glib-2.0/files/atomic_fix.patch new file mode 100644 index 0000000000..ddc7ada778 --- /dev/null +++ b/meta/packages/glib-2.0/files/atomic_fix.patch @@ -0,0 +1,16 @@ +Index: glib-2.10.3/glib/gthread.c +=================================================================== +--- glib-2.10.3.orig/glib/gthread.c 2005-12-01 16:34:26.000000000 +0000 ++++ glib-2.10.3/glib/gthread.c 2006-07-06 08:17:18.000000000 +0100 +@@ -164,10 +164,10 @@ + _g_messages_thread_init_nomessage (); + + /* we may run full-fledged initializers from here */ ++ _g_atomic_thread_init (); + _g_convert_thread_init (); + _g_rand_thread_init (); + _g_main_thread_init (); +- _g_atomic_thread_init (); + _g_utils_thread_init (); + #ifdef G_OS_WIN32 + _g_win32_thread_init (); diff --git a/meta/packages/glib-2.0/files/glib-gettextize-dir.patch b/meta/packages/glib-2.0/files/glib-gettextize-dir.patch new file mode 100644 index 0000000000..989211c927 --- /dev/null +++ b/meta/packages/glib-2.0/files/glib-gettextize-dir.patch @@ -0,0 +1,11 @@ +--- glib-2.6.2/glib-gettextize.in.old 2005-02-15 02:43:17.000000000 +0000 ++++ glib-2.6.2/glib-gettextize.in 2005-02-15 02:43:18.000000000 +0000 +@@ -43,7 +43,7 @@ + + # Directory where the sources are stored. + prefix=@prefix@ +-gettext_dir=@prefix@/share/glib-2.0/gettext ++gettext_dir=@datadir@/glib-2.0/gettext + + while test $# -gt 0; do + case "$1" in diff --git a/meta/packages/glib-2.0/files/glibconfig-sysdefs.h b/meta/packages/glib-2.0/files/glibconfig-sysdefs.h new file mode 100644 index 0000000000..1329e7f21c --- /dev/null +++ b/meta/packages/glib-2.0/files/glibconfig-sysdefs.h @@ -0,0 +1,6 @@ +#define GLIB_SYSDEF_POLLIN =1 +#define GLIB_SYSDEF_POLLOUT =4 +#define GLIB_SYSDEF_POLLPRI =2 +#define GLIB_SYSDEF_POLLERR =8 +#define GLIB_SYSDEF_POLLHUP =16 +#define GLIB_SYSDEF_POLLNVAL =32 diff --git a/meta/packages/glib-2.0/files/glibinclude.patch b/meta/packages/glib-2.0/files/glibinclude.patch new file mode 100644 index 0000000000..5413e50e00 --- /dev/null +++ b/meta/packages/glib-2.0/files/glibinclude.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- glib-2.0-2.4.6-r1/glib-2.4.6/glib/Makefile.am~glibinclude.patch ++++ glib-2.0-2.4.6-r1/glib-2.4.6/glib/Makefile.am +@@ -157,8 +157,8 @@ + gprintf.h + + install-data-local: install-ms-lib install-libtool-import-lib +- @if test -f $(glibincludedir)/glist.h ; then \ +- echo "*** Old headers found in $(glibincludedir). You should remove the" ; \ ++ @if test -f $(DESTDIR)$(glibincludedir)/glist.h ; then \ ++ echo "*** Old headers found in $(DESTDIR)$(glibincludedir). You should remove the" ; \ + echo "*** contents of this directory and type 'make install' again." ; \ + false ; \ + fi |