From f39238ad9f024fa06c5ad0c725c41e06f2beb664 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 22 Sep 2004 08:32:42 +0000
Subject: [PATCH] * Patch to make glib 1.2 compile with gcc 3.4.

svn path=/nixpkgs/trunk/; revision=1486
---
 .../libraries/gtk-libs-1.x/glib/default.nix   |  3 +++
 .../libraries/gtk-libs-1.x/glib/gcc34.patch   | 20 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch

diff --git a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
index f8990f5ce84..8aa5005b617 100644
--- a/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-1.x/glib/default.nix
@@ -6,4 +6,7 @@ stdenv.mkDerivation {
     url = ftp://ftp.gtk.org/pub/gtk/v1.2/glib-1.2.10.tar.gz;
     md5 = "6fe30dad87c77b91b632def29dd69ef9";
   };
+  # Patch for gcc 3.4 compatibility.  Based on
+  # http://cvs.openpkg.org/chngview?cn=16208.
+  patches = [./gcc34.patch];
 }
diff --git a/pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch b/pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch
new file mode 100644
index 00000000000..13d35c82209
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs-1.x/glib/gcc34.patch
@@ -0,0 +1,20 @@
+diff -rc glib-orig/glib.h glib-1.2.10/glib.h
+*** glib-orig/glib.h	2001-02-27 04:44:38.000000000 +0100
+--- glib-1.2.10/glib.h	2004-09-22 10:22:01.000000000 +0200
+***************
+*** 272,278 ****
+  /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+   * macros, so we can refer to them as strings unconditionally.
+   */
+! #ifdef	__GNUC__
+  #define	G_GNUC_FUNCTION		__FUNCTION__
+  #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
+  #else	/* !__GNUC__ */
+--- 272,278 ----
+  /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
+   * macros, so we can refer to them as strings unconditionally.
+   */
+! #if   defined(__GNUC__) && (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+  #define	G_GNUC_FUNCTION		__FUNCTION__
+  #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
+  #else	/* !__GNUC__ */