From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Sun, 24 Jan 2010 21:58:37 +0000 (+0100)
Subject: contribs: removed outdated pkgconfig patches
X-Git-Tag: 1.1.0-ff~941
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=dd6d9ec7e126e9ea84ffa0672959a4ca702df1cd;p=vlc

contribs: removed outdated pkgconfig patches
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 7f5129dd71..888a74ecaf 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -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 --git a/extras/contrib/src/Patches/glib.patch b/extras/contrib/src/Patches/glib.patch
deleted file mode 100644
index 2b366efb8b..0000000000
--- a/extras/contrib/src/Patches/glib.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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 */
diff --git a/extras/contrib/src/Patches/pkgcfg.patch b/extras/contrib/src/Patches/pkgcfg.patch
deleted file mode 100644
index 21c28a5b60..0000000000
--- a/extras/contrib/src/Patches/pkgcfg.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- 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
-   ;;