Updated lyx-qt and lyx-xforms to 1.3.5

This is mainly a bugfix release, with few notable user-visible
improvements. However, we would like to highlight two fixes in particular:

* Nested documents (with Insert>Include File...), which have been
  broken since LyX 1.2.0, should now work properly, including the
  case where the files are in different directories.

* It is now possible to compile LyX with gcc 3.4.

11 files changed, 25 insertions, 193 deletions

diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile
index ab4b727b7d8..b9f6932613d 100644
--- a/editors/lyx-qt/Makefile
+++ b/editors/lyx-qt/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.15 2004/10/03 00:14:38 tv Exp $
+# $NetBSD: Makefile,v 1.16 2004/12/21 07:00:52 martti Exp $
 #
 
 .include "./Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-qt-/}
-PKGREVISION=	5
+#PKGREVISION=	1
 
 COMMENT+=	(QT version)
 
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index a72a063915e..70e8c99b83e 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2004/11/13 22:04:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.21 2004/12/21 07:00:52 martti Exp $
 #
 
-DISTNAME=		lyx-1.3.4
+DISTNAME=		lyx-1.3.5
 CATEGORIES=		editors
 MASTER_SITES=		ftp://ftp.lyx.org/pub/lyx/stable/ \
 			ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/ \
@@ -21,6 +21,8 @@ FILESDIR=		${.CURDIR}/../../editors/lyx-qt/files
 PATCHDIR=		${.CURDIR}/../../editors/lyx-qt/patches
 PLIST_SRC=		${.CURDIR}/../../editors/lyx-qt/PLIST.common
 
+UNLIMIT_RESOURCES+=	datasize
+
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
diff --git a/editors/lyx-qt/PLIST.common b/editors/lyx-qt/PLIST.common
index a9417a3b68b..25396a92e9c 100644
--- a/editors/lyx-qt/PLIST.common
+++ b/editors/lyx-qt/PLIST.common
@@ -1,9 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2004/03/17 15:52:37 martti Exp $
-bin/lyx
-bin/noweb2lyx
-bin/reLyX
-man/man1/lyx.1
-man/man1/reLyX.1
+@comment $NetBSD: PLIST.common,v 1.5 2004/12/21 07:00:52 martti Exp $
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/lyx.mo
@@ -19,6 +14,11 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/lyx.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/lyx.mo
+bin/lyx
+bin/noweb2lyx
+bin/reLyX
+man/man1/lyx.1
+man/man1/reLyX.1
 share/lyx/CREDITS
 share/lyx/bind/aqua.bind
 share/lyx/bind/broadway.bind
@@ -30,6 +30,7 @@ share/lyx/bind/fi_menus.bind
 share/lyx/bind/greekkeys.bind
 share/lyx/bind/hollywood.bind
 share/lyx/bind/latinkeys.bind
+share/lyx/bind/mac.bind
 share/lyx/bind/math.bind
 share/lyx/bind/menus.bind
 share/lyx/bind/pt_menus.bind
@@ -67,7 +68,9 @@ share/lyx/doc/es_Intro.lyx
 share/lyx/doc/es_TOC.lyx
 share/lyx/doc/es_Tutorial.lyx
 share/lyx/doc/escher-lsd.eps
+share/lyx/doc/eu_Customization.lyx
 share/lyx/doc/eu_Extended.lyx
+share/lyx/doc/eu_FAQ.lyx
 share/lyx/doc/eu_Intro.lyx
 share/lyx/doc/eu_TOC.lyx
 share/lyx/doc/eu_Tutorial.lyx
@@ -105,7 +108,6 @@ share/lyx/doc/pt_TOC.lyx
 share/lyx/doc/pt_Tutorial.lyx
 share/lyx/doc/ro_Intro.lyx
 share/lyx/doc/ro_TOC.lyx
-share/lyx/doc/ro_splash.lyx
 share/lyx/doc/ru_FAQ.lyx
 share/lyx/doc/ru_Intro.lyx
 share/lyx/doc/ru_TOC.lyx
@@ -182,6 +184,7 @@ share/lyx/examples/nl_voorbeeld_verlyxt.lyx
 share/lyx/examples/noweb2lyx.lyx
 share/lyx/examples/pl_splash.lyx
 share/lyx/examples/pt_splash.lyx
+share/lyx/examples/ro_splash.lyx
 share/lyx/examples/ru_splash.lyx
 share/lyx/examples/script_form.lyx
 share/lyx/examples/sl_primer_lyxan.lyx
@@ -838,6 +841,7 @@ share/lyx/layouts/stdsections.inc
 share/lyx/layouts/stdstarsections.inc
 share/lyx/layouts/stdstruct.inc
 share/lyx/layouts/stdtitle.inc
+share/lyx/layouts/svglobal.layout
 share/lyx/layouts/svjog.layout
 share/lyx/layouts/svjour.inc
 share/lyx/layouts/svprobth.layout
@@ -881,7 +885,7 @@ share/lyx/scripts/fen2ascii.py
 share/lyx/scripts/fig2pstex.py
 share/lyx/scripts/general_command_wrapper.py
 share/lyx/scripts/listerrors
