Date: Thursday, September 29, 2016 @ 00:44:24 Author: anthraxx Revision: 190759
upgpkg: synergy 1.8.3-1 - using system gtest and gmock instead of bundled Added: synergy/trunk/system-gtest.patch Modified: synergy/trunk/PKGBUILD --------------------+ PKGBUILD | 38 +++++++++-------- system-gtest.patch | 110 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 130 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-09-28 23:27:48 UTC (rev 190758) +++ PKGBUILD 2016-09-29 00:44:24 UTC (rev 190759) @@ -11,7 +11,7 @@ # 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.2 +pkgver=1.8.3 pkgrel=1 pkgdesc='Share a single mouse and keyboard between multiple computers' url='http://synergy-foss.org' @@ -18,14 +18,16 @@ arch=('i686' 'x86_64') license=('GPL2') depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl') -makedepends=('libxt' 'cmake' 'qt5-base' 'unzip') +makedepends=('libxt' 'cmake' 'qt5-base' 'gmock' 'gtest') optdepends=('qt5-base: gui support' 'openssl: encryption support') source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz + system-gtest.patch synergys.socket synergys.service wrapper) -sha512sums=('48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c' +sha512sums=('a5e51e68a16b4e84d916aa54f03925c9db0df70b80c586d020c599f9685d820f097dd6519e07ad31704e769dd9072eb79f0f95465a12890a8caca44d0fac0688' + '4bef039f59b565d08079a8187df76f9773cfddeb81376ccc42f5570049389f114559721ed7b0464c4a4d1431ba72a736b11755573019583d0075d9da08c03ed2' 'f9c124533dfd0bbbb1b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029' 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') @@ -32,20 +34,23 @@ prepare() { cd synergy-${pkgver}-stable - (cd ext - unzip gmock-1.6.0.zip -d gmock-1.6.0 - unzip gtest-1.6.0.zip -d gtest-1.6.0 - ) + mkdir build + # get rid of shitty bundled gtest and gmock + patch -p1 < "${srcdir}/system-gtest.patch" } build() { cd synergy-${pkgver}-stable - 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 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 @@ -82,9 +87,7 @@ install -Dm 755 bin/plugins/libns.so "${pkgdir}/usr/lib/${pkgname}/libns.so" # install config - install -Dm 644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" - install -Dm 644 "doc/${pkgname}.conf.example-advanced" "${pkgdir}/etc/${pkgname}.conf.example-advanced" - install -Dm 644 "doc/${pkgname}.conf.example-basic" "${pkgdir}/etc/${pkgname}.conf.example-basic" + 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" @@ -91,12 +94,11 @@ 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" "${pkgdir}/usr/lib/systemd/user/synergys.service" - install -Dm 644 "${srcdir}/synergys.socket" "${pkgdir}/usr/lib/systemd/user/synergys.socket" + install -Dm 644 "${srcdir}"/synergys.{service,socket} -t "${pkgdir}/usr/lib/systemd/user" # install desktop/icon stuff - install -Dm 644 "res/synergy.ico" "${pkgdir}/usr/share/icons/synergy.ico" - install -Dm 644 "res/synergy.desktop" "${pkgdir}/usr/share/applications/synergy.desktop" + 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: Added: system-gtest.patch =================================================================== --- system-gtest.patch (rev 0) +++ system-gtest.patch 2016-09-29 00:44:24 UTC (rev 190759) @@ -0,0 +1,110 @@ +From e391e1286d80fa2e38c2440bc2266a0fd7bd37ca Mon Sep 17 00:00:00 2001 +From: anthraxx <leve...@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 +
