Thu Dec 29 16:35:42 2011 UTC ()
Just make the template implementation availabe all the time. C++
compilers are supposed to know how to use COMDAT.


(joerg)
diff -r1.9 -r1.10 pkgsrc/print/cjk-lyx/distinfo
diff -r1.2 -r1.3 pkgsrc/print/cjk-lyx/patches/patch-am
cvs diff -r1.9 -r1.10 pkgsrc/print/cjk-lyx/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/print/cjk-lyx/Attic/distinfo 2011/11/25 22:16:26 1.9
+++ pkgsrc/print/cjk-lyx/Attic/distinfo 2011/12/29 16:35:41 1.10
@@ -1,29 +1,30 @@ @@ -1,29 +1,30 @@
1$NetBSD: distinfo,v 1.9 2011/11/25 22:16:26 joerg Exp $ 1$NetBSD: distinfo,v 1.10 2011/12/29 16:35:41 joerg Exp $
2 2
3SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab 3SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab
4RMD160 (lyx-1.2.0.tar.gz) = e21eeb53517bf994938f2d89e7be585da9ff8cd3 4RMD160 (lyx-1.2.0.tar.gz) = e21eeb53517bf994938f2d89e7be585da9ff8cd3
5Size (lyx-1.2.0.tar.gz) = 6418424 bytes 5Size (lyx-1.2.0.tar.gz) = 6418424 bytes
6SHA1 (CJK-LyX-1.2.0-patch) = d84540cd832f68d79fadf7f4527f84b55660adee 6SHA1 (CJK-LyX-1.2.0-patch) = d84540cd832f68d79fadf7f4527f84b55660adee
7RMD160 (CJK-LyX-1.2.0-patch) = 05e2ec70ab5d4d7dbac0c117e606e51fb0cba601 7RMD160 (CJK-LyX-1.2.0-patch) = 05e2ec70ab5d4d7dbac0c117e606e51fb0cba601
8Size (CJK-LyX-1.2.0-patch) = 126189 bytes 8Size (CJK-LyX-1.2.0-patch) = 126189 bytes
9SHA1 (patch-aa) = 3c020c72d8ac850ebb76c5ff65d546e8cfd9b587 9SHA1 (patch-aa) = 3c020c72d8ac850ebb76c5ff65d546e8cfd9b587
10SHA1 (patch-ab) = 48faac82be2a99d7801e751e13a602622817fbc6 10SHA1 (patch-ab) = 48faac82be2a99d7801e751e13a602622817fbc6
11SHA1 (patch-ac) = a7770d4a60e3c634f37fd283b43de9bbdb8f05b6 11SHA1 (patch-ac) = a7770d4a60e3c634f37fd283b43de9bbdb8f05b6
12SHA1 (patch-ad) = 48cb4ee6bfee21ee981db52d20e34c8e23316928 12SHA1 (patch-ad) = 48cb4ee6bfee21ee981db52d20e34c8e23316928
13SHA1 (patch-ae) = 5b744b75ac59a4f47fd3d02fe0a4b9ce551a39b7 13SHA1 (patch-ae) = 5b744b75ac59a4f47fd3d02fe0a4b9ce551a39b7
14SHA1 (patch-af) = f09bdf2b9e8da14e9b58b683ab40e89775344ec3 14SHA1 (patch-af) = f09bdf2b9e8da14e9b58b683ab40e89775344ec3
15SHA1 (patch-ag) = b1f3e8e12d667f2761206bcd4d9d0d5c450fac09 15SHA1 (patch-ag) = b1f3e8e12d667f2761206bcd4d9d0d5c450fac09
16SHA1 (patch-ah) = 100b2b3d4f823a472e7c69dbd3130c830a1a6cba 16SHA1 (patch-ah) = 100b2b3d4f823a472e7c69dbd3130c830a1a6cba
17SHA1 (patch-ai) = 3e694cf156a527bba9155de49c3a6a9fb66af014 17SHA1 (patch-ai) = 3e694cf156a527bba9155de49c3a6a9fb66af014
18SHA1 (patch-aj) = 8a8e5750fe67093e748791da7b11141fcf3a0795 18SHA1 (patch-aj) = 8a8e5750fe67093e748791da7b11141fcf3a0795
19SHA1 (patch-ak) = beb9e230d33a3d6bc25212aa9ef8841d9b17d7ac 19SHA1 (patch-ak) = beb9e230d33a3d6bc25212aa9ef8841d9b17d7ac
20SHA1 (patch-al) = a441f0925619fcc674d83c24e90d041047a71ad7 20SHA1 (patch-al) = a441f0925619fcc674d83c24e90d041047a71ad7
21SHA1 (patch-am) = 88120d6a4705f9bcdac2e675dd74b83c9e270082 21SHA1 (patch-am) = abf7427e2fbf918bb30006f9a524dc16fc12e08f
22SHA1 (patch-an) = b39ef6b367a1e47e072d48181aa29a0b8cbcec13 22SHA1 (patch-an) = b39ef6b367a1e47e072d48181aa29a0b8cbcec13
23SHA1 (patch-ao) = 663016706d09b7ac8d34efab2c71d4c46e2757cd 23SHA1 (patch-ao) = 663016706d09b7ac8d34efab2c71d4c46e2757cd
 24SHA1 (patch-src_frontends_controllers_ControlInset.h) = f2f8eab52fbbf871ad7518e607b85255839bd965
