1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

Drop unused glib patches

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3479 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2008-01-13 17:01:28 +00:00
parent dad7da8290
commit 976d362877
7 changed files with 0 additions and 6246 deletions
-16
View File
@@ -1,16 +0,0 @@
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 ();
-11
View File
@@ -1,11 +0,0 @@
--- glib-2.8.4/configure.in.orig 2006-06-05 13:34:08.000000000 +0100
+++ glib-2.8.4/configure.in 2006-06-05 13:34:36.000000000 +0100
@@ -1106,7 +1106,7 @@
dnl No use for this on Win32
G_MODULE_LDFLAGS=
else
- G_MODULE_LDFLAGS=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
+ G_MODULE_LDFLAGS=`(./$host_alias-libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
fi
dnl G_MODULE_IMPL= don't reset, so cmd-line can override
G_MODULE_NEED_USCORE=0
-11
View File
@@ -1,11 +0,0 @@
--- 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
@@ -1,8 +0,0 @@
--- glib-2.6.5/gobject/glib-mkenums.in.orig 2006-06-15 21:28:23.436946024 -0600
+++ glib-2.6.5/gobject/glib-mkenums.in 2006-06-15 21:28:35.417124760 -0600
@@ -1,4 +1,4 @@
-#!@PERL_PATH@ -w
+#!@PERL_PATH@
# glib-mkenums.pl
# Information about the current enumeration
-18
View File
@@ -1,18 +0,0 @@
#
# 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
-59
View File
@@ -1,59 +0,0 @@
--- glib/acinclude.m4 2004-05-08 11:14:46.000000000 +0100
+++ glib/acinclude.m4 2004-05-08 11:14:55.000000000 +0100
@@ -446,3 +446,56 @@
])
+dnl -*- mode: autoconf -*-
+
+# serial 1
+
+dnl Usage:
+dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
+AC_DEFUN([GTK_DOC_CHECK],
+[
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH(html-dir,
+ AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+ [with_html_dir='${datadir}/gtk-doc/html'])
+ HTML_DIR="$with_html_dir"
+ AC_SUBST(HTML_DIR)
+
+ dnl enable/disable documentation building
+ AC_ARG_ENABLE(gtk-doc,
+ AC_HELP_STRING([--enable-gtk-doc],
+ [use gtk-doc to build documentation [default=no]]),,
+ enable_gtk_doc=no)
+
+ have_gtk_doc=no
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
+ have_gtk_doc=yes
+ fi
+
+ dnl do we want to do a version check?
+ifelse([$1],[],,
+ [gtk_doc_min_version=$1
+ if test "$have_gtk_doc" = yes; then
+ AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
+ if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ have_gtk_doc=no
+ fi
+ fi
+])
+ if test x$enable_gtk_doc = xyes; then
+ if test "$have_gtk_doc" != yes; then
+ enable_gtk_doc=no
+ fi
+ fi
+
+ AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
+])
File diff suppressed because it is too large Load Diff