diff options
author | pi <pi@FreeBSD.org> | 2016-04-29 21:13:28 +0000 |
---|---|---|
committer | pi <pi@FreeBSD.org> | 2016-04-29 21:13:28 +0000 |
commit | bb3d5243e659e936ff00497c9851695d0fd5cd77 (patch) | |
tree | 1dd899724c8887ed615924e71631c285227af39b | |
parent | ccd8a94c60e5d015b91fd10c369c5c7483fc124a (diff) | |
download | FreeBSD-ports-bb3d5243e659e936ff00497c9851695d0fd5cd77.zip FreeBSD-ports-bb3d5243e659e936ff00497c9851695d0fd5cd77.tar.gz |
devel/ddd: Fix build with libc++ 3.8.0
PR: 208528
Submitted by: dim
Approved by: sergio@softshark.org (maintainer timeout)
-rw-r--r-- | devel/ddd/files/patch-ddd-GraphEditP.h | 18 | ||||
-rw-r--r-- | devel/ddd/files/patch-ddd-LabelH.C | 20 | ||||
-rw-r--r-- | devel/ddd/files/patch-ddd-PannedGEP.h | 18 | ||||
-rw-r--r-- | devel/ddd/files/patch-ddd-Sash.h | 14 | ||||
-rw-r--r-- | devel/ddd/files/patch-ddd-ScrolleGEP.h | 16 | ||||
-rw-r--r-- | devel/ddd/files/patch-ddd-SwallowerP.h | 14 | ||||
-rw-r--r-- | devel/ddd/files/patch-ddd-converters.C | 22 |
7 files changed, 122 insertions, 0 deletions
diff --git a/devel/ddd/files/patch-ddd-GraphEditP.h b/devel/ddd/files/patch-ddd-GraphEditP.h new file mode 100644 index 0000000..b3585e7 --- /dev/null +++ b/devel/ddd/files/patch-ddd-GraphEditP.h @@ -0,0 +1,18 @@ +--- ddd/GraphEditP.h.orig 2009-02-11 18:25:06.000000000 +0100 ++++ ddd/GraphEditP.h 2016-04-04 21:29:40.084971000 +0200 +@@ -30,15 +30,11 @@ + + // Superclasses + extern "C" { +-#define new new_w +-#define class class_w + #include <X11/CoreP.h> + #include <Xm/XmP.h> + #if XmVersion >= 1002 + #include <Xm/PrimitiveP.h> + #endif +-#undef new +-#undef class + } + + // This class diff --git a/devel/ddd/files/patch-ddd-LabelH.C b/devel/ddd/files/patch-ddd-LabelH.C new file mode 100644 index 0000000..45596b9 --- /dev/null +++ b/devel/ddd/files/patch-ddd-LabelH.C @@ -0,0 +1,20 @@ +--- ddd/LabelH.C.orig 2009-02-11 18:25:07.000000000 +0100 ++++ ddd/LabelH.C 2016-04-04 21:29:40.083516000 +0200 +@@ -30,8 +30,6 @@ + * cwikla@wolfram.com + */ + +-#define new a_new // Motif 1.1 wants this +-#define class a_class + extern "C" { + #include <Xm/XmP.h> + #include <Xm/LabelP.h> +@@ -41,8 +39,6 @@ extern "C" { + #include <Xm/ManagerP.h> + #endif + } +-#undef new +-#undef class + + #include "LabelHP.h" + #include "casts.h" diff --git a/devel/ddd/files/patch-ddd-PannedGEP.h b/devel/ddd/files/patch-ddd-PannedGEP.h new file mode 100644 index 0000000..bfeeb0b --- /dev/null +++ b/devel/ddd/files/patch-ddd-PannedGEP.h @@ -0,0 +1,18 @@ +--- ddd/PannedGEP.h.orig 2009-02-11 18:25:06.000000000 +0100 ++++ ddd/PannedGEP.h 2016-04-04 21:29:40.083754000 +0200 +@@ -32,15 +32,11 @@ + #include <Xm/Xm.h> + + // Superclasses +-#define new new_w +-#define class class_w + extern "C" { + #include <X11/IntrinsicP.h> + #include <X11/CompositeP.h> + #include <X11/Xaw/PortholeP.h> + } +-#undef new +-#undef class + + // This class + #include "PannedGE.h" diff --git a/devel/ddd/files/patch-ddd-Sash.h b/devel/ddd/files/patch-ddd-Sash.h new file mode 100644 index 0000000..7182d31 --- /dev/null +++ b/devel/ddd/files/patch-ddd-Sash.h @@ -0,0 +1,14 @@ +--- ddd/Sash.h.orig 2009-02-11 18:25:06.000000000 +0100 ++++ ddd/Sash.h 2016-04-04 21:29:40.084679000 +0200 +@@ -29,11 +29,7 @@ + #define _DDD_Sash_h + + extern "C" { +-#define new new_w +-#define class class_w + #include <Xm/SashP.h> // XmIsSash() +-#undef class +-#undef new + } + + #endif // _DDD_Sash_h diff --git a/devel/ddd/files/patch-ddd-ScrolleGEP.h b/devel/ddd/files/patch-ddd-ScrolleGEP.h new file mode 100644 index 0000000..8d4e474 --- /dev/null +++ b/devel/ddd/files/patch-ddd-ScrolleGEP.h @@ -0,0 +1,16 @@ +--- ddd/ScrolleGEP.h.orig 2009-02-11 18:25:07.000000000 +0100 ++++ ddd/ScrolleGEP.h 2016-04-04 21:29:40.085223000 +0200 +@@ -31,13 +31,9 @@ + #include <Xm/Xm.h> + + // Superclasses +-#define new new_w +-#define class class_w + #include <Xm/XmP.h> + #include <X11/CoreP.h> + #include <Xm/ScrolledWP.h> +-#undef new +-#undef class + + #ifdef MAX + #undef MAX // <Xm/XmP.h> on HP-UX defines this diff --git a/devel/ddd/files/patch-ddd-SwallowerP.h b/devel/ddd/files/patch-ddd-SwallowerP.h new file mode 100644 index 0000000..3ab84cc8 --- /dev/null +++ b/devel/ddd/files/patch-ddd-SwallowerP.h @@ -0,0 +1,14 @@ +--- ddd/SwallowerP.h.orig 2009-02-11 18:25:07.000000000 +0100 ++++ ddd/SwallowerP.h 2016-04-04 21:29:40.084451000 +0200 +@@ -35,11 +35,7 @@ + + // Superclasses + extern "C" { +-#define new new_w +-#define class class_w + #include <X11/CoreP.h> +-#undef new +-#undef class + } + + // The Swallower class record diff --git a/devel/ddd/files/patch-ddd-converters.C b/devel/ddd/files/patch-ddd-converters.C new file mode 100644 index 0000000..2639842 --- /dev/null +++ b/devel/ddd/files/patch-ddd-converters.C @@ -0,0 +1,22 @@ +--- ddd/converters.C.orig 2009-02-11 18:25:07.000000000 +0100 ++++ ddd/converters.C 2016-04-04 21:29:40.084242000 +0200 +@@ -56,9 +56,6 @@ char converters_rcsid[] = + + #include <Xm/Xm.h> + +-#define new new_w +-#define class class_w +- + #if XmVersion < 1002 + #include <Xm/bitmaps.h> + #else +@@ -101,9 +98,6 @@ extern "C" { + #include <Xm/PrimitiveP.h> + #endif + +-#undef new +-#undef class +- + #include "converters.h" + #include "MString.h" + |