diff options
| author | joerg <joerg@pkgsrc.org> | 2011-12-29 16:35:41 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2011-12-29 16:35:41 +0000 |
| commit | b0bb70ca221c13ce1befa2b0be6d88fb0e69c05a (patch) | |
| tree | 05d4056a3d1e9eaf0e133dc9d3d8ce689ffc356a /print | |
| parent | 3e565f611a952db09342bcc635595a87df1cb8fe (diff) | |
| download | pkgsrc-b0bb70ca221c13ce1befa2b0be6d88fb0e69c05a.tar.gz | |
Just make the template implementation availabe all the time. C++
compilers are supposed to know how to use COMDAT.
Diffstat (limited to 'print')
| -rw-r--r-- | print/cjk-lyx/distinfo | 5 | ||||
| -rw-r--r-- | print/cjk-lyx/patches/patch-am | 13 | ||||
| -rw-r--r-- | print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h | 11 |
3 files changed, 25 insertions, 4 deletions
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo index 2eb0f6ed6d7..c4e539f1dc2 100644 --- a/print/cjk-lyx/distinfo +++ b/print/cjk-lyx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2011/11/25 22:16:26 joerg Exp $ +$NetBSD: distinfo,v 1.10 2011/12/29 16:35:41 joerg Exp $ SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab RMD160 (lyx-1.2.0.tar.gz) = e21eeb53517bf994938f2d89e7be585da9ff8cd3 @@ -18,9 +18,10 @@ SHA1 (patch-ai) = 3e694cf156a527bba9155de49c3a6a9fb66af014 SHA1 (patch-aj) = 8a8e5750fe67093e748791da7b11141fcf3a0795 SHA1 (patch-ak) = beb9e230d33a3d6bc25212aa9ef8841d9b17d7ac SHA1 (patch-al) = a441f0925619fcc674d83c24e90d041047a71ad7 -SHA1 (patch-am) = 88120d6a4705f9bcdac2e675dd74b83c9e270082 +SHA1 (patch-am) = abf7427e2fbf918bb30006f9a524dc16fc12e08f SHA1 (patch-an) = b39ef6b367a1e47e072d48181aa29a0b8cbcec13 SHA1 (patch-ao) = 663016706d09b7ac8d34efab2c71d4c46e2757cd +SHA1 (patch-src_frontends_controllers_ControlInset.h) = f2f8eab52fbbf871ad7518e607b85255839bd965 SHA1 (patch-src_frontends_controllers_helper__funcs.h) = 03b1f40d5ad9c686dd58b2170aa50bc18a7dedae SHA1 (patch-src_frontends_xforms_FormMathsMatrix.C) = 63e1003ebc15be07556ff2f0fcc6aa26ee207fd6 SHA1 (patch-src_mathed_math__xdata.C) = e0d51e11a5fa2c2a29e5ce95ed0b4dd11abd5c0a diff --git a/print/cjk-lyx/patches/patch-am b/print/cjk-lyx/patches/patch-am index 20a7f47476c..ec1a9099b51 100644 --- a/print/cjk-lyx/patches/patch-am +++ b/print/cjk-lyx/patches/patch-am @@ -1,11 +1,14 @@ -$NetBSD: patch-am,v 1.2 2007/10/13 18:12:40 rillig Exp $ +$NetBSD: patch-am,v 1.3 2011/12/29 16:35:42 joerg Exp $ --- src/frontends/controllers/ControlInset.tmpl.orig 2002-01-16 14:47:57.000000000 +0000 +++ src/frontends/controllers/ControlInset.tmpl 2007-10-13 16:02:27.000000000 +0000 -@@ -10,9 +10,11 @@ +@@ -10,9 +10,14 @@ * instantiated if this file is #included in the derived classes' .C file. */ ++#ifndef CONTROLINSET_TMPL ++#define CONTROLINSET_TMPL ++ +#include "LyXView.h" #include "ControlInset.h" #include "support/LAssert.h" @@ -14,3 +17,9 @@ $NetBSD: patch-am,v 1.2 2007/10/13 18:12:40 rillig Exp $ template <class Inset, class Params> +@@ -183,3 +188,5 @@ void ControlInset<Inset, Params>::connec + } + connect(); + } ++ ++#endif diff --git a/print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h b/print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h new file mode 100644 index 00000000000..1de9201934e --- /dev/null +++ b/print/cjk-lyx/patches/patch-src_frontends_controllers_ControlInset.h @@ -0,0 +1,11 @@ +$NetBSD: patch-src_frontends_controllers_ControlInset.h,v 1.1 2011/12/29 16:36:37 joerg Exp $ + +--- src/frontends/controllers/ControlInset.h.orig 2011-12-29 13:27:08.000000000 +0000 ++++ src/frontends/controllers/ControlInset.h +@@ -105,5 +105,6 @@ private: + + }; + ++#include "ControlInset.tmpl" + + #endif // CONTROLINSET_H |