diff options
| author | dholland <dholland@pkgsrc.org> | 2018-02-20 10:53:30 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2018-02-20 10:53:30 +0000 |
| commit | e469d5eb5024c127d1770d1c5a3f43b4730a1405 (patch) | |
| tree | f6a12eaab94c5d1bd8f2f0e868ac8f000c31b8be /x11/lesstif | |
| parent | d59e8b6a3f63ea346f1a80c02100ebcf5979e6e1 (diff) | |
| download | pkgsrc-e469d5eb5024c127d1770d1c5a3f43b4730a1405.tar.gz | |
Don't include Xm/Print.h into Xm/All.h.
Xm/Print.h requires headers from libXp (which is dead, gone, not lamented)
and thus doesn't compile. Anything that specifically uses it is broken, as
is anything that assumes Xm/All.h will include it; but things that just use
Xm/All.h should not fail.
Such things include xpdf's configure script (PR 50039).
It isn't obvious to me why this package installs header files it
clearly never runs through the compiler, but for now at least that's
somebody else's problem.
PKGREVISION -> 6
Diffstat (limited to 'x11/lesstif')
| -rw-r--r-- | x11/lesstif/Makefile | 4 | ||||
| -rw-r--r-- | x11/lesstif/distinfo | 3 | ||||
| -rw-r--r-- | x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h | 26 |
3 files changed, 30 insertions, 3 deletions
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile index 30dd06f5ac9..fae4fd81cf6 100644 --- a/x11/lesstif/Makefile +++ b/x11/lesstif/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.104 2015/07/04 16:18:42 joerg Exp $ +# $NetBSD: Makefile,v 1.105 2018/02/20 10:53:30 dholland Exp $ DISTNAME= lesstif-0.95.2 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lesstif/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/lesstif/distinfo b/x11/lesstif/distinfo index df63cce1e87..5ba485fb75d 100644 --- a/x11/lesstif/distinfo +++ b/x11/lesstif/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2015/11/04 03:28:44 agc Exp $ +$NetBSD: distinfo,v 1.19 2018/02/20 10:53:30 dholland Exp $ SHA1 (lesstif-0.95.2.tar.bz2) = b894e544d529a235a6a665d48ca94a465f44a4e5 RMD160 (lesstif-0.95.2.tar.bz2) = 643fd81b70b6e8617803ddc4350272ca89b4a71f @@ -13,3 +13,4 @@ SHA1 (patch-aq) = a238d0be4d69d16e964651a112c4fcf421b06f2a SHA1 (patch-ar) = e4aefbc8c31bece408185d6bd9266f11d6852f7c SHA1 (patch-bm) = b32febe539b375a0ea8adfddeec01588927f9046 SHA1 (patch-bn) = f96d95358a76db1a371bfc3ea7a3ba6b9d1d536f +SHA1 (patch-include_Motif-2.1_Xm_XmAll.h) = c1d6ba9b36151ab01f6751916f38357c8f1929e6 diff --git a/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h b/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h new file mode 100644 index 00000000000..c5d00cfffff --- /dev/null +++ b/x11/lesstif/patches/patch-include_Motif-2.1_Xm_XmAll.h @@ -0,0 +1,26 @@ +$NetBSD: patch-include_Motif-2.1_Xm_XmAll.h,v 1.1 2018/02/20 10:53:30 dholland Exp $ + +Don't include Xm/Print.h in Xm/XmAll.h, because it requires headers from +libXp that do not exist any longer. + +For some reason leaving this in does not make the lesstif build fail; +it only causes failures for (some) users of lesstif. + + +--- include/Motif-2.1/Xm/XmAll.h~ 2002-04-26 20:33:00.000000000 +0000 ++++ include/Motif-2.1/Xm/XmAll.h +@@ -76,12 +76,12 @@ + #include <Xm/Manager.h> + #include <Xm/Notebook.h> + #include <Xm/Primitive.h> +-#include <Xm/Print.h> ++/*#include <Xm/Print.h>*/ + #include <Xm/SpinB.h> + #include <Xm/Transfer.h> + + /* 2.1 stuff */ +-#include <Xm/Print.h> ++/*#include <Xm/Print.h>*/ + #include <Xm/SSpinB.h> + + #endif /* _XM_XMALL_H */ |