synergy: update to 1.7.2.
This commit is contained in:
parent
8e9a577301
commit
e0b248f50f
@ -1,105 +0,0 @@
|
|||||||
--- CMakeLists.txt
|
|
||||||
+++ CMakeLists.txt
|
|
||||||
@@ -133,6 +133,10 @@
|
|
||||||
check_type_size(long SIZEOF_LONG)
|
|
||||||
check_type_size(short SIZEOF_SHORT)
|
|
||||||
|
|
||||||
+ set(CMAKE_REQUIRED_LIBRARIES crypto++)
|
|
||||||
+ set(CMAKE_REQUIRED_LIBRARIES)
|
|
||||||
+ set(CMAKE_INCLUDE_DIRECTORIES)
|
|
||||||
+
|
|
||||||
# pthread is used on both Linux and Mac
|
|
||||||
check_library_exists("pthread" pthread_create "" HAVE_PTHREAD)
|
|
||||||
if (HAVE_PTHREAD)
|
|
||||||
--- ext/CMakeLists.txt 2014-03-20 20:24:24.000000000 +0100
|
|
||||||
+++ 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.org/licenses/>.
|
|
||||||
|
|
||||||
-set(cryptopp_dir cryptopp562)
|
|
||||||
-
|
|
||||||
-# only compile the crypto++ files we need.
|
|
||||||
-set(cryptopp_src
|
|
||||||
- ${cryptopp_dir}/3way.cpp
|
|
||||||
- ${cryptopp_dir}/algparam.cpp
|
|
||||||
- ${cryptopp_dir}/asn.cpp
|
|
||||||
- ${cryptopp_dir}/authenc.cpp
|
|
||||||
- ${cryptopp_dir}/basecode.cpp
|
|
||||||
- ${cryptopp_dir}/cpu.cpp
|
|
||||||
- ${cryptopp_dir}/cryptlib.cpp
|
|
||||||
- ${cryptopp_dir}/des.cpp
|
|
||||||
- ${cryptopp_dir}/dessp.cpp
|
|
||||||
- ${cryptopp_dir}/dll.cpp
|
|
||||||
- ${cryptopp_dir}/ec2n.cpp
|
|
||||||
- ${cryptopp_dir}/ecp.cpp
|
|
||||||
- ${cryptopp_dir}/filters.cpp
|
|
||||||
- ${cryptopp_dir}/fips140.cpp
|
|
||||||
- ${cryptopp_dir}/gcm.cpp
|
|
||||||
- ${cryptopp_dir}/gf2n.cpp
|
|
||||||
- ${cryptopp_dir}/gfpcrypt.cpp
|
|
||||||
- ${cryptopp_dir}/hex.cpp
|
|
||||||
- ${cryptopp_dir}/hmac.cpp
|
|
||||||
- ${cryptopp_dir}/hrtimer.cpp
|
|
||||||
- ${cryptopp_dir}/integer.cpp
|
|
||||||
- ${cryptopp_dir}/iterhash.cpp
|
|
||||||
- ${cryptopp_dir}/misc.cpp
|
|
||||||
- ${cryptopp_dir}/modes.cpp
|
|
||||||
- ${cryptopp_dir}/mqueue.cpp
|
|
||||||
- ${cryptopp_dir}/nbtheory.cpp
|
|
||||||
- ${cryptopp_dir}/oaep.cpp
|
|
||||||
- ${cryptopp_dir}/osrng.cpp
|
|
||||||
- ${cryptopp_dir}/pubkey.cpp
|
|
||||||
- ${cryptopp_dir}/queue.cpp
|
|
||||||
- ${cryptopp_dir}/randpool.cpp
|
|
||||||
- ${cryptopp_dir}/rdtables.cpp
|
|
||||||
- ${cryptopp_dir}/rijndael.cpp
|
|
||||||
- ${cryptopp_dir}/rng.cpp
|
|
||||||
- ${cryptopp_dir}/sha.cpp
|
|
||||||
-)
|
|
||||||
|
|
||||||
# if 64-bit windows, compile asm file.
|
|
||||||
if (CMAKE_CL_64)
|
|
||||||
@@ -87,10 +47,3 @@
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=${CRYPTOPP_ARCH}")
|
|
||||||
endif()
|
|
||||||
endif()
|
|
||||||
-
|
|
||||||
-add_library(cryptopp STATIC ${cryptopp_src})
|
|
||||||
-
|
|
||||||
-if (UNIX)
|
|
||||||
- # ignore warnings in crypto++
|
|
||||||
- set_target_properties(cryptopp PROPERTIES COMPILE_FLAGS "-w")
|
|
||||||
-endif()
|
|
||||||
--- src/CMakeLists.txt 2014-02-26 18:46:02.000000000 +0100
|
|
||||||
+++ 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()
|
|
||||||
--- src/lib/io/CryptoMode_cryptopp.h 2014-02-28 13:36:45.000000000 +0100
|
|
||||||
+++ 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>
|
|
||||||
-#include <cryptopp562/aes.h>
|
|
||||||
+#include <cryptopp/gcm.h>
|
|
||||||
+#include <cryptopp/modes.h>
|
|
||||||
+#include <cryptopp/aes.h>
|
|
||||||
--- src/lib/io/CryptoStream_cryptopp.h 2014-02-28 13:36:45.000000000 +0100
|
|
||||||
+++ src/lib/io/CryptoStream_cryptopp.h 2014-03-27 01:45:45.727405235 +0100
|
|
||||||
@@ -25,5 +25,5 @@
|
|
||||||
# pragma GCC system_header
|
|
||||||
#endif
|
|
||||||
|
|
||||||
-#include <cryptopp562/osrng.h>
|
|
||||||
-#include <cryptopp562/sha.h>
|
|
||||||
+#include <cryptopp/osrng.h>
|
|
||||||
+#include <cryptopp/sha.h>
|
|
||||||
@ -1,20 +1,27 @@
|
|||||||
# Template file for 'sed'
|
# Template file for 'sed'
|
||||||
pkgname=synergy
|
pkgname=synergy
|
||||||
version=1.6.3
|
version=1.7.2
|
||||||
revision=1
|
revision=1
|
||||||
|
wrksrc="${pkgname}-${version}-stable"
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
hostmakedepends="cmake unzip pkg-config"
|
hostmakedepends="cmake unzip pkg-config"
|
||||||
makedepends="avahi-compat-libs-devel libcurl-devel crypto++-devel
|
makedepends="avahi-compat-libs-devel libcurl-devel
|
||||||
libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel"
|
libSM-devel libXext-devel libXrandr-devel libXtst-devel libXinerama-devel"
|
||||||
short_desc="Share a single mouse and keyboard between multiple computers"
|
short_desc="Share a single mouse and keyboard between multiple computers"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
homepage="http://synergy-foss.org/"
|
homepage="http://synergy-foss.org/"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
distfiles="https://github.com/synergy/synergy/archive/${version}.tar.gz"
|
distfiles="https://github.com/synergy/synergy/archive/v${version}-stable.tar.gz"
|
||||||
checksum=93b1965b8e0cfc55cc654aab7053a58b9e730d09e68bbc520be32353a01dce1a
|
checksum=f3b0b1af88a38a9e3de49007e840c007491c051832a291a6ae4cf8dc2eed4943
|
||||||
|
|
||||||
CXXFLAGS="-pthread"
|
CXXFLAGS="-pthread"
|
||||||
|
|
||||||
|
post_extract() {
|
||||||
|
cd ext
|
||||||
|
unzip gmock-1.6.0.zip -d gmock-1.6.0
|
||||||
|
unzip gtest-1.6.0.zip -d gtest-1.6.0
|
||||||
|
}
|
||||||
|
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
makedepends+=" qt5-devel"
|
makedepends+=" qt5-devel"
|
||||||
post_build() {
|
post_build() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user