Commit dd6d9ec7 authored by Felix Paul Kühne's avatar Felix Paul Kühne

contribs: removed outdated pkgconfig patches

parent 90dc652d
......@@ -353,8 +353,6 @@ pkg-config-$(PKGCFG_VERSION).tar.gz:
pkgconfig: pkg-config-$(PKGCFG_VERSION).tar.gz
$(EXTRACT_GZ)
patch -d pkgconfig/glib-1.2.8 -p 1 < Patches/glib.patch
patch -d pkgconfig -p0 < Patches/pkgcfg.patch
(cd $@; autoconf)
.pkgcfg: pkgconfig
......
diff -urN glib1.2-1.2.10 glib
--- glib1.2-1.2.10 glib.h 2005-04-18 23:58:21.000000000 -0400
+++ glib/glib.h 2005-04-18 23:58:48.000000000 -0400
@@ -272,7 +272,7 @@
/* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
* macros, so we can refer to them as strings unconditionally.
*/
-#ifdef __GNUC__
+#if defined(__GNUC__) && (__GNUC__ < 4)
#define G_GNUC_FUNCTION __FUNCTION__
#define G_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
#else /* !__GNUC__ */
--- glib1.2-1.2.10/gmain.c Mon Feb 26 22:00:21 2001
+++ glib/gmain.c Sun Aug 24 13:46:51 2003
@@ -187,6 +187,8 @@
/* SunOS has poll, but doesn't provide a prototype. */
# if defined (sun) && !defined (__SVR4)
extern gint poll (GPollFD *ufds, guint nfsd, gint timeout);
+#else
+#include <poll.h> /* The opengroup defines the poll.h header as standard */
# endif /* !sun */
static GPollFunc poll_func = (GPollFunc) poll;
#else /* !HAVE_POLL */
--- configure.in.orig 2006-11-05 19:40:10.000000000 +0000
+++ configure.in 2006-11-05 19:42:10.000000000 +0000
@@ -62,10 +62,10 @@
AC_MSG_CHECKING([for Win32])
case "$host" in
- *-*-mingw*)
- native_win32=yes
- AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib])
- ;;
+dnl *-*-mingw*)
+dnl native_win32=yes
+dnl AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib])
+dnl ;;
*)
native_win32=no
;;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment