[arch-commits] Commit in synergy/repos (12 files)
Levente Polyak
anthraxx at archlinux.org
Thu Mar 16 20:25:24 UTC 2017
Date: Thursday, March 16, 2017 @ 20:25:23
Author: anthraxx
Revision: 216810
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
synergy/repos/community-staging-i686/
synergy/repos/community-staging-i686/PKGBUILD
(from rev 216808, synergy/trunk/PKGBUILD)
synergy/repos/community-staging-i686/openssl11.patch
(from rev 216808, synergy/trunk/openssl11.patch)
synergy/repos/community-staging-i686/synergys.service
(from rev 216808, synergy/trunk/synergys.service)
synergy/repos/community-staging-i686/synergys.socket
(from rev 216808, synergy/trunk/synergys.socket)
synergy/repos/community-staging-i686/system-gtest.patch
(from rev 216808, synergy/trunk/system-gtest.patch)
synergy/repos/community-staging-x86_64/
synergy/repos/community-staging-x86_64/PKGBUILD
(from rev 216808, synergy/trunk/PKGBUILD)
synergy/repos/community-staging-x86_64/openssl11.patch
(from rev 216808, synergy/trunk/openssl11.patch)
synergy/repos/community-staging-x86_64/synergys.service
(from rev 216809, synergy/trunk/synergys.service)
synergy/repos/community-staging-x86_64/synergys.socket
(from rev 216809, synergy/trunk/synergys.socket)
synergy/repos/community-staging-x86_64/system-gtest.patch
(from rev 216809, synergy/trunk/system-gtest.patch)
---------------------------------------------+
community-staging-i686/PKGBUILD | 86 ++++++++++++++++++++
community-staging-i686/openssl11.patch | 33 +++++++
community-staging-i686/synergys.service | 10 ++
community-staging-i686/synergys.socket | 9 ++
community-staging-i686/system-gtest.patch | 110 ++++++++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 86 ++++++++++++++++++++
community-staging-x86_64/openssl11.patch | 33 +++++++
community-staging-x86_64/synergys.service | 10 ++
community-staging-x86_64/synergys.socket | 9 ++
community-staging-x86_64/system-gtest.patch | 110 ++++++++++++++++++++++++++
10 files changed, 496 insertions(+)
Copied: synergy/repos/community-staging-i686/PKGBUILD (from rev 216808, synergy/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,86 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Michael Düll <mail at akurei.me>
+
+# I would just like to take a minute here and state that synergy is
+# some of the worst packaged software ever. They BUNDLE a fucking
+# zip for cryptopp and do not provide an option to use a system-
+# installed version of that library. They change around paths every
+# update and just generally don't seem to care much.
+pkgname=synergy
+pkgver=1.8.8
+pkgrel=2
+pkgdesc='Share a single mouse and keyboard between multiple computers'
+url='https://symless.com/synergy/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl' 'openssl')
+makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest')
+optdepends=('qt5-base: gui support')
+source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz
+ openssl11.patch
+ system-gtest.patch
+ synergys.socket
+ synergys.service)
+sha512sums=('b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6'
+ 'ba93295d5638581ac0a82c293016563e2faf4228b6c920bfe1df86b254841a88baf55f220574e93af1c718d689a8f8f1ad494c2ca685f8ea01a506a1bc6e1642'
+ '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2'
+ 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62'
+ '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029')
+
+prepare() {
+ cd synergy-${pkgver}-stable
+ mkdir build
+ # get rid of shitty bundled gtest and gmock
+ patch -p1 < "${srcdir}/system-gtest.patch"
+ patch -p1 < "${srcdir}/openssl11.patch"
+}
+
+build() {
+ cd synergy-${pkgver}-stable
+
+ msg2 "Building core..."
+ (cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+ # unittests don't pass with optimization (segfault on nullptr)
+ sed 's|\-O2|\-O0|g' -i src/test/unittests/CMakeFiles/unittests.dir/{flags.make,link.txt}
+ make
+ )
+
+ msg2 "Building GUI..."
+ (cd src/gui
+ qmake
+ make
+ )
+}
+
+check() {
+ cd synergy-${pkgver}-stable
+ ./bin/unittests
+}
+
+package() {
+ cd synergy-${pkgver}-stable
+
+ # install binary
+ install -Dm 755 bin/{synergy,synergyc,synergyd,synergys,syntool,usynergy} -t "${pkgdir}/usr/bin"
+
+ # install config
+ install -Dm 644 doc/${pkgname}.conf* -t "${pkgdir}/etc"
+
+ # install manfiles
+ install -Dm 644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
+ install -Dm 644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
+
+ # install systemd service and socket
+ install -Dm 644 "${srcdir}"/synergys.{service,socket} -t "${pkgdir}/usr/lib/systemd/user"
+
+ # install desktop/icon stuff
+ install -Dm 644 "res/synergy.ico" -t "${pkgdir}/usr/share/icons"
+ install -Dm 644 "res/synergy.desktop" -t "${pkgdir}/usr/share/applications"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: synergy/repos/community-staging-i686/openssl11.patch (from rev 216808, synergy/trunk/openssl11.patch)
===================================================================
--- community-staging-i686/openssl11.patch (rev 0)
+++ community-staging-i686/openssl11.patch 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,33 @@
+From 9385083cfc27ecaadf1eaf1d014cd6907860072b Mon Sep 17 00:00:00 2001
+From: Joshua Honeycutt <joshua.honeycutt at gmail.com>
+Date: Sun, 20 Nov 2016 17:49:30 -0600
+Subject: [PATCH] Adjust showSecureCipherInfo() to build with newer openssl
+ versions
+
+---
+ src/lib/net/SecureSocket.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
+index 7076c76..1e35c21 100644
+--- a/src/lib/net/SecureSocket.cpp
++++ b/src/lib/net/SecureSocket.cpp
+@@ -805,10 +805,15 @@ SecureSocket::showSecureCipherInfo()
+ showCipherStackDesc(sStack);
+ }
+
+- // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
+- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ // m_ssl->m_ssl->session->ciphers is not forward compatable,
++ // In future release of OpenSSL, it's not visible,
+ STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
+- if (cStack == NULL) {
++#else
++ // Use SSL_get_client_ciphers() for newer versions
++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
++#endif
++ if (cStack == NULL) {
+ LOG((CLOG_DEBUG1 "remote cipher list not available"));
+ }
+ else {
Copied: synergy/repos/community-staging-i686/synergys.service (from rev 216808, synergy/trunk/synergys.service)
===================================================================
--- community-staging-i686/synergys.service (rev 0)
+++ community-staging-i686/synergys.service 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
Copied: synergy/repos/community-staging-i686/synergys.socket (from rev 216808, synergy/trunk/synergys.socket)
===================================================================
--- community-staging-i686/synergys.socket (rev 0)
+++ community-staging-i686/synergys.socket 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys at .service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target
Copied: synergy/repos/community-staging-i686/system-gtest.patch (from rev 216808, synergy/trunk/system-gtest.patch)
===================================================================
--- community-staging-i686/system-gtest.patch (rev 0)
+++ community-staging-i686/system-gtest.patch 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,110 @@
+From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Thu, 29 Sep 2016 02:04:41 +0200
+Subject: [PATCH] using system gtest and gmock
+
+---
+ src/lib/platform/CMakeLists.txt | 2 +-
+ src/lib/server/CMakeLists.txt | 2 +-
+ src/lib/synergy/CMakeLists.txt | 2 +-
+ src/test/CMakeLists.txt | 12 ++++++------
+ src/test/integtests/CMakeLists.txt | 4 ++--
+ src/test/unittests/CMakeLists.txt | 4 ++--
+ 6 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
+index 6c272c2..09ddf26 100644
+--- a/src/lib/platform/CMakeLists.txt
++++ b/src/lib/platform/CMakeLists.txt
+@@ -31,7 +31,7 @@ endif()
+
+ include_directories(
+ ../
+- ../../../ext/gtest-1.6.0/include
++ /usr/include/gtest
+ )
+
+ if (UNIX)
+diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
+index 2c34af0..f7df650 100644
+--- a/src/lib/server/CMakeLists.txt
++++ b/src/lib/server/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ include_directories(
+ ../
+ ../../../ext
+- ../../../ext/gtest-1.6.0/include
++ /usr/include/gtest
+ )
+
+ if (UNIX)
+diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
+index 0972be8..619709f 100644
+--- a/src/lib/synergy/CMakeLists.txt
++++ b/src/lib/synergy/CMakeLists.txt
+@@ -36,7 +36,7 @@ endif()
+ include_directories(
+ ../
+ ../../../ext
+- ../../../ext/gtest-1.6.0/include
++ /usr/include/gtest
+ )
+
+ if (UNIX)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 8812150..5d38156 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -15,13 +15,13 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ include_directories(
+- ../../ext/gtest-1.6.0
+- ../../ext/gtest-1.6.0/include
+- ../../ext/gmock-1.6.0
+- ../../ext/gmock-1.6.0/include)
++ /usr/incude/gtest
++ /usr/src/gtest
++ /usr/include/gmock
++ /usr/src/gmock)
+
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/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/gmock-all.cc)
+
+ if (UNIX)
+ # ignore warnings in gtest and gmock
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index bde35c2..dc4f202 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -56,8 +56,8 @@ endif()
+ include_directories(
+ ../../
+ ../../lib/
+- ../../../ext/gtest-1.6.0/include
+- ../../../ext/gmock-1.6.0/include
++ /usr/include/gtest
++ /usr/include/gmock
+ )
+
+ if (UNIX)
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index 4cacdf9..f0a8dbe 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
+ include_directories(
+ ../../
+ ../../lib/
+- ../../../ext/gtest-1.6.0/include
+- ../../../ext/gmock-1.6.0/include
++ /usr/include/gtest
++ /usr/include/gmock
+ ../../../ext
+ )
+
+--
+2.10.0
+
Copied: synergy/repos/community-staging-x86_64/PKGBUILD (from rev 216808, synergy/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,86 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Michael Düll <mail at akurei.me>
+
+# I would just like to take a minute here and state that synergy is
+# some of the worst packaged software ever. They BUNDLE a fucking
+# zip for cryptopp and do not provide an option to use a system-
+# installed version of that library. They change around paths every
+# update and just generally don't seem to care much.
+pkgname=synergy
+pkgver=1.8.8
+pkgrel=2
+pkgdesc='Share a single mouse and keyboard between multiple computers'
+url='https://symless.com/synergy/'
+arch=('i686' 'x86_64')
+license=('GPL2')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl' 'openssl')
+makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest')
+optdepends=('qt5-base: gui support')
+source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz
+ openssl11.patch
+ system-gtest.patch
+ synergys.socket
+ synergys.service)
+sha512sums=('b4909930af7da10d877297e674df4c042ec54333eed585334da4a8c834c0ca3ad7c93fd2436c7d8d2f0e9e039d7bd385bb9e8a8c706750cbab3c3664a9b16bc6'
+ 'ba93295d5638581ac0a82c293016563e2faf4228b6c920bfe1df86b254841a88baf55f220574e93af1c718d689a8f8f1ad494c2ca685f8ea01a506a1bc6e1642'
+ '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2'
+ 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62'
+ '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029')
+
+prepare() {
+ cd synergy-${pkgver}-stable
+ mkdir build
+ # get rid of shitty bundled gtest and gmock
+ patch -p1 < "${srcdir}/system-gtest.patch"
+ patch -p1 < "${srcdir}/openssl11.patch"
+}
+
+build() {
+ cd synergy-${pkgver}-stable
+
+ msg2 "Building core..."
+ (cd build
+ cmake -DCMAKE_INSTALL_PREFIX=/usr ..
+ # unittests don't pass with optimization (segfault on nullptr)
+ sed 's|\-O2|\-O0|g' -i src/test/unittests/CMakeFiles/unittests.dir/{flags.make,link.txt}
+ make
+ )
+
+ msg2 "Building GUI..."
+ (cd src/gui
+ qmake
+ make
+ )
+}
+
+check() {
+ cd synergy-${pkgver}-stable
+ ./bin/unittests
+}
+
+package() {
+ cd synergy-${pkgver}-stable
+
+ # install binary
+ install -Dm 755 bin/{synergy,synergyc,synergyd,synergys,syntool,usynergy} -t "${pkgdir}/usr/bin"
+
+ # install config
+ install -Dm 644 doc/${pkgname}.conf* -t "${pkgdir}/etc"
+
+ # install manfiles
+ install -Dm 644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
+ install -Dm 644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
+
+ # install systemd service and socket
+ install -Dm 644 "${srcdir}"/synergys.{service,socket} -t "${pkgdir}/usr/lib/systemd/user"
+
+ # install desktop/icon stuff
+ install -Dm 644 "res/synergy.ico" -t "${pkgdir}/usr/share/icons"
+ install -Dm 644 "res/synergy.desktop" -t "${pkgdir}/usr/share/applications"
+}
+
+# vim:set ts=2 sw=2 et:
Copied: synergy/repos/community-staging-x86_64/openssl11.patch (from rev 216808, synergy/trunk/openssl11.patch)
===================================================================
--- community-staging-x86_64/openssl11.patch (rev 0)
+++ community-staging-x86_64/openssl11.patch 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,33 @@
+From 9385083cfc27ecaadf1eaf1d014cd6907860072b Mon Sep 17 00:00:00 2001
+From: Joshua Honeycutt <joshua.honeycutt at gmail.com>
+Date: Sun, 20 Nov 2016 17:49:30 -0600
+Subject: [PATCH] Adjust showSecureCipherInfo() to build with newer openssl
+ versions
+
+---
+ src/lib/net/SecureSocket.cpp | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/net/SecureSocket.cpp b/src/lib/net/SecureSocket.cpp
+index 7076c76..1e35c21 100644
+--- a/src/lib/net/SecureSocket.cpp
++++ b/src/lib/net/SecureSocket.cpp
+@@ -805,10 +805,15 @@ SecureSocket::showSecureCipherInfo()
+ showCipherStackDesc(sStack);
+ }
+
+- // m_ssl->m_ssl->session->ciphers is not forward compatable, In future release
+- // of OpenSSL, it's not visible, need to use SSL_get_client_ciphers() instead
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++ // m_ssl->m_ssl->session->ciphers is not forward compatable,
++ // In future release of OpenSSL, it's not visible,
+ STACK_OF(SSL_CIPHER) * cStack = m_ssl->m_ssl->session->ciphers;
+- if (cStack == NULL) {
++#else
++ // Use SSL_get_client_ciphers() for newer versions
++ STACK_OF(SSL_CIPHER) * cStack = SSL_get_client_ciphers(m_ssl->m_ssl);
++#endif
++ if (cStack == NULL) {
+ LOG((CLOG_DEBUG1 "remote cipher list not available"));
+ }
+ else {
Copied: synergy/repos/community-staging-x86_64/synergys.service (from rev 216809, synergy/trunk/synergys.service)
===================================================================
--- community-staging-x86_64/synergys.service (rev 0)
+++ community-staging-x86_64/synergys.service 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Synergy Server Daemon
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/synergys --no-daemon --config /etc/synergy.conf
+Restart=on-failure
+
+[Install]
+WantedBy=default.target
Copied: synergy/repos/community-staging-x86_64/synergys.socket (from rev 216809, synergy/trunk/synergys.socket)
===================================================================
--- community-staging-x86_64/synergys.socket (rev 0)
+++ community-staging-x86_64/synergys.socket 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,9 @@
+[Unit]
+Conflicts=synergys at .service
+
+[Socket]
+ListenStream=24800
+Accept=false
+
+[Install]
+WantedBy=sockets.target
Copied: synergy/repos/community-staging-x86_64/system-gtest.patch (from rev 216809, synergy/trunk/system-gtest.patch)
===================================================================
--- community-staging-x86_64/system-gtest.patch (rev 0)
+++ community-staging-x86_64/system-gtest.patch 2017-03-16 20:25:23 UTC (rev 216810)
@@ -0,0 +1,110 @@
+From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001
+From: anthraxx <levente at leventepolyak.net>
+Date: Thu, 29 Sep 2016 02:04:41 +0200
+Subject: [PATCH] using system gtest and gmock
+
+---
+ src/lib/platform/CMakeLists.txt | 2 +-
+ src/lib/server/CMakeLists.txt | 2 +-
+ src/lib/synergy/CMakeLists.txt | 2 +-
+ src/test/CMakeLists.txt | 12 ++++++------
+ src/test/integtests/CMakeLists.txt | 4 ++--
+ src/test/unittests/CMakeLists.txt | 4 ++--
+ 6 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
+index 6c272c2..09ddf26 100644
+--- a/src/lib/platform/CMakeLists.txt
++++ b/src/lib/platform/CMakeLists.txt
+@@ -31,7 +31,7 @@ endif()
+
+ include_directories(
+ ../
+- ../../../ext/gtest-1.6.0/include
++ /usr/include/gtest
+ )
+
+ if (UNIX)
+diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
+index 2c34af0..f7df650 100644
+--- a/src/lib/server/CMakeLists.txt
++++ b/src/lib/server/CMakeLists.txt
+@@ -24,7 +24,7 @@ endif()
+ include_directories(
+ ../
+ ../../../ext
+- ../../../ext/gtest-1.6.0/include
++ /usr/include/gtest
+ )
+
+ if (UNIX)
+diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
+index 0972be8..619709f 100644
+--- a/src/lib/synergy/CMakeLists.txt
++++ b/src/lib/synergy/CMakeLists.txt
+@@ -36,7 +36,7 @@ endif()
+ include_directories(
+ ../
+ ../../../ext
+- ../../../ext/gtest-1.6.0/include
++ /usr/include/gtest
+ )
+
+ if (UNIX)
+diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
+index 8812150..5d38156 100644
+--- a/src/test/CMakeLists.txt
++++ b/src/test/CMakeLists.txt
+@@ -15,13 +15,13 @@
+ # along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+ include_directories(
+- ../../ext/gtest-1.6.0
+- ../../ext/gtest-1.6.0/include
+- ../../ext/gmock-1.6.0
+- ../../ext/gmock-1.6.0/include)
++ /usr/incude/gtest
++ /usr/src/gtest
++ /usr/include/gmock
++ /usr/src/gmock)
+
+-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
+-add_library(gmock STATIC ../../ext/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/gmock-all.cc)
+
+ if (UNIX)
+ # ignore warnings in gtest and gmock
+diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
+index bde35c2..dc4f202 100644
+--- a/src/test/integtests/CMakeLists.txt
++++ b/src/test/integtests/CMakeLists.txt
+@@ -56,8 +56,8 @@ endif()
+ include_directories(
+ ../../
+ ../../lib/
+- ../../../ext/gtest-1.6.0/include
+- ../../../ext/gmock-1.6.0/include
++ /usr/include/gtest
++ /usr/include/gmock
+ )
+
+ if (UNIX)
+diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
+index 4cacdf9..f0a8dbe 100644
+--- a/src/test/unittests/CMakeLists.txt
++++ b/src/test/unittests/CMakeLists.txt
+@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
+ include_directories(
+ ../../
+ ../../lib/
+- ../../../ext/gtest-1.6.0/include
+- ../../../ext/gmock-1.6.0/include
++ /usr/include/gtest
++ /usr/include/gmock
+ ../../../ext
+ )
+
+--
+2.10.0
+
More information about the arch-commits
mailing list