Bug#812303: synergy: diff for NMU version 1.4.16-1.1

[Arturo Borrero Gonzalez]

On Mon, 24 Oct 2016 00:33:44 -0500 Joshua Honeycutt
 wrote:
> Control: tags 812303 + patch
> Control: tags 812303 + pending
>
> Dear maintainer,
>
> I've prepared an NMU for synergy (versioned as 1.4.16-1.1) and
> uploaded it to DELAYED/2. Please feel free to tell me if I
> should delay it longer.
>
> Regards.

Hi,

ping me if you need sponsor for this upload.

best regards.

Bug#812303: synergy: diff for NMU version 1.4.16-1.1

[Joshua Honeycutt]

Control: tags 812303 + patch
Control: tags 812303 + pending

Dear maintainer,

I've prepared an NMU for synergy (versioned as 1.4.16-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

Regards.
diff -Nru synergy-1.4.16/debian/changelog synergy-1.4.16/debian/changelog
--- synergy-1.4.16/debian/changelog	2014-03-16 17:58:42.0 -0500
+++ synergy-1.4.16/debian/changelog	2016-10-23 23:54:38.0 -0500
@@ -1,3 +1,11 @@
+synergy (1.4.16-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Added debian_google-test.patch to build against Debian's
+google-mock and libgtest-dev packages. Closes: #812303
+
+ -- Joshua Honeycutt   Sun, 23 Oct 2016 23:36:22 -0500
+
 synergy (1.4.16-1) unstable; urgency=low
 
   * New upstream version.
diff -Nru synergy-1.4.16/debian/control synergy-1.4.16/debian/control
--- synergy-1.4.16/debian/control	2014-03-16 12:10:31.0 -0500
+++ synergy-1.4.16/debian/control	2016-10-24 00:06:26.0 -0500
@@ -5,7 +5,7 @@
 Homepage: http://synergy-foss.org/
 Vcs-Git: http://git.licquia.org/raw/synergy-debian.git
 Vcs-Browser: http://git.licquia.org/?p=synergy-debian.git;a=summary
-Build-Depends: debhelper (>= 7), libxt-dev, libxtst-dev, libxinerama-dev, cmake, docbook-utils, libcrypto++-dev, pkg-config, libqt4-dev, libcurl4-gnutls-dev | libcurl-dev
+Build-Depends: debhelper (>= 7), libxt-dev, libxtst-dev, libxinerama-dev, cmake, docbook-utils, libcrypto++-dev, pkg-config, libqt4-dev, libcurl4-gnutls-dev | libcurl-dev, google-mock, libgtest-dev
 Standards-Version: 3.9.5
 
 Package: synergy
diff -Nru synergy-1.4.16/debian/patches/debian_google-test.patch synergy-1.4.16/debian/patches/debian_google-test.patch
--- synergy-1.4.16/debian/patches/debian_google-test.patch	1969-12-31 18:00:00.0 -0600
+++ synergy-1.4.16/debian/patches/debian_google-test.patch	2016-10-23 23:55:18.0 -0500
@@ -0,0 +1,48 @@
+Description: Builds against Debian packaged google-mock
+ and libgtest-dev
+Author: Joshua Honeycutt 
+Forwarded: not-needed
+Last-Update: 2016-10-23
+
+--- a/src/test/CMakeLists.txt
 b/src/test/CMakeLists.txt
+@@ -15,13 +15,11 @@
+ # along with this program.  If not, see .
+ 
+ include_directories(
+-	../../tools/gtest-1.6.0
+-	../../tools/gtest-1.6.0/include
+-	../../tools/gmock-1.6.0
+-	../../tools/gmock-1.6.0/include)
++	/usr/src/gtest
++	/usr/src/gmock)
+ 	
+-add_library(gtest STATIC ../../tools/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../tools/gmock-1.6.0/src/gmock-all.cc)
++add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc)
++add_library(gmock STATIC /usr/src/gmock/src/gmock-all.cc)
+ 
+ add_subdirectory(integtests)
+ add_subdirectory(unittests)
+--- a/src/test/integtests/CMakeLists.txt
 b/src/test/integtests/CMakeLists.txt
+@@ -72,8 +72,6 @@
+ 	../../lib/synergy
+ 	../../lib/synwinhk
+ 	../../lib/synwinxt
+-	../../../tools/gtest-1.6.0/include
+-	../../../tools/gmock-1.6.0/include
+ 	../unittests
+ )
+ 
+--- a/src/test/unittests/CMakeLists.txt
 b/src/test/unittests/CMakeLists.txt