-share/lyx/scripts/lyxpreview2bitmap.sh
+share/lyx/scripts/lyxpreview2ppm.py
 share/lyx/scripts/pic2ascii.py
 share/lyx/scripts/pic2png_eps.py
 share/lyx/scripts/pic2png_eps.sh
diff --git a/editors/lyx-qt/distinfo b/editors/lyx-qt/distinfo
index 6ce7a64eb72..45d943e3f48 100644
--- a/editors/lyx-qt/distinfo
+++ b/editors/lyx-qt/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.5 2004/05/29 11:19:59 shannonjr Exp $
+$NetBSD: distinfo,v 1.6 2004/12/21 07:00:52 martti Exp $
 
-SHA1 (lyx-1.3.4.tar.gz) = d44561a3f449ca2008282823ad18a79e2a815ac3
-Size (lyx-1.3.4.tar.gz) = 7333077 bytes
+SHA1 (lyx-1.3.5.tar.gz) = b654eff87339019702306c3aec8da8aa8058d386
+Size (lyx-1.3.5.tar.gz) = 7412737 bytes
 SHA1 (patch-aa) = 90a09a1adbb899cbaf063d4d7f46dc77f78a62da
-SHA1 (patch-ab) = ccbbd8ff80b66133a7355e463e6f13530d63ece8
-SHA1 (patch-ac) = 7f7fd36f492acfea16fdc8cd5e3b1716fdecd7dd
-SHA1 (patch-ad) = df1df52449c9ce73a74c9b059a62f59e973fe0ed
-SHA1 (patch-ae) = 380d5d339def961dd256aa367ac24632bab879c0
 SHA1 (patch-af) = dfd91bf21ccb7310e7ab8f62425e65efacba87a7
