From 20ddbe0ca688431d0578878f097bdacd5c2a8d68 Mon Sep 17 00:00:00 2001 From: Mamoru Komachi Date: Wed, 13 Oct 2004 13:47:48 +0000 Subject: [PATCH] Added a patch to fix compile problem with gcc 3.4.2. Thanks to Ed Catmur , closing bug #67131. --- app-office/lyx/ChangeLog | 7 ++++++- app-office/lyx/Manifest | 15 +++++++++++++-- app-office/lyx/files/lyx-1.3.5-boost.patch | 17 +++++++++++++++++ app-office/lyx/lyx-1.3.5.ebuild | 3 ++- 4 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 app-office/lyx/files/lyx-1.3.5-boost.patch diff --git a/app-office/lyx/ChangeLog b/app-office/lyx/ChangeLog index baace20d343d..be871915a932 100644 --- a/app-office/lyx/ChangeLog +++ b/app-office/lyx/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-office/lyx # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.48 2004/10/10 12:32:39 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/ChangeLog,v 1.49 2004/10/13 13:47:48 usata Exp $ + + 13 Oct 2004; Mamoru KOMACHI + +files/lyx-1.3.5-boost.patch, lyx-1.3.5.ebuild: + Added a patch to fix compile problem with gcc 3.4.2. Thanks to Ed Catmur + , closing bug #67131. *lyx-1.3.5 (10 Oct 2004) diff --git a/app-office/lyx/Manifest b/app-office/lyx/Manifest index 0548cb960672..84934052d770 100644 --- a/app-office/lyx/Manifest +++ b/app-office/lyx/Manifest @@ -1,5 +1,8 @@ -MD5 6324121a9e9f2a0d3374e3dc40344323 ChangeLog 7923 -MD5 f4c372d6faa5fad1037d5903da388ba8 lyx-1.3.5.ebuild 3308 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +MD5 0a46ab8408793071a973fc4585902412 ChangeLog 8139 +MD5 d71ebb664234845c99fd4a57edd925e7 lyx-1.3.5.ebuild 3345 MD5 c472f5fd1646eb8bca71d8df5cb2bdcc metadata.xml 164 MD5 f25127a7ddcdf89a9e199787ef7d552a lyx-1.3.4.ebuild 3115 MD5 5ccd191a3dc796feeda9dcee291d2863 files/digest-lyx-1.3.5 239 @@ -8,3 +11,11 @@ MD5 b86918456f67f911e357a76308cd0fdb files/lyx-1.3.4-gcc34.patch 6589 MD5 f6bf30211847fb321f0000cd415d9e5b files/lyx-1.3.2-nomktex.patch 449 MD5 363bfca924cf46b61d21faa4dbfcd43f files/lyx-1.3.3-configure-diff 1953 MD5 4dc1e1cc2b4e056a629fbfd1334c390e files/lyx.desktop 188 +MD5 2a779b20a7425abd5eea3b5ee01698f7 files/lyx-1.3.5-boost.patch 655 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.2.6 (GNU/Linux) + +iD8DBQFBbTCxVWNWqTUmv+0RAkH2AJ9nHrkyU4OeYbAWxFWDZghVweRRrQCggrSk +s0xTzSB6izWol6t9Ex1Py2c= +=4DNS +-----END PGP SIGNATURE----- diff --git a/app-office/lyx/files/lyx-1.3.5-boost.patch b/app-office/lyx/files/lyx-1.3.5-boost.patch new file mode 100644 index 000000000000..b3fdf985f4cd --- /dev/null +++ b/app-office/lyx/files/lyx-1.3.5-boost.patch @@ -0,0 +1,17 @@ +=================================================================== +RCS file: /cvsroot/boost/boost/boost/format/feed_args.hpp,v +retrieving revision 1.10 +retrieving revision 1.11 +diff -u -r1.10 -r1.11 +--- boost/boost/boost/format/feed_args.hpp 2003/05/28 11:20:49 1.10 ++++ boost/boost/boost/format/feed_args.hpp 2003/08/27 03:24:41 1.11 +@@ -34,8 +34,7 @@ + + template inline + void empty_buf(BOOST_IO_STD basic_ostringstream & os) { +- static const std::basic_string emptyStr; // avoids 2 cases ( "" and L"" ) +- os.str(emptyStr); ++ os.str( std::basic_string() ); + } + + template diff --git a/app-office/lyx/lyx-1.3.5.ebuild b/app-office/lyx/lyx-1.3.5.ebuild index 54f75f986f34..701e49017b52 100644 --- a/app-office/lyx/lyx-1.3.5.ebuild +++ b/app-office/lyx/lyx-1.3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5.ebuild,v 1.1 2004/10/10 12:32:39 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/lyx/lyx-1.3.5.ebuild,v 1.2 2004/10/13 13:47:48 usata Exp $ inherit kde-functions eutils libtool @@ -48,6 +48,7 @@ src_unpack() { cd ${S} epatch ${FILESDIR}/${PN}-1.3.2-nomktex.patch epatch ${FILESDIR}/${PN}-1.3.3-configure-diff + epatch ${FILESDIR}/${P}-boost.patch elibtoolize || die } -- 2.26.2