From efba820026f56b12da46aec9b0a72f7cdb4ea4c3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Jun 2007 14:33:05 +0000
Subject: * Quick fix for an incompatibility between libXp and lesstif, which  
 caused the xpdf build to fail.  Patch from  
 http://www.mail-archive.com/debian-bugs-rc@lists.debian.org/msg101592.html

svn path=/nixpkgs/trunk/; revision=8867
---
 pkgs/development/libraries/lesstif/c-linkage.patch | 23 ++++++++++++++++++++++
 pkgs/development/libraries/lesstif/default.nix     |  1 +
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/lesstif/c-linkage.patch

diff --git a/pkgs/development/libraries/lesstif/c-linkage.patch b/pkgs/development/libraries/lesstif/c-linkage.patch
new file mode 100644
index 00000000000..343d9f789b8
--- /dev/null
+++ b/pkgs/development/libraries/lesstif/c-linkage.patch
@@ -0,0 +1,23 @@
+--- a/include/Motif-2.1/Xm/VendorSP.h  2006-07-07 15:58:04.000000000 +0200
++++ b/include/Motif-2.1/Xm/VendorSP.h  2006-07-07 15:58:19.000000000 +0200
+@@ -30,10 +30,6 @@
+ #include <Xm/VendorS.h>
+ #include <X11/ShellP.h>
+ 
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-
+ XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
+                                   Cardinal numResources,
+                                   WidgetClass filterClass,
+@@ -57,9 +53,4 @@
+ 
+ XMLIBEXPORT extern VendorShellClassRec  vendorShellClassRec;
+ 
+-
+-#ifdef __cplusplus
+-}
+-#endif
+-
+ #endif /* _XM_VENDORSP_H */
diff --git a/pkgs/development/libraries/lesstif/default.nix b/pkgs/development/libraries/lesstif/default.nix
index 20f9fdf848c..50122428706 100644
--- a/pkgs/development/libraries/lesstif/default.nix
+++ b/pkgs/development/libraries/lesstif/default.nix
@@ -8,4 +8,5 @@ stdenv.mkDerivation {
   };
   buildInputs = [x11];
   propagatedBuildInputs = [libXp libXau];
+  patches = [./c-linkage.patch];
 }
-- 
cgit 1.4.1