head	1.2;
access;
symbols
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2014.01.19.14.04.39;	author rumko;	state dead;
branches;
next	1.1;
commitid	2EYBKDPEbpUOvJlx;

1.1
date	2013.05.09.13.56.58;	author joerg;	state Exp;
branches;
next	;


desc
@@


1.2
log
@editors/lyx: update to 2.0.6

What's new in 2.0 (from upstream):
* Advanced Search Facility
* Spell-checking on the fly
* Compare Documents
* Multilingual Thesaurus
* Refstyle Support
* Multiple Indices
* New backends: XeTeX, LuaTeX, and XHTML
* Better output customization
* Produce output with only selected subdocuments included
* Outliner enhancements
* Document-specific Layout
* New supported LaTeX commands
* Languages, scripts and encodings
* Branches enhancements
* Table features
* Size features
* Progress view and debugging pane
* Color handling
* Instant preview inset
* Forward search for DVI/PDF files
* Optional and Required Arguments
* New (sub)version control features
* Generalized support for LaTeX files preprocessing
** Improved support for Noweb
** Support for Sweave
** Support for LilyPond-Book

Ok@@ wiz
@
text
@$NetBSD: patch-src_ServerSocket.cpp,v 1.1 2013/05/09 13:56:58 joerg Exp $

--- src/ServerSocket.cpp.orig	2013-05-09 12:01:41.000000000 +0000
+++ src/ServerSocket.cpp
@@@@ -39,8 +39,6 @@@@
 using namespace std;
 using namespace lyx::support;
 
-using boost::shared_ptr;
-
 namespace lyx {
 
 // Address is the unix address for the socket.
@@@@ -112,7 +110,7 @@@@ void ServerSocket::serverCallback()
 
 	// Register the new client.
 	clients[client_fd] =
-		shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
+		boost::shared_ptr<LyXDataSocket>(new LyXDataSocket(client_fd));
 	theApp()->registerSocketCallback(
 		client_fd,
 		boost::bind(&ServerSocket::dataCallback,
@@@@ -125,7 +123,7 @@@@ void ServerSocket::serverCallback()
 // if the connection has been closed
 void ServerSocket::dataCallback(int fd)
 {
-	shared_ptr<LyXDataSocket> client = clients[fd];
+	boost::shared_ptr<LyXDataSocket> client = clients[fd];
 
 	string line;
 	size_t pos;
@@@@ -191,8 +189,8 @@@@ void ServerSocket::writeln(string const 
 //	lyxerr << "ServerSocket debug dump.\n"
 //	     << "fd = " << fd_ << ", address = " << address_.absFilename() << ".\n"
 //	     << "Clients: " << clients.size() << ".\n";
-//	map<int, shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
-//	map<int, shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
+//	map<int, boost::shared_ptr<LyXDataSocket> >::const_iterator client = clients.begin();
+//	map<int, boost::shared_ptr<LyXDataSocket> >::const_iterator end = clients.end();
 //	for (; client != end; ++client)
 //		lyxerr << "fd = " << client->first << '\n';
 // }
@


1.1
log
@Allow building with libc++, where std::shared_ptr overlaps with
boost::shared_ptr.
@
text
@d1 1
a1 1
$NetBSD$
@