[arch-commits] Commit in synergy/trunk (PKGBUILD fix-incompetence.patch)
Date: Wednesday, August 10, 2016 @ 21:43:29 Author: anthraxx Revision: 186364 upgpkg: synergy 1.8.2-1 Modified: synergy/trunk/PKGBUILD Deleted: synergy/trunk/fix-incompetence.patch + PKGBUILD | 21 + fix-incompetence.patch | 23 --- 2 files changed, 9 insertions(+), 35 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-08-10 21:39:41 UTC (rev 186363) +++ PKGBUILD2016-08-10 21:43:29 UTC (rev 186364) @@ -11,32 +11,27 @@ # installed version of that library. They change around paths every # update and just generally don't seem to care much. pkgname=synergy -pkgver=1.7.6 -pkgrel=2 -pkgdesc="Share a single mouse and keyboard between multiple computers" -url="http://synergy-foss.org"; +pkgver=1.8.2 +pkgrel=1 +pkgdesc='Share a single mouse and keyboard between multiple computers' +url='http://synergy-foss.org' arch=('i686' 'x86_64') license=('GPL2') depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl') makedepends=('libxt' 'cmake' 'qt5-base' 'unzip') -optdepends=( - 'qt5-base: gui support' - 'openssl: encryption support' -) +optdepends=('qt5-base: gui support' +'openssl: encryption support') source=(synergy-${pkgver}.tar.gz::https://github.com/symless/synergy/archive/v${pkgver}-stable.tar.gz synergys.socket synergys.service -fix-incompetence.patch wrapper) -sha512sums=('025305fc1aca425b27c1d4f16dd0c6ee7798c048e234c8a27272b81b03c0c1cb35fab6639707c1b55d58e7676fe2abf058b6f93e994ae5b256034c32c6fe806a' +sha512sums=('48d7e18e92f239feddc7afd31b5614c2c27b7dc1cb30e58aa168095771a85d87c9c621daaef6ee0126381bcdcfa515d484545d763d0b1c5e6c181e0e5175639c' 'f9c124533dfd01b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' '9663a11b915e10e60317e732a4d1191e8f8ff19176994c27dd20aa445daab7565bd624e5575c9c639d144293879fbe8376834a076723f778fd322ebd1c9f2029' - 'd598f05614d0db894781e85ecab9a1196da3df6967e3bd44f5b8246c7cba76859734cf953edddf0addf6464f62f88b99da52fb5674e8db4a58bf971d078da83a' 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') prepare() { cd synergy-${pkgver}-stable - patch -p1 < "${srcdir}/fix-incompetence.patch" (cd ext unzip gmock-1.6.0.zip -d gmock-1.6.0 unzip gtest-1.6.0.zip -d gtest-1.6.0 @@ -47,6 +42,8 @@ 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 (cd src/gui Deleted: fix-incompetence.patch === --- fix-incompetence.patch 2016-08-10 21:39:41 UTC (rev 186363) +++ fix-incompetence.patch 2016-08-10 21:43:29 UTC (rev 186364) @@ -1,23 +0,0 @@ -From 5080bf0c679711f60ca14eb5979d92f181749bb7 Mon Sep 17 00:00:00 2001 -From: Manuel Frischknecht -Date: Mon, 20 Jul 2015 17:55:02 +0200 -Subject: [PATCH] Fixed a missing include that breaks the build on linux - - src/gui/src/CommandProcess.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gui/src/CommandProcess.h b/src/gui/src/CommandProcess.h -index 62e89bf..f279dff 100644 a/src/gui/src/CommandProcess.h -+++ b/src/gui/src/CommandProcess.h -@@ -18,6 +18,7 @@ - #ifndef COMMANDTHREAD_H - #define COMMANDTHREAD_H - -+#include - #include - - class CommandProcess : public QObject --- -2.4.2
[arch-commits] Commit in synergy/trunk (PKGBUILD fix-incompetence.patch)
Date: Monday, August 24, 2015 @ 17:17:11 Author: anthraxx Revision: 138729 upgpkg: synergy 1.7.4-1 upgpkg synergy 1.7.4-1 Modified: synergy/trunk/PKGBUILD synergy/trunk/fix-incompetence.patch + PKGBUILD |9 - fix-incompetence.patch | 29 - 2 files changed, 4 insertions(+), 34 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-08-24 13:10:35 UTC (rev 138728) +++ PKGBUILD2015-08-24 15:17:11 UTC (rev 138729) @@ -11,8 +11,8 @@ # installed version of that library. They change around paths every # update and just generally don't seem to care much. pkgname=synergy -pkgver=1.7.3 -pkgrel=3 +pkgver=1.7.4 +pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org"; arch=('i686' 'x86_64') @@ -28,16 +28,15 @@ synergys_at.service fix-incompetence.patch wrapper) -sha512sums=('334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287' +sha512sums=('ad6139209a8635ed91e943e11a7709d96a037bdda45a949c9f63aa3e13211aecf02651794921d2dde30d9024930e256da7538f1cf104d300be1e6b7bc4732932' 'f9c124533dfd01b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' 'e85cc3452bb8ba8fcccb1857386c77eb1e4cabb149a1c492c56b38e1b121ac0e7d96c6fcbd3c9b522d3a4ae9d7a9974f4a89fc32b02a56f665be92af219e371c' - '02eff8a165c33b22239a1e979532b56fbb791cd2a042237f3c3705a4168ec6b833d5dc58a0037375b223af1c34e6bdd8aa9e9c7672a709d7722656c846fe065c' + 'd598f05614d0db894781e85ecab9a1196da3df6967e3bd44f5b8246c7cba76859734cf953edddf0addf6464f62f88b99da52fb5674e8db4a58bf971d078da83a' 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') prepare() { cd synergy-${pkgver}-stable patch -p1 < "${srcdir}/fix-incompetence.patch" - (cd ext unzip gmock-1.6.0.zip -d gmock-1.6.0 unzip gtest-1.6.0.zip -d gtest-1.6.0 Modified: fix-incompetence.patch === --- fix-incompetence.patch 2015-08-24 13:10:35 UTC (rev 138728) +++ fix-incompetence.patch 2015-08-24 15:17:11 UTC (rev 138729) @@ -1,32 +1,3 @@ -From 03fc9b5fa72fd3197ca1e496f2c22e640304a602 Mon Sep 17 00:00:00 2001 -From: Maxim Doucet -Date: Wed, 27 May 2015 18:34:47 +0200 -Subject: [PATCH] Fix issue synergy/synergy#4720 - - src/gui/src/PluginManager.cpp | 8 +--- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp -index fd3a24e..d1dc876 100644 a/src/gui/src/PluginManager.cpp -+++ b/src/gui/src/PluginManager.cpp -@@ -194,13 +194,7 @@ QString PluginManager::getPluginUrl(const QString& pluginName) - process.start(program, args); - bool success = process.waitForStarted(); - -- if (!success || !process.waitForFinished()) -- { -- emit error(tr("Could not get Linux package type.")); -- return ""; -- } -- -- bool isDeb = (process.exitCode() == 0); -+ bool isDeb = (success && process.waitForFinished() & (process.exitCode() == 0)); - - int arch = getProcessorArch(); - if (arch == kProcessorArchLinux32) { --- From 5080bf0c679711f60ca14eb5979d92f181749bb7 Mon Sep 17 00:00:00 2001 From: Manuel Frischknecht Date: Mon, 20 Jul 2015 17:55:02 +0200
[arch-commits] Commit in synergy/trunk (PKGBUILD fix-incompetence.patch wrapper)
Date: Saturday, August 1, 2015 @ 21:19:30 Author: anthraxx Revision: 137668 upgpkg: synergy 1.7.3-3 updpkg synergy 1.7.3-3: symlink libns.so Added: synergy/trunk/wrapper Modified: synergy/trunk/PKGBUILD synergy/trunk/fix-incompetence.patch + PKGBUILD | 96 ++- fix-incompetence.patch | 23 ++- wrapper|4 + 3 files changed, 81 insertions(+), 42 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-08-01 18:31:07 UTC (rev 137667) +++ PKGBUILD2015-08-01 19:19:30 UTC (rev 137668) @@ -1,5 +1,5 @@ -# Maintainer: Sven-Hendrik Haase # Maintainer: Levente Polyak +# Contributor: Sven-Hendrik Haase # Contributor: Jelle van der Waa # Contributor: Stéphane Gaudreault # Contributor: Dale Blount @@ -12,10 +12,11 @@ # update and just generally don't seem to care much. pkgname=synergy pkgver=1.7.3 -pkgrel=2 +pkgrel=3 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org"; arch=('i686' 'x86_64') +license=('GPL2') depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl') makedepends=('libxt' 'cmake' 'qt5-base' 'unzip') optdepends=( @@ -22,71 +23,84 @@ 'qt5-base: gui support' 'openssl: encryption support' ) -license=('GPL2') -source=("synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/v${pkgver}-stable.tar.gz"; -"synergys_at.socket" -"synergys_at.service" -fix-incompetence.patch) -sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f' - '7ec33221725fc496b807e0f435c5e87b590beb5d' - '65ab58cc3546d6374a05a6a260f15045632e43ce' - '10a899901ef62828280f21979625495f4da159f5') +source=(synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/v${pkgver}-stable.tar.gz +synergys_at.socket +synergys_at.service +fix-incompetence.patch +wrapper) +sha512sums=('334cad16b843f0a6c1337960d76b37724bdb2a5f9841cffab4dbcbe6393cb0c4323860b64a15cccba1158763ef8cbea820900a5c53d0abbb6a92cfbeff827287' + 'f9c124533dfd01b5036b7f4b06f7f86f69165e88b9146ff17798377119eb9f1a4666f3b2ee9840bc436558d715cdbfe2fdfd7624348fae64871f785a1a62' + 'e85cc3452bb8ba8fcccb1857386c77eb1e4cabb149a1c492c56b38e1b121ac0e7d96c6fcbd3c9b522d3a4ae9d7a9974f4a89fc32b02a56f665be92af219e371c' + '02eff8a165c33b22239a1e979532b56fbb791cd2a042237f3c3705a4168ec6b833d5dc58a0037375b223af1c34e6bdd8aa9e9c7672a709d7722656c846fe065c' + 'a2e126ad3ac53fb855a331134982f86ef81ffc75b73e73b242e6f854fe7e2daec160fac2161acdc7020cd7f57ae0a8826ac7a249ad10b03db614ada0062b3e93') prepare() { - cd "${srcdir}/synergy-${pkgver}-stable" - patch -p1 < ../fix-incompetence.patch + cd synergy-${pkgver}-stable + patch -p1 < "${srcdir}/fix-incompetence.patch" - cd ext - unzip gmock-1.6.0.zip -d gmock-1.6.0 - unzip gtest-1.6.0.zip -d gtest-1.6.0 + (cd ext +unzip gmock-1.6.0.zip -d gmock-1.6.0 +unzip gtest-1.6.0.zip -d gtest-1.6.0 + ) } build() { - cd "${srcdir}/synergy-${pkgver}-stable" + cd synergy-${pkgver}-stable cmake -DCMAKE_INSTALL_PREFIX=/usr . make - cd src/gui - qmake - make + (cd src/gui +qmake +make + ) } check() { - cd "${srcdir}/synergy-${pkgver}-stable/bin" - ./unittests + cd synergy-${pkgver}-stable + ./bin/unittests } package() { - cd "${srcdir}/synergy-${pkgver}-stable" + cd synergy-${pkgver}-stable # install binary - install -Dm755 bin/synergy "${pkgdir}/usr/bin/synergy" - install -Dm755 bin/synergyc "${pkgdir}/usr/bin/synergyc" - install -Dm755 bin/synergyd "${pkgdir}/usr/bin/synergyd" - install -Dm755 bin/synergys "${pkgdir}/usr/bin/synergys" - install -Dm755 bin/syntool "${pkgdir}/usr/bin/syntool" - install -Dm755 bin/usynergy "${pkgdir}/usr/bin/usynergy" + install -Dm 755 bin/synergy "${pkgdir}/usr/lib/synergy/synergy" + install -Dm 755 bin/synergyc "${pkgdir}/usr/lib/synergy/synergyc" + install -Dm 755 bin/synergyd "${pkgdir}/usr/lib/synergy/synergyd" + install -Dm 755 bin/synergys "${pkgdir}/usr/lib/synergy/synergys" + install -Dm 755 bin/syntool "${pkgdir}/usr/lib/synergy/syntool" + install -Dm 755 bin/usynergy "${pkgdir}/usr/lib/synergy/usynergy" + # unfuck wrapper + install -Dm 755 "${srcdir}/wrapper" "${pkgdir}/usr/lib/synergy/wrapper" + install -d "${pkgdir}/usr/bin" + ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergy" + ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergyc" + ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergyd" + ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/synergys" + ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/syntool" + ln -sf /usr/lib/synergy/wrapper "${pkgdir}/usr/bin/usynergy" + + # plugin + install -Dm 755 bin/plugins/libns.so "${pkgdir}/usr/lib/${pkgname}/libns.so" + # install config - inst
[arch-commits] Commit in synergy/trunk (PKGBUILD fix-incompetence.patch)
Date: Monday, June 1, 2015 @ 12:15:11 Author: anthraxx Revision: 134460 fix incompetente plugin detection via upstream patch Added: synergy/trunk/fix-incompetence.patch Modified: synergy/trunk/PKGBUILD + PKGBUILD |9 ++--- fix-incompetence.patch | 31 +++ 2 files changed, 37 insertions(+), 3 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-06-01 10:13:39 UTC (rev 134459) +++ PKGBUILD2015-06-01 10:15:11 UTC (rev 134460) @@ -12,7 +12,7 @@ # update and just generally don't seem to care much. pkgname=synergy pkgver=1.7.3 -pkgrel=1 +pkgrel=2 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org"; arch=('i686' 'x86_64') @@ -25,13 +25,16 @@ license=('GPL2') source=("synergy-${pkgver}.tar.gz::https://github.com/synergy/synergy/archive/v${pkgver}-stable.tar.gz"; "synergys_at.socket" -"synergys_at.service") +"synergys_at.service" +fix-incompetence.patch) sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f' '7ec33221725fc496b807e0f435c5e87b590beb5d' - '65ab58cc3546d6374a05a6a260f15045632e43ce') + '65ab58cc3546d6374a05a6a260f15045632e43ce' + '10a899901ef62828280f21979625495f4da159f5') prepare() { cd "${srcdir}/synergy-${pkgver}-stable" + patch -p1 < ../fix-incompetence.patch cd ext unzip gmock-1.6.0.zip -d gmock-1.6.0 Added: fix-incompetence.patch === --- fix-incompetence.patch (rev 0) +++ fix-incompetence.patch 2015-06-01 10:15:11 UTC (rev 134460) @@ -0,0 +1,31 @@ +From 03fc9b5fa72fd3197ca1e496f2c22e640304a602 Mon Sep 17 00:00:00 2001 +From: Maxim Doucet +Date: Wed, 27 May 2015 18:34:47 +0200 +Subject: [PATCH] Fix issue synergy/synergy#4720 + +--- + src/gui/src/PluginManager.cpp | 8 +--- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp +index fd3a24e..d1dc876 100644 +--- a/src/gui/src/PluginManager.cpp b/src/gui/src/PluginManager.cpp +@@ -194,13 +194,7 @@ QString PluginManager::getPluginUrl(const QString& pluginName) + process.start(program, args); + bool success = process.waitForStarted(); + +- if (!success || !process.waitForFinished()) +- { +- emit error(tr("Could not get Linux package type.")); +- return ""; +- } +- +- bool isDeb = (process.exitCode() == 0); ++ bool isDeb = (success && process.waitForFinished() & (process.exitCode() == 0)); + + int arch = getProcessorArch(); + if (arch == kProcessorArchLinux32) { +-- +2.4.2 +