+@@ -49,8 +49,6 @@
+ 	../../lib/net
+ 	../../lib/platform
+ 	../../lib/synergy
+-	../../../tools/gtest-1.6.0/include
+-	../../../tools/gmock-1.6.0/include
+ 	../../../tools
+ 	io
+ 	synergy
diff -Nru synergy-1.4.16/debian/patches/series synergy-1.4.16/debian/patches/series
--- synergy-1.4.16/debian/patches/series	2014-03-16 15:13:23.0 -0500
+++ synergy-1.4.16/debian/patches/series	2016-10-23 23:18:36.0 -0500
@@ -1,3 +1,4 @@
+debian_google-test.patch
 system-cryptopp.patch
 cprotocolutil-writef.patch
 versioncheck-disable.patch

Bug#812303:

[Joshua Honeycutt]

This is an issue with the gmock-1.6.0 and gtest-1.6.0 test suite. I have
created a patch to build against Debian's google-mock and libgtest-dev
packages instead which will fix the issue. This also requires synergy's
build dependencies to be updated to depend on google-mock and
libgtest-dev.

I intend to do a NMU for this fix.
Description: Builds against Debian packaged google-mock
 and libgtest-dev
Author: Joshua Honeycutt 
Forwarded: not-needed
Last-Update: 2016-10-23

--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,13 +15,11 @@
 # along with this program.  If not, see .
 
 include_directories(
-	../../tools/gtest-1.6.0
-	../../tools/gtest-1.6.0/include
-	../../tools/gmock-1.6.0
-	../../tools/gmock-1.6.0/include)
+	/usr/src/gtest
+	/usr/src/gmock)
 	
-add_library(gtest STATIC ../../tools/gtest-1.6.0/src/gtest-all.cc)
-add_library(gmock STATIC ../../tools/gmock-1.6.0/src/gmock-all.cc)
+add_library(gtest STATIC /usr/src/gtest/src/gtest-all.cc)
+add_library(gmock STATIC /usr/src/gmock/src/gmock-all.cc)
 
 add_subdirectory(integtests)
 add_subdirectory(unittests)
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -72,8 +72,6 @@
 	../../lib/synergy
 	../../lib/synwinhk
 	../../lib/synwinxt
-	../../../tools/gtest-1.6.0/include
-	../../../tools/gmock-1.6.0/include
 	../unittests
 )
 
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -49,8 +49,6 @@
 	../../lib/net
 	../../lib/platform
 	../../lib/synergy
-	../../../tools/gtest-1.6.0/include
-	../../../tools/gmock-1.6.0/include
 	../../../tools
 	io
 	synergy

Bug#812303: synergy: FTBFS with GCC 6: test suite segfaults

[Martin Michlmayr]

Package: synergy
Version: 1.4.16-1
Severity: normal
User: debian-...@lists.debian.org
Usertags: ftbfs-gcc-6 gcc-6-unknown

This package fails to build with GCC 6.  GCC 6 has not been released
yet, but it's expected that GCC 6 will become the default compiler for
stretch.

Unfortunately, it's not clear from the log why the build failed.
It's possible there's a bug in this package or in GCC.  It's also
possible I reported a non-issue, although I tried to avoid that.
I apologize in advance if this is the case.

If you have some time to look into this issue, that'd be great.  If
not, I can re-test the package with GCC 6 in a few weeks time.

You can find a snapshot of GCC 6 in experimental.  To build with
GCC 6, you can set CC=gcc-6 CXX=g++-6 explicitly.

You may be able to find out more about this issue at
https://gcc.gnu.org/gcc-6/changes.html

> sbuild (Debian sbuild) 0.67.0 (26 Dec 2015) on dl580gen9-02.hlinux
...
> [ RUN  ] CKeyStateTests.sendKeyEvent_halfDuplexAndRepeat_addEventNotCalled
> [   OK ] 
> CKeyStateTests.sendKeyEvent_halfDuplexAndRepeat_addEventNotCalled (0 ms)
> [ RUN  ] CKeyStateTests.sendKeyEvent_halfDuplex_addEventCalledTwice
> debian/rules:113: recipe for target 'test' failed
> make: *** [test] Segmentation fault
> dpkg-buildpackage: error: fakeroot debian/rules binary gave error exit status 
> 2
> 
> Build finished at 20160118-2056
> 

-- 
Martin Michlmayr
Linux for HPE Helion, Hewlett Packard Enterprise