Merge lp:~ubuntu-treblig/ubuntu/precise/synergy/synergy-lp908578fix-ups3063 into lp:ubuntu/precise/synergy

[Dave Gilbert]

This is a fix for lp bug 908578, imported from upstream.
It corresponds to upstream bug 3063 (see http://synergy-foss.org/tracker/issues/3063);
and upstream bug 3043 (http://synergy-foss.org/tracker/issues/3043).

What's a little tricky is that the patch in 3063 is the one that's been applied upstream,
yet the original patch writer in bug 3063 agrees that that the fix in 3043 is better - so
that's the one I picked; it seems to work for me.

[lp:~ubuntu-treblig/ubuntu/precise/synergy/synergy-lp908578fix-ups3063]

21. By Dave Gilbert on 2011-12-25

Add Dep3 tags

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-04 18:58:04 +0000
+++ debian/changelog	2011-12-25 23:49:24 +0000
@@ -1,3 +1,12 @@
+synergy (1.3.8-1ubuntu1) precise; urgency=low
+
+  * Import Feng Ye's patch from
+    http://synergy-foss.org/tracker/issues/3043 as a fix for upstream 3063
+    (original patcher in 3063 agreed 3043 fix was better, although the fix in
+    3063 is currently in upstream). LP: #908578
+
+ -- Dr. David Alan Gilbert <[e-mail]>  Sun, 25 Dec 2011 19:54:36 +0000
+
 synergy (1.3.8-1) unstable; urgency=low
 
   * New upstream version.
 
=== added file 'debian/patches/FengYeIArchString-InitMutex.patch'
--- debian/patches/FengYeIArchString-InitMutex.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/FengYeIArchString-InitMutex.patch	2011-12-25 23:49:24 +0000
@@ -0,0 +1,51 @@
+Description: Initialise mutex to avoid seg on paste, picked the
+ fix from upstream issue 3043, although the one currently in upstream
+ vcs is from issue 3063 since the author of the patch in 3063 said
+ this one was better.
+Origin: http://synergy-foss.org/tracker/issues/3043
+Bug: http://synergy-foss.org/tracker/issues/3063
+
+Index: src/lib/arch/IArchString.h
+===================================================================
+--- old/src/lib/arch/IArchString.h	(revision 1134)
++++ new/src/lib/arch/IArchString.h	(working copy)
+@@ -31,6 +31,8 @@
+ public:
+ 	virtual ~IArchString();
+ 
++	void initMutex();
++
+ 	//! Wide character encodings
+ 	/*!
+ 	The known wide character encodings
+Index: src/lib/arch/IArchString.cpp
+===================================================================
+--- old/src/lib/arch/IArchString.cpp	(revision 1134)
++++ new/src/lib/arch/IArchString.cpp	(working copy)
+@@ -36,6 +36,13 @@
+ 	}
+ }
+ 
++void IArchString::initMutex()
++{
++        if (s_mutex == NULL) {
++		s_mutex = ARCH->newMutex();
++        }
++}
++
+ int
+ IArchString::convStringWCToMB(char* dst,
+ 				const wchar_t* src, UInt32 n, bool* errors)
+Index: src/lib/arch/CArch.cpp
+===================================================================
+--- old/src/lib/arch/CArch.cpp	(revision 1134)
++++ new/src/lib/arch/CArch.cpp	(working copy)
+@@ -129,6 +129,8 @@
+ 	m_daemon  = new ARCH_DAEMON;
+ 	m_taskbar = new ARCH_TASKBAR(args);
+ 
++	m_string->initMutex();
++
+ #if SYSAPI_WIN32
+ 	CArchMiscWindows::init();
+ #endif
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-12-04 18:58:04 +0000
+++ debian/patches/series	2011-12-25 23:49:24 +0000
@@ -1,1 +1,2 @@
 gnome3.patch
+FengYeIArchString-InitMutex.patch