diff options
author | rillig <rillig> | 2007-10-13 18:12:40 +0000 |
---|---|---|
committer | rillig <rillig> | 2007-10-13 18:12:40 +0000 |
commit | 8e3c8b5713ecd7031213afa41870a2b53d692a44 (patch) | |
tree | fd79de5f8f4b66478ee443ff0ce4281563dfc8f7 /print | |
parent | 38774753199158038a193d6ae38cd7512f1d1358 (diff) | |
download | pkgsrc-8e3c8b5713ecd7031213afa41870a2b53d692a44.tar.gz |
Fixed some build problems.
Diffstat (limited to 'print')
-rw-r--r-- | print/cjk-lyx/distinfo | 7 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-ak | 19 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-am | 12 | ||||
-rw-r--r-- | print/cjk-lyx/patches/patch-ao | 31 |
4 files changed, 57 insertions, 12 deletions
diff --git a/print/cjk-lyx/distinfo b/print/cjk-lyx/distinfo index 5a4a4f7fd94..87143a29a94 100644 --- a/print/cjk-lyx/distinfo +++ b/print/cjk-lyx/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2006/09/19 23:35:07 joerg Exp $ +$NetBSD: distinfo,v 1.8 2007/10/13 18:12:40 rillig Exp $ SHA1 (lyx-1.2.0.tar.gz) = 56db850f316c18e00c4b10946216b6eb25107dab RMD160 (lyx-1.2.0.tar.gz) = e21eeb53517bf994938f2d89e7be585da9ff8cd3 @@ -16,7 +16,8 @@ SHA1 (patch-ag) = b1f3e8e12d667f2761206bcd4d9d0d5c450fac09 SHA1 (patch-ah) = 100b2b3d4f823a472e7c69dbd3130c830a1a6cba SHA1 (patch-ai) = 3e694cf156a527bba9155de49c3a6a9fb66af014 SHA1 (patch-aj) = 8a8e5750fe67093e748791da7b11141fcf3a0795 -SHA1 (patch-ak) = 473918c84edff55d68dc193b8eb1f07b78abbca5 +SHA1 (patch-ak) = beb9e230d33a3d6bc25212aa9ef8841d9b17d7ac SHA1 (patch-al) = a441f0925619fcc674d83c24e90d041047a71ad7 -SHA1 (patch-am) = dd8f9061b476c5c71f7a4b1ee478df4369caf510 +SHA1 (patch-am) = 88120d6a4705f9bcdac2e675dd74b83c9e270082 SHA1 (patch-an) = b39ef6b367a1e47e072d48181aa29a0b8cbcec13 +SHA1 (patch-ao) = 663016706d09b7ac8d34efab2c71d4c46e2757cd diff --git a/print/cjk-lyx/patches/patch-ak b/print/cjk-lyx/patches/patch-ak index 38b13e9f7a0..ba971a2df35 100644 --- a/print/cjk-lyx/patches/patch-ak +++ b/print/cjk-lyx/patches/patch-ak @@ -1,8 +1,17 @@ -$NetBSD: patch-ak,v 1.1 2006/09/19 23:35:07 joerg Exp $ +$NetBSD: patch-ak,v 1.2 2007/10/13 18:12:40 rillig Exp $ ---- src/graphics/GraphicsConverter.h.orig 2006-09-20 00:55:27.000000000 +0000 -+++ src/graphics/GraphicsConverter.h -@@ -60,7 +60,7 @@ private: +--- src/graphics/GraphicsConverter.h.orig 2002-03-11 22:58:05.000000000 +0000 ++++ src/graphics/GraphicsConverter.h 2007-10-13 15:28:42.000000000 +0000 +@@ -33,6 +33,8 @@ + + namespace grfx { + ++class ConvProcess; ++ + class GConverter : boost::noncopyable { + public: + +@@ -60,7 +62,7 @@ private: /** Make the c-tor private so we can control how many objects * are instantiated. */ @@ -11,7 +20,7 @@ $NetBSD: patch-ak,v 1.1 2006/09/19 23:35:07 joerg Exp $ /** Build the conversion script, returning true if able to build it. * The script is output to the ostringstream 'script'. -@@ -117,6 +117,10 @@ struct ConvProcess : public SigC::Object +@@ -117,6 +119,10 @@ struct ConvProcess : public SigC::Object SignalTypePtr on_finish_; }; diff --git a/print/cjk-lyx/patches/patch-am b/print/cjk-lyx/patches/patch-am index 773c4742349..20a7f47476c 100644 --- a/print/cjk-lyx/patches/patch-am +++ b/print/cjk-lyx/patches/patch-am @@ -1,8 +1,8 @@ -$NetBSD: patch-am,v 1.1 2006/09/19 23:35:07 joerg Exp $ +$NetBSD: patch-am,v 1.2 2007/10/13 18:12:40 rillig Exp $ ---- src/frontends/controllers/ControlInset.tmpl.orig 2006-09-20 01:05:11.000000000 +0000 -+++ src/frontends/controllers/ControlInset.tmpl -@@ -10,6 +10,7 @@ +--- 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 @@ * instantiated if this file is #included in the derived classes' .C file. */ @@ -10,3 +10,7 @@ $NetBSD: patch-am,v 1.1 2006/09/19 23:35:07 joerg Exp $ #include "ControlInset.h" #include "support/LAssert.h" #include "debug.h" ++#include "buffer.h" + + + template <class Inset, class Params> diff --git a/print/cjk-lyx/patches/patch-ao b/print/cjk-lyx/patches/patch-ao new file mode 100644 index 00000000000..a551d79709f --- /dev/null +++ b/print/cjk-lyx/patches/patch-ao @@ -0,0 +1,31 @@ +$NetBSD: patch-ao,v 1.1 2007/10/13 18:12:40 rillig Exp $ + +Defining methods is anonymous namespaces is a bad idea. + +--- src/font.C.orig 2007-10-13 16:02:27.000000000 +0000 ++++ src/font.C 2007-10-13 17:08:41.000000000 +0000 +@@ -30,7 +30,6 @@ + extern LyXCodeConv codeconverter; + #endif + +-namespace { + #ifdef I18N + XFontSet LyXFont::getXFontset() const + { +@@ -50,6 +49,7 @@ XFontStruct * getXFontstruct(LyXFont con + } + #endif + ++namespace { + inline + XID getFontID(LyXFont const & f) + { +@@ -64,7 +64,7 @@ XID getFontID(LyXFont const & f) + return f.getXFontset(); + } + #endif +-} // namespace anon ++} + + int lyxfont::maxAscent(LyXFont const & f) + { |