-SHA1 (patch-ag) = a4b4dbd065ff20d4d5c10cad5c3894b13977bcd1
-SHA1 (patch-ah) = d6cabb13c0a8522756c068171db66ff7452aeb94
+SHA1 (patch-ah) = 278f5deaf94c1082b755af3cb9511bc2f68231ba
diff --git a/editors/lyx-qt/patches/patch-ab b/editors/lyx-qt/patches/patch-ab
deleted file mode 100644
index f815e5ca789..00000000000
--- a/editors/lyx-qt/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2004/05/29 11:19:59 shannonjr Exp $
-
---- ./src/BoostFormat.h.orig    2002-11-25 12:44:44.000000000 -0700
-+++ ./src/BoostFormat.h
-@@ -15,7 +15,7 @@ namespace boost
- {
-
- extern
--template basic_format<char>;
-+template class basic_format<char>;
-
- extern template
- std::ostream &
diff --git a/editors/lyx-qt/patches/patch-ac b/editors/lyx-qt/patches/patch-ac
deleted file mode 100644
index 5c206784c3f..00000000000
--- a/editors/lyx-qt/patches/patch-ac
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/05/29 11:19:59 shannonjr Exp $
-
---- src/frontends/controllers/ControlDialog.tmpl.orig	2004-05-29 04:23:23.000000000 -0600
-+++ src/frontends/controllers/ControlDialog.tmpl
-@@ -4,7 +4,7 @@
-  * This file is part of LyX, the document processor.
-  * Licence details can be found in the file COPYING.
-  *
-- * \author Angus Leeming 
-+ * \author Angus Leeming
-  *
-  * Full author contact details are available in file CREDITS
-  *
-@@ -27,54 +27,56 @@ ControlDialog<Base>::ControlDialog(LyXVi
- template <class Base>
- void ControlDialog<Base>::show()
- {
--	if (isBufferDependent() && !bufferIsAvailable())
-+	if (this->isBufferDependent() && !this->bufferIsAvailable())
- 		return;
- 
--	connect();
-+	this->connect();
- 
- 	if (!dialog_built_) {
--		view().build();
-+		this->view().build();
- 		dialog_built_ = true;
- 	}
- 
- 	setParams();
--	if (emergency_exit_) {
-+	if (this->emergency_exit_) {
- 		hide();
- 		return;
- 	}
- 
--	bc().readOnly(bufferIsReadonly());
--	view().show();
-+	this->bc().readOnly(this->bufferIsReadonly());
-+	this->view().show();
- 
- 	// The widgets may not be valid, so refresh the button controller
--	bc().refresh();
-+	this->bc().refresh();
- }
- 
-+
- template <class Base>
- void ControlDialog<Base>::update()
- {
--	if (isBufferDependent() && !bufferIsAvailable())
-+	if (this->isBufferDependent() && !this->bufferIsAvailable())
- 		return;
- 
- 	setParams();
--	if (emergency_exit_) {
-+	if (this->emergency_exit_) {
- 		hide();
- 		return;
- 	}
- 
--	bc().readOnly(bufferIsReadonly());
--	view().update();
-+	this->bc().readOnly(this->bufferIsReadonly());
-+	this->view().update();
- 
- 	// The widgets may not be valid, so refresh the button controller
--	bc().refresh();
-+	this->bc().refresh();
- }
- 
-+
- template <class Base>
- void ControlDialog<Base>::hide()
- {
--	emergency_exit_ = false;
-+	this->emergency_exit_ = false;
- 	clearParams();
- 
--	disconnect();
--	view().hide();
-+	this->disconnect();
-+	this->view().hide();
- }
diff --git a/editors/lyx-qt/patches/patch-ad b/editors/lyx-qt/patches/patch-ad
deleted file mode 100644
index cc8c733b84f..00000000000
--- a/editors/lyx-qt/patches/patch-ad
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2004/05/29 11:19:59 shannonjr Exp $
-
---- src/frontends/xforms/FormBase.h.orig	2003-02-01 17:48:38.000000000 -0700
-+++ src/frontends/xforms/FormBase.h
-@@ -188,14 +188,14 @@ FormCB<Controller, Base>::FormCB(string 
- template <class Controller, class Base>
- Controller & FormCB<Controller, Base>::controller()
- {
--	return static_cast<Controller &>(getController());
-+	return static_cast<Controller &>(this->getController());
- }
- 
- 
- template <class Controller, class Base>
- Controller const & FormCB<Controller, Base>::controller() const
- {
--	return static_cast<Controller const &>(getController());
-+	return static_cast<Controller const &>(this->getController());
- }
- 
- 
diff --git a/editors/lyx-qt/patches/patch-ae b/editors/lyx-qt/patches/patch-ae
deleted file mode 100644
index eee7c8dcd21..00000000000
--- a/editors/lyx-qt/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/05/29 11:19:59 shannonjr Exp $
-
---- ./src/frontends/qt2/Qt2Base.h.orig	2003-02-01 17:48:38.000000000 -0700
-+++ ./src/frontends/qt2/Qt2Base.h
-@@ -174,14 +174,14 @@ Qt2CB<Controller, Base>::Qt2CB(QString c
- template <class Controller, class Base>
- Controller & Qt2CB<Controller, Base>::controller()
- {
--	return static_cast<Controller &>(getController());
-+       return static_cast<Controller &>(this->getController());
- }
- 
- 
- template <class Controller, class Base>
- Controller const & Qt2CB<Controller, Base>::controller() const
- {
--	return static_cast<Controller const &>(getController());
-+       return static_cast<Controller const &>(this->getController());
- }
- 
- 
diff --git a/editors/lyx-qt/patches/patch-ag b/editors/lyx-qt/patches/patch-ag
deleted file mode 100644
index 58f19d26c95..00000000000
--- a/editors/lyx-qt/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2004/05/29 11:19:59 shannonjr Exp $
-
---- ./boost/boost/format/format_implementation.hpp.orig	2002-11-21 11:33:01.000000000 -0700
-+++ ./boost/boost/format/format_implementation.hpp
-@@ -151,7 +151,7 @@ basic_format<Ch,Tr>& basic_format<Ch,Tr>
- {
-     if(argN<1 || argN > num_args_ || bound_.size()==0 || !bound_[argN-1] )
-       {
--	if( exceptions() & out_of_range_bit )
-+       if( exceptions() & io::out_of_range_bit )
- 	  boost::throw_exception(io::out_of_range()); // arg not in range.
- 	else return *this;
-       }
diff --git a/editors/lyx-qt/patches/patch-ah b/editors/lyx-qt/patches/patch-ah
index 7c23b1e03ad..575e56f9ed1 100644
--- a/editors/lyx-qt/patches/patch-ah
+++ b/editors/lyx-qt/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2004/05/29 11:19:59 shannonjr Exp $
+$NetBSD: patch-ah,v 1.2 2004/12/21 07:00:53 martti Exp $
 
 --- ./boost/boost/config/compiler/gcc.hpp.orig	2003-05-26 08:27:34.000000000 -0600
 +++ ./boost/boost/config/compiler/gcc.hpp
@@ -79,19 +79,3 @@ $NetBSD: patch-ah,v 1.1 2004/05/29 11:19:59 shannonjr Exp $
  
  //
  // versions check:
-@@ -49,11 +84,13 @@
- #  error "Compiler not configured - please reconfigure"
- #endif
- //
--// last known and checked version is 3.2:
--#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 3))
-+// last known and checked version is 3.4:
-+#if (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 4))
- #  if defined(BOOST_ASSERT_CONFIG)
- #     error "Unknown compiler version - please run the configure tests and report the results"
- #  else
- #     warning "Unknown compiler version - please run the configure tests and report the results"
- #  endif
- #endif
-+
-+
diff --git a/editors/lyx-xforms/Makefile b/editors/lyx-xforms/Makefile
index d8cb778fa1e..94b87371c28 100644
--- a/editors/lyx-xforms/Makefile
+++ b/editors/lyx-xforms/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2004/10/03 00:14:38 tv Exp $
+# $NetBSD: Makefile,v 1.11 2004/12/21 07:00:53 martti Exp $
 #
 
 .include "../lyx-qt/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/lyx-/lyx-xforms-/}
-PKGREVISION=	4
+#PKGREVISION=	1
 
 COMMENT+=	(xforms version)