24SHA1 (patch-src_frontends_controllers_helper__funcs.h) = 03b1f40d5ad9c686dd58b2170aa50bc18a7dedae 25SHA1 (patch-src_frontends_controllers_helper__funcs.h) = 03b1f40d5ad9c686dd58b2170aa50bc18a7dedae
25SHA1 (patch-src_frontends_xforms_FormMathsMatrix.C) = 63e1003ebc15be07556ff2f0fcc6aa26ee207fd6 26SHA1 (patch-src_frontends_xforms_FormMathsMatrix.C) = 63e1003ebc15be07556ff2f0fcc6aa26ee207fd6
26SHA1 (patch-src_mathed_math__xdata.C) = e0d51e11a5fa2c2a29e5ce95ed0b4dd11abd5c0a 27SHA1 (patch-src_mathed_math__xdata.C) = e0d51e11a5fa2c2a29e5ce95ed0b4dd11abd5c0a
27SHA1 (patch-src_support_LSubstring.C) = 51d8d547681c26fbee6f6f04a10e4b4ff8864417 28SHA1 (patch-src_support_LSubstring.C) = 51d8d547681c26fbee6f6f04a10e4b4ff8864417
28SHA1 (patch-src_support_forkedcontr.C) = d2068c100e7e068fc21f51a4789beb735cf2332b 29SHA1 (patch-src_support_forkedcontr.C) = d2068c100e7e068fc21f51a4789beb735cf2332b
29SHA1 (patch-src_support_lstrings.h) = 846087a2c5e6759ee3086d295ba3bb93e56df3ad 30SHA1 (patch-src_support_lstrings.h) = 846087a2c5e6759ee3086d295ba3bb93e56df3ad
cvs diff -r1.2 -r1.3 pkgsrc/print/cjk-lyx/patches/Attic/patch-am (expand / switch to unified diff)

--- pkgsrc/print/cjk-lyx/patches/Attic/patch-am 2007/10/13 18:12:40 1.2
+++ pkgsrc/print/cjk-lyx/patches/Attic/patch-am 2011/12/29 16:35:42 1.3
@@ -1,16 +1,25 @@ @@ -1,16 +1,25 @@
1$NetBSD: patch-am,v 1.2 2007/10/13 18:12:40 rillig Exp $ 1$NetBSD: patch-am,v 1.3 2011/12/29 16:35:42 joerg Exp $
2 2
3--- src/frontends/controllers/ControlInset.tmpl.orig 2002-01-16 14:47:57.000000000 +0000 3--- src/frontends/controllers/ControlInset.tmpl.orig 2002-01-16 14:47:57.000000000 +0000
4+++ src/frontends/controllers/ControlInset.tmpl 2007-10-13 16:02:27.000000000 +0000 4+++ src/frontends/controllers/ControlInset.tmpl 2007-10-13 16:02:27.000000000 +0000
5@@ -10,9 +10,11 @@ 5@@ -10,9 +10,14 @@
6 * instantiated if this file is #included in the derived classes' .C file. 6 * instantiated if this file is #included in the derived classes' .C file.
7 */ 7 */
8  8
 9+#ifndef CONTROLINSET_TMPL
 10+#define CONTROLINSET_TMPL
 11+
9+#include "LyXView.h" 12+#include "LyXView.h"
10 #include "ControlInset.h" 13 #include "ControlInset.h"
11 #include "support/LAssert.h" 14 #include "support/LAssert.h"
12 #include "debug.h"  15 #include "debug.h"
13+#include "buffer.h" 16+#include "buffer.h"
14  17
15  18
16 template <class Inset, class Params> 19 template <class Inset, class Params>
 20@@ -183,3 +188,5 @@ void ControlInset<Inset, Params>::connec
 21 }
 22 connect();
 23 }
 24+
 25+#endif