diff options
Diffstat (limited to 'community/synergy')
| -rw-r--r-- | community/synergy/PKGBUILD | 14 | ||||
| -rw-r--r-- | community/synergy/unfuck-cryptopp-thanks-gentoo.patch | 60 |
2 files changed, 46 insertions, 28 deletions
diff --git a/community/synergy/PKGBUILD b/community/synergy/PKGBUILD index dc269589d..f28fc11db 100644 --- a/community/synergy/PKGBUILD +++ b/community/synergy/PKGBUILD @@ -4,8 +4,14 @@ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Michael Düll <mail@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.4.16 +pkgver=1.4.17 +_pkgver=2055 pkgrel=1 pkgdesc="Share a single mouse and keyboard between multiple computers" url="http://synergy-foss.org" @@ -14,14 +20,14 @@ depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') makedepends=('libxt' 'cmake' 'qt5-base' 'unzip') optdepends=('qt5-base: gui support') license=('GPL2') -source=("http://fossfiles.com/synergy/synergy-${pkgver}-r1969-Source.tar.gz" +source=("http://fossfiles.com/synergy/synergy-${pkgver}-r${_pkgver}-Source.tar.gz" "synergys.socket" "synergys.service" "unfuck-cryptopp-thanks-gentoo.patch") -sha1sums=('c489e8f3262d5ad5dbcb5257c8354f459bd68f1f' +sha1sums=('a28fd5c7e709e6ee85501e9ed4496d060d3e5c22' '947406e72351145c65ba9884ed175bf781482d46' '00f2259c31c9551c0830d9e889fd0a0790cf9045' - '129151952e6d25504ca823aee8ebe93ce3d376ce') + '8e321e664ae4b7a763175524dd938a88d85c7909') build() { cd "${srcdir}/${pkgname}-${pkgver}-Source" diff --git a/community/synergy/unfuck-cryptopp-thanks-gentoo.patch b/community/synergy/unfuck-cryptopp-thanks-gentoo.patch index 2638c7fd2..45f816bc3 100644 --- a/community/synergy/unfuck-cryptopp-thanks-gentoo.patch +++ b/community/synergy/unfuck-cryptopp-thanks-gentoo.patch @@ -11,11 +11,12 @@ # pthread is used on both Linux and Mac check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) if (HAVE_PTHREAD) ---- a/tools/CMakeLists.txt -+++ b/tools/CMakeLists.txt -@@ -13,47 +13,6 @@ +diff -ru synergy-1.4.17-Source/ext/CMakeLists.txt lol/ext/CMakeLists.txt +--- synergy-1.4.17-Source/ext/CMakeLists.txt 2014-03-20 20:24:24.000000000 +0100 ++++ lol/ext/CMakeLists.txt 2014-03-27 01:53:09.017682192 +0100 +@@ -13,46 +13,6 @@ # You should have received a copy of the GNU General Public License - # along with this program. If not, see <http://www.gnu/licenses/>. + # along with this program. If not, see <http://www.gnu.org/licenses/>. -set(cryptopp_dir cryptopp562) - @@ -57,21 +58,37 @@ - ${cryptopp_dir}/rng.cpp - ${cryptopp_dir}/sha.cpp -) -- + # if 64-bit windows, compile asm file. if (CMAKE_CL_64) - list(APPEND cryptopp_src ${cryptopp_dir}/x64dll.asm ${cryptopp_dir}/x64masm.asm) -@@ -83,5 +42,3 @@ - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") +@@ -87,10 +47,3 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}") endif() endif() - -add_library(cryptopp STATIC ${cryptopp_src}) ---- a/src/lib/io/CCryptoMode.h -+++ b/src/lib/io/CCryptoMode.h -@@ -17,9 +17,9 @@ - - #pragma once +- +-if (UNIX) +- # ignore warnings in crypto++ +- set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w") +-endif() +diff -ru synergy-1.4.17-Source/src/CMakeLists.txt lol/src/CMakeLists.txt +--- synergy-1.4.17-Source/src/CMakeLists.txt 2014-02-26 18:46:02.000000000 +0100 ++++ lol/src/CMakeLists.txt 2014-03-27 01:54:56.390157358 +0100 +@@ -18,7 +18,3 @@ + add_subdirectory(cmd) + add_subdirectory(plugin) + add_subdirectory(micro) +- +-if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX") +- add_subdirectory(test) +-endif() +diff -ru synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h lol/src/lib/io/CryptoMode_cryptopp.h +--- synergy-1.4.17-Source/src/lib/io/CryptoMode_cryptopp.h 2014-02-28 13:36:45.000000000 +0100 ++++ lol/src/lib/io/CryptoMode_cryptopp.h 2014-03-27 01:45:34.810484242 +0100 +@@ -25,6 +25,6 @@ + # pragma GCC system_header + #endif -#include <cryptopp562/gcm.h> -#include <cryptopp562/modes.h> @@ -79,19 +96,14 @@ +#include <cryptopp/gcm.h> +#include <cryptopp/modes.h> +#include <cryptopp/aes.h> - #include "ECryptoMode.h" - #include "CString.h" +diff -ru synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h lol/src/lib/io/CryptoStream_cryptopp.h +--- synergy-1.4.17-Source/src/lib/io/CryptoStream_cryptopp.h 2014-02-28 13:36:45.000000000 +0100 ++++ lol/src/lib/io/CryptoStream_cryptopp.h 2014-03-27 01:45:45.727405235 +0100 +@@ -25,5 +25,5 @@ + # pragma GCC system_header + #endif ---- a/src/lib/io/CCryptoStream.h -+++ b/src/lib/io/CCryptoStream.h -@@ -20,8 +20,8 @@ - #include "BasicTypes.h" - #include "CStreamFilter.h" - #include "CCryptoMode.h" -#include <cryptopp562/osrng.h> -#include <cryptopp562/sha.h> +#include <cryptopp/osrng.h> +#include <cryptopp/sha.h> - - class CCryptoOptions; - |