[arch-commits] Commit in synergy/trunk (PKGBUILD unfuck-cryptopp-thanks-gentoo.patch)
Levente Polyak
anthraxx at archlinux.org
Fri May 29 16:19:00 UTC 2015
Date: Friday, May 29, 2015 @ 18:19:00
Author: anthraxx
Revision: 134310
upgpkg synergy 1.7.3-1
Modified:
synergy/trunk/PKGBUILD
Deleted:
synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch
-------------------------------------+
PKGBUILD | 45 +++++++++-----
unfuck-cryptopp-thanks-gentoo.patch | 109 ----------------------------------
2 files changed, 30 insertions(+), 124 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-05-29 12:45:12 UTC (rev 134309)
+++ PKGBUILD 2015-05-29 16:19:00 UTC (rev 134310)
@@ -1,4 +1,5 @@
# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
# Contributor: Jelle van der Waa <jelle vdwaa nl>
# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
# Contributor: Dale Blount <dale at archlinux.org>
@@ -10,19 +11,22 @@
# 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.2
+pkgver=1.7.3
pkgrel=1
pkgdesc="Share a single mouse and keyboard between multiple computers"
url="http://synergy-foss.org"
arch=('i686' 'x86_64')
-depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi')
-makedepends=('libxt' 'cmake' 'qt5-base' 'unzip' 'subversion')
-optdepends=('qt5-base: gui support')
+depends=('gcc-libs' 'libxtst' 'libxinerama' 'libxkbcommon-x11' 'avahi' 'curl')
+makedepends=('libxt' 'cmake' 'qt5-base' 'unzip')
+optdepends=(
+ '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")
-sha1sums=('a2fad5d72cf81a634f0b856ce701ca352ec6d9a8'
+sha1sums=('8b29b172ef6d025f3cdf8fb434eb0e23b6ed896f'
'7ec33221725fc496b807e0f435c5e87b590beb5d'
'65ab58cc3546d6374a05a6a260f15045632e43ce')
@@ -37,9 +41,8 @@
build() {
cd "${srcdir}/synergy-${pkgver}-stable"
- #cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_CXX_FLAGS="${CXXFLAGS} -pthread" .
cmake -DCMAKE_INSTALL_PREFIX=/usr .
- make -j1
+ make
cd src/gui
qmake
@@ -46,14 +49,21 @@
make
}
+check() {
+ cd "${srcdir}/synergy-${pkgver}-stable/bin"
+ ./unittests
+}
+
package() {
cd "${srcdir}/synergy-${pkgver}-stable"
# install binary
- install -Dm755 bin/synergy "$pkgdir/usr/bin/synergy"
- install -Dm755 bin/synergyc "$pkgdir/usr/bin/synergyc"
- install -Dm755 bin/synergys "$pkgdir/usr/bin/synergys"
- install -Dm755 bin/syntool "$pkgdir/usr/bin/syntool"
+ 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 config
install -Dm644 "doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example"
@@ -63,12 +73,17 @@
# install manfiles
install -Dm644 "doc/${pkgname}c.man" "${pkgdir}/usr/share/man/man1/${pkgname}c.1"
install -Dm644 "doc/${pkgname}s.man" "${pkgdir}/usr/share/man/man1/${pkgname}s.1"
+
+ # plugin
+ install -Dm644 bin/plugins/libns.so "${pkgdir}/usr/lib/${pkgname}/libns.so"
# install systemd service and socket
- install -Dm644 "$srcdir/synergys_at.service" "$pkgdir/usr/lib/systemd/system/synergys at .service"
- install -Dm644 "$srcdir/synergys_at.socket" "$pkgdir/usr/lib/systemd/system/synergys at .socket"
+ install -Dm644 "${srcdir}/synergys_at.service" "${pkgdir}/usr/lib/systemd/system/synergys at .service"
+ install -Dm644 "${srcdir}/synergys_at.socket" "${pkgdir}/usr/lib/systemd/system/synergys at .socket"
# install desktop/icon stuff
- install -Dm644 "res/synergy.ico" "$pkgdir/usr/share/icons/synergy.ico"
- install -Dm644 "res/synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop"
+ install -Dm644 "res/synergy.ico" "${pkgdir}/usr/share/icons/synergy.ico"
+ install -Dm644 "res/synergy.desktop" "${pkgdir}/usr/share/applications/synergy.desktop"
}
+
+# vim:set ts=2 sw=2 et:
Deleted: unfuck-cryptopp-thanks-gentoo.patch
===================================================================
--- unfuck-cryptopp-thanks-gentoo.patch 2015-05-29 12:45:12 UTC (rev 134309)
+++ unfuck-cryptopp-thanks-gentoo.patch 2015-05-29 16:19:00 UTC (rev 134310)
@@ -1,109 +0,0 @@
---- a/CMakeLists.txt
-+++ b/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)
-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.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()
-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>
--#include <cryptopp562/aes.h>
-+#include <cryptopp/gcm.h>
-+#include <cryptopp/modes.h>
-+#include <cryptopp/aes.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
-
--#include <cryptopp562/osrng.h>
--#include <cryptopp562/sha.h>
-+#include <cryptopp/osrng.h>
-+#include <cryptopp/sha.h>
More information about the arch-commits
mailing list