pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/lesstif Patch c / c++ linkage problem in lesstif h...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/530d506cb603
branches:  trunk
changeset: 530351:530d506cb603
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue Jun 26 10:39:44 2007 +0000

description:
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:

 x11/lesstif/Makefile         |   3 ++-
 x11/lesstif/distinfo         |   3 ++-
 x11/lesstif/patches/patch-bo |  19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diffs (49 lines):

diff -r 6f24782ef16b -r 530d506cb603 x11/lesstif/Makefile
--- a/x11/lesstif/Makefile      Tue Jun 26 09:01:49 2007 +0000
+++ b/x11/lesstif/Makefile      Tue Jun 26 10:39:44 2007 +0000
@@ -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 -r 6f24782ef16b -r 530d506cb603 x11/lesstif/distinfo
--- a/x11/lesstif/distinfo      Tue Jun 26 09:01:49 2007 +0000
+++ b/x11/lesstif/distinfo      Tue Jun 26 10:39:44 2007 +0000
@@ -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-ar) = 2b0a55cece6927fd4fcf4347db18ae4625383601
 SHA1 (patch-bm) = f58cd23cb8d93027bbf105ff1bf186ff82313d9e
 SHA1 (patch-bn) = 5d16046510d23eb696575c9f9100ef15ea909831
+SHA1 (patch-bo) = 39ca358d90b288b44dd223211feb3d8d477efe82
diff -r 6f24782ef16b -r 530d506cb603 x11/lesstif/patches/patch-bo
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/lesstif/patches/patch-bo      Tue Jun 26 10:39:44 2007 +0000
@@ -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,



Home | Main Index | Thread Index | Old Index