diff options
Diffstat (limited to 'packages/glib-2.0/files')
| -rw-r--r-- | packages/glib-2.0/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/glib-2.0/files/glib-gettextize-dir.patch | 11 | ||||
| -rw-r--r-- | packages/glib-2.0/files/glibconfig-sysdefs.h | 6 | ||||
| -rw-r--r-- | packages/glib-2.0/files/glibinclude.patch | 18 | ||||
| -rw-r--r-- | packages/glib-2.0/files/gtk-doc.patch | 59 |
5 files changed, 94 insertions, 0 deletions
diff --git a/packages/glib-2.0/files/.mtn2git_empty b/packages/glib-2.0/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/glib-2.0/files/.mtn2git_empty diff --git a/packages/glib-2.0/files/glib-gettextize-dir.patch b/packages/glib-2.0/files/glib-gettextize-dir.patch index e69de29bb2..989211c927 100644 --- a/packages/glib-2.0/files/glib-gettextize-dir.patch +++ b/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/packages/glib-2.0/files/glibconfig-sysdefs.h b/packages/glib-2.0/files/glibconfig-sysdefs.h index e69de29bb2..1329e7f21c 100644 --- a/packages/glib-2.0/files/glibconfig-sysdefs.h +++ b/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/packages/glib-2.0/files/glibinclude.patch b/packages/glib-2.0/files/glibinclude.patch index e69de29bb2..5413e50e00 100644 --- a/packages/glib-2.0/files/glibinclude.patch +++ b/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 diff --git a/packages/glib-2.0/files/gtk-doc.patch b/packages/glib-2.0/files/gtk-doc.patch index e69de29bb2..4b9c234e21 100644 --- a/packages/glib-2.0/files/gtk-doc.patch +++ b/packages/glib-2.0/files/gtk-doc.patch @@ -0,0 +1,59 @@ +--- 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") ++]) |