synergy: update to 1.4.17.
This commit is contained in:
Juan RP
parent
79f6c9014c
commit
6f9ad3dc47
|
|
@ -0,0 +1,105 @@
|
|||
--- 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,34 +1,40 @@
|
|||
# Template file for 'sed'
|
||||
pkgname=synergy
|
||||
version=1.4.15
|
||||
revision=2
|
||||
wrksrc=${pkgname}-${version}-Source
|
||||
version=1.4.17
|
||||
revision=1
|
||||
wrksrc="${pkgname}-${version}-Source"
|
||||
build_style=cmake
|
||||
hostmakedepends="cmake unzip"
|
||||
makedepends="qt-devel libSM-devel libXext-devel libXtst-devel>=1.2.1_2 libXinerama-devel"
|
||||
makedepends="libcurl-devel crypto++-devel libSM-devel libXext-devel libXtst-devel>=1.2.1_2 libXinerama-devel"
|
||||
short_desc="Share a single mouse and keyboard between multiple computers"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://synergy-foss.org/"
|
||||
license="GPL-2"
|
||||
distfiles="http://synergy.googlecode.com/files/$pkgname-$version-Source.tar.gz"
|
||||
checksum=643745888ec6150e74cb6da9813f8c7572f2f87cf35f0bd4f64cc1e467ef3550
|
||||
distfiles="http://fossfiles.com/synergy/synergy-${version}-r2055-Source.tar.gz"
|
||||
checksum=95c7e40d0ba249f91866d433f3f2407771c3d9f72e257c5b0655ef84f7558ad7
|
||||
|
||||
do_build() {
|
||||
unset LDFLAGS
|
||||
|
||||
# Unzip the crypto library
|
||||
unzip -d tools/cryptopp562 tools/cryptopp562.zip
|
||||
|
||||
cmake -DCMAKE_INSTALL_PREFIX=/usr .
|
||||
make ${makejobs}
|
||||
CXXFLAGS="-pthread"
|
||||
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
makedepends+=" qt-devel"
|
||||
post_build() {
|
||||
# qt4 gui
|
||||
cd src/gui
|
||||
qmake
|
||||
make ${makejobs}
|
||||
}
|
||||
}
|
||||
synergy-gui_package() {
|
||||
depends="desktop-file-utils ${sourcepkg}>=${version}_${revision}"
|
||||
replaces="synergy<1.4.12_2"
|
||||
pkg_install() {
|
||||
vmove usr/bin/synergy
|
||||
vmove usr/share/pixmaps
|
||||
vmove usr/share/applications
|
||||
}
|
||||
}
|
||||
fi
|
||||
|
||||
do_install() {
|
||||
vinstall bin/synergy 755 usr/bin
|
||||
vinstall bin/synergyc 755 usr/bin
|
||||
vinstall bin/synergys 755 usr/bin
|
||||
|
||||
|
|
@ -40,12 +46,3 @@ do_install() {
|
|||
vinstall ${FILESDIR}/synergy.desktop 644 usr/share/applications
|
||||
}
|
||||
|
||||
synergy-gui_package() {
|
||||
depends="desktop-file-utils ${sourcepkg}>=${version}_${revision}"
|
||||
replaces="synergy<1.4.12_2"
|
||||
pkg_install() {
|
||||
vmove usr/bin/synergy
|
||||
vmove usr/share/pixmaps
|
||||
vmove usr/share/applications
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue