* 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
This commit is contained in:
parent
03668c40c5
commit
efba820026
23
pkgs/development/libraries/lesstif/c-linkage.patch
Normal file
23
pkgs/development/libraries/lesstif/c-linkage.patch
Normal file
@ -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 */
|
@ -8,4 +8,5 @@ stdenv.mkDerivation {
|
|||||||
};
|
};
|
||||||
buildInputs = [x11];
|
buildInputs = [x11];
|
||||||
propagatedBuildInputs = [libXp libXau];
|
propagatedBuildInputs = [libXp libXau];
|
||||||
|
patches = [./c-linkage.patch];
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user