summaryrefslogtreecommitdiff
path: root/x11/lesstif
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2007-06-26 10:39:44 +0000
committertnn <tnn@pkgsrc.org>2007-06-26 10:39:44 +0000
commit4999ea3775362293702b69a18b30c2b813b62134 (patch)
tree1f9d01afd3c50ef26feae928c9725a8543d1bd35 /x11/lesstif
parent68b84d4b6b7b192ab261e363feda9d75508fa9bf (diff)
downloadpkgsrc-4999ea3775362293702b69a18b30c2b813b62134.tar.gz
Patch c / c++ linkage problem in lesstif headers that causes the build
of print/xpdf to fail when MOTIF_TYPE=lesstif and using gcc4. Patch borrowed from Arch Linux. PKGREVISION++
Diffstat (limited to 'x11/lesstif')
-rw-r--r--x11/lesstif/Makefile3
-rw-r--r--x11/lesstif/distinfo3
-rw-r--r--x11/lesstif/patches/patch-bo19
3 files changed, 23 insertions, 2 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index 9a437322ba3..154dda2fac9 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.92 2006/12/27 13:37:42 joerg Exp $
+# $NetBSD: Makefile,v 1.93 2007/06/26 10:39:44 tnn Exp $
DISTNAME= lesstif-0.95.0
+PKGREVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo
index 4d65dd1f738..3c8bf4d9d87 100644
--- a/x11/lesstif/distinfo
+++ b/x11/lesstif/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.15 2006/07/29 14:32:12 adam Exp $
+$NetBSD: distinfo,v 1.16 2007/06/26 10:39:44 tnn Exp $
SHA1 (lesstif-0.95.0.tar.bz2) = 2a6f20d3bd525e6066ba2be22d8a47bf4bcd0425
RMD160 (lesstif-0.95.0.tar.bz2) = 0384f87cd1a71e6aea04b1963d03b4664cb66b50
@@ -14,3 +14,4 @@ SHA1 (patch-aq) = ccd7a53fed86e07f205d9937f408bd266c70ef3d
SHA1 (patch-ar) = 2b0a55cece6927fd4fcf4347db18ae4625383601
SHA1 (patch-bm) = f58cd23cb8d93027bbf105ff1bf186ff82313d9e
SHA1 (patch-bn) = 5d16046510d23eb696575c9f9100ef15ea909831
+SHA1 (patch-bo) = 39ca358d90b288b44dd223211feb3d8d477efe82
diff --git a/x11/lesstif/patches/patch-bo b/x11/lesstif/patches/patch-bo
new file mode 100644
index 00000000000..8858d3ed4e9
--- /dev/null
+++ b/x11/lesstif/patches/patch-bo
@@ -0,0 +1,19 @@
+$NetBSD: patch-bo,v 1.1 2007/06/26 10:39:44 tnn Exp $
+
+--- include/Motif-2.1/Xm/VendorSP.h.orig 2004-08-28 21:23:27.000000000 +0200
++++ include/Motif-2.1/Xm/VendorSP.h
+@@ -28,12 +28,13 @@
+
+ #include <Xm/XmP.h>
+ #include <Xm/VendorS.h>
+-#include <X11/ShellP.h>
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
++#include <X11/ShellP.h>
++
+ XMLIBEXPORT extern Cardinal _XmFilterResources(XtResource *resources,
+ Cardinal numResources,
+ WidgetClass filterClass,