diff options
| author |   Joao Carreira <jfmcarreira@gmail.com> | 2014-11-04 22:46:20 +0000 |
|---|---|---|
| committer | Joao Carreira <jfmcarreira@gmail.com> | 2014-11-04 22:46:20 +0000 |
| commit | 1c4bff1304bc5d4b4393f1128de613dda31e7e9e (patch) | |
| tree | a9fe703d02120a5b3e9c38810c359d3681ff9719 /x11-misc | |
| parent | Add synergy 1.4.12 (diff) | |
| download | carreira-1c4bff1304bc5d4b4393f1128de613dda31e7e9e.tar.gz carreira-1c4bff1304bc5d4b4393f1128de613dda31e7e9e.tar.bz2 carreira-1c4bff1304bc5d4b4393f1128de613dda31e7e9e.zip | |
Add missing patches
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/synergy/Manifest | 2 | ||||
| -rw-r--r-- | x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch | 74 | ||||
| -rw-r--r-- | x11-misc/synergy/files/synergy-1.4.12-pthread.patch | 12 |
3 files changed, 88 insertions, 0 deletions
diff --git a/x11-misc/synergy/Manifest b/x11-misc/synergy/Manifest index e6cce0e..60b60bf 100644 --- a/x11-misc/synergy/Manifest +++ b/x11-misc/synergy/Manifest @@ -1,3 +1,5 @@ +AUX synergy-1.4.12-cryptopp.patch 1803 SHA256 aa7ec824b16b3e94fcbca23a0722d00520f248db85a9bb1b97feaa803bbb445f SHA512 5adb88c74b14464fa3f024ee67943f0f4e23f12afe0150045edc0261fba5befccb60542ff1b0fd5504fe8f49ef1dbd83387c5e967bc2c94854ae570e86c543de WHIRLPOOL 57b31f63833cafff8567223495978801ae1bf6cd34e13d0fb5297fca869bcb0060a9d6556b784d90c7f7530d9ef55b60b0830260b3cfa6a60070f2d89d02881d +AUX synergy-1.4.12-pthread.patch 405 SHA256 25c884bd6deea8c885bf69e01127d2deb10d73e371c151966885a5157ecfbd44 SHA512 fad9b04a46ee6a1f693051da9067ad25f33379929f0b6419c4501d5a773d25234af08c0785756575c22024aa47634b153c90313e04dee5edfe3da36b9390bb2d WHIRLPOOL 55805a25eceb0c1a660fbaa3a4a2f96a6caaf434f42a883c1ebcaca654cf012e5b377ca02c01aeaf87b37a4d9e06a1e9f84cb2baa41369ed22cad089b7922dc4 DIST synergy-1.4.12-Source.tar.gz 3954996 SHA256 35b60c8d73368a0cb90daa629e64f66171b934a799a82427431979cca7260849 SHA512 5305e03d871e5408640ece55364067418f9b8b160dda31f994ebafe807b31291bdaa688a901f2e81710acb0857952c37f0c1823a50c927573feaec0c8659be9d WHIRLPOOL 1ba49a12ad5dc7853167c1ddcda032e876a94e9fa76e2250da96dea56353cdcd7bf00917346042aa7f737b3fd386da2d0b440e95d81f51f16d8fc3d3079c6b27 DIST synergy.png 26910 SHA256 c7e6cbaea549a189daed46c7170477772d932144ca20c9ea0db6859bd896f08c SHA512 0b5a1813c71fd2923adca4cf7b0f840fc37c73a2f18ad68f8bb2fd2ea312d9a884e2e2bcd78f6dd0f13d1f31ea3991379e141ec62d970a18c3a9c46b26720c5d WHIRLPOOL 7b3e7f9b05462fb536de0ca8d2257ea8abc0b2f17f0335d7eee73322f79a9ecccf729b992e58cd0965a9c9842f48020b6588cd4af47ea0f6d2b2cd7793c64e3a EBUILD synergy-1.4.12.ebuild 2075 SHA256 8e2a9ce8787316278de95922b8e88312b1faa288c1d921db9fb7e7e721fb690d SHA512 22991d8e2f4c1aaf4db7472b8a1d3b349b43ec2ab81339ab7f5db01e40554b16cf7f1240d2782cd0616fee8ebedbd97144514ffb744cfdd7f70487177dceff36 WHIRLPOOL deff44c119305c3038d45ca0719d9c037baa8069929bf65b00037484a1dc5c523f83c20f425ef7b9087bd0f98e1ddcd5777bff1c116836f94556753878f2adcd diff --git a/x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch b/x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch new file mode 100644 index 0000000..3ed5b18 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.12-cryptopp.patch @@ -0,0 +1,74 @@ +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -13,24 +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(cpp_dir cryptopp562) +- +-file(GLOB cpp_src ${cpp_dir}/*.cpp) +- +-if (WIN32) +- file(GLOB cpp_hdr ${cpp_dir}/*.h) +- list(APPEND cpp_src ${cpp_hdr}) +-endif() +- +-file(GLOB cpp_ignore +- ${cpp_dir}/simple.cpp +- ${cpp_dir}/strciphr.cpp +- ${cpp_dir}/polynomi.cpp +- ${cpp_dir}/eprecomp.cpp +- ${cpp_dir}/eccrypto.cpp +- ${cpp_dir}/algebra.cpp) +-list(REMOVE_ITEM cpp_src ${cpp_ignore}) +- + # if 64-bit windows, compile asm file. + if (CMAKE_CL_64) + list(APPEND cpp_src ${cpp_dir}/x64dll.asm ${cpp_dir}/x64masm.asm) +@@ -60,5 +42,3 @@ + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native") + endif() + endif() +- +-add_library(cryptopp STATIC ${cpp_src}) +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -128,6 +128,10 @@ + + endif() + ++ set(CMAKE_REQUIRED_LIBRARIES crypto++) ++ set(CMAKE_REQUIRED_LIBRARIES) ++ set(CMAKE_INCLUDE_DIRECTORIES) ++ + check_type_size(char SIZEOF_CHAR) + check_type_size(int SIZEOF_INT) + check_type_size(long SIZEOF_LONG) +--- a/src/lib/synergy/CCryptoMode.h ++++ b/src/lib/synergy/CCryptoMode.h +@@ -17,9 +17,9 @@ + + #pragma once + +-#include <cryptopp562/gcm.h> +-#include <cryptopp562/modes.h> +-#include <cryptopp562/aes.h> ++#include <crypto++/gcm.h> ++#include <crypto++/modes.h> ++#include <crypto++/aes.h> + #include "ECryptoMode.h" + #include "CString.h" + +--- a/src/lib/synergy/CCryptoStream.h ++++ b/src/lib/synergy/CCryptoStream.h +@@ -20,8 +20,8 @@ + #include "BasicTypes.h" + #include "CStreamFilter.h" + #include "CCryptoMode.h" +-#include <cryptopp562/osrng.h> +-#include <cryptopp562/sha.h> ++#include <crypto++/osrng.h> ++#include <crypto++/sha.h> + + class CCryptoOptions; + diff --git a/x11-misc/synergy/files/synergy-1.4.12-pthread.patch b/x11-misc/synergy/files/synergy-1.4.12-pthread.patch new file mode 100644 index 0000000..bb1a23a --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.4.12-pthread.patch @@ -0,0 +1,12 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -136,7 +140,8 @@ + # pthread is used on both Linux and Mac + check_library_exists("pthread" pthread_create "" HAVE_PTHREAD) + if (HAVE_PTHREAD) +- list(APPEND libs pthread) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") + else (HAVE_PTHREAD) + message(FATAL_ERROR "Missing library: pthread") + endif() |