[arch-commits] Commit in synergy/trunk (PKGBUILD unfuck-cryptopp-thanks-gentoo.patch)
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
===
--- PKGBUILD2015-05-29 12:45:12 UTC (rev 134309)
+++ PKGBUILD2015-05-29 16:19:00 UTC (rev 134310)
@@ -1,4 +1,5 @@
# Maintainer: Sven-Hendrik Haase s...@lutzhaase.com
+# Maintainer: Levente Polyak anthraxx[at]archlinux[dot]org
# Contributor: Jelle van der Waa jelle vdwaa nl
# Contributor: Stéphane Gaudreault steph...@archlinux.org
# Contributor: Dale Blount d...@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@.service
- install -Dm644 $srcdir/synergys_at.socket
$pkgdir/usr/lib/systemd/system/synergys@.socket
+ install -Dm644 ${srcdir}/synergys_at.service
${pkgdir}/usr/lib/systemd/system/synergys@.service
+ install -Dm644 ${srcdir}/synergys_at.socket
${pkgdir}/usr/lib/systemd/system/synergys@.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
[arch-commits] Commit in synergy/trunk (PKGBUILD unfuck-cryptopp-thanks-gentoo.patch)
Date: Thursday, March 27, 2014 @ 02:00:59
Author: svenstaro
Revision: 108343
upgpkg: synergy 1.4.17-1
upstream release 1.4.17
Modified:
synergy/trunk/PKGBUILD
synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch
-+
PKGBUILD| 14 +--
unfuck-cryptopp-thanks-gentoo.patch | 60 --
2 files changed, 46 insertions(+), 28 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2014-03-27 00:41:31 UTC (rev 108342)
+++ PKGBUILD2014-03-27 01:00:59 UTC (rev 108343)
@@ -4,8 +4,14 @@
# Contributor: Dale Blount d...@archlinux.org
# Contributor: Michael Düll m...@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 @@
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
Modified: unfuck-cryptopp-thanks-gentoo.patch
===
--- unfuck-cryptopp-thanks-gentoo.patch 2014-03-27 00:41:31 UTC (rev 108342)
+++ unfuck-cryptopp-thanks-gentoo.patch 2014-03-27 01:00:59 UTC (rev 108343)
@@ -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.0
+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,22 +58,38 @@
- ${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 @@
+-
+-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.0
+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.0 +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
- #pragma once
-
-#include cryptopp562/gcm.h
-#include cryptopp562/modes.h
-#include cryptopp562/aes.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.0 +0100
[arch-commits] Commit in synergy/trunk (PKGBUILD unfuck-cryptopp-thanks-gentoo.patch)
Date: Friday, November 22, 2013 @ 17:04:29
Author: svenstaro
Revision: 101310
upgpkg: synergy 1.4.15-2
Try to fix the cryptopp problems
Added:
synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch
Modified:
synergy/trunk/PKGBUILD
-+
PKGBUILD| 17 +++--
unfuck-cryptopp-thanks-gentoo.patch | 97 ++
2 files changed, 107 insertions(+), 7 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2013-11-22 13:42:25 UTC (rev 101309)
+++ PKGBUILD2013-11-22 16:04:29 UTC (rev 101310)
@@ -6,7 +6,7 @@
pkgname=synergy
pkgver=1.4.15
-pkgrel=1
+pkgrel=2
pkgdesc=Share a single mouse and keyboard between multiple computers
url=http://synergy-foss.org;
arch=('i686' 'x86_64')
@@ -16,16 +16,19 @@
license=('GPL2')
source=(http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz;
synergys.socket
-synergys.service)
-sha512sums=('857e8cbfb0b32c7dc325de5765f182f4e4fb198443b4a3e26d38c2d3dec3819e57057b91a202b53c86d4fad18154d1d58b401812dd8fabc384255e44d4b4b01a'
-
'f7d918faf4a25654786f270fc48b6e4089ecd1b2f504bb90de543b47a862733f7be067e06fd613d621bba48d20dc63214966e2cfbd2cb3fcbfe623d6d41f10ad'
-
'a10dfe5b24ac6f4a2ef3a3a9f8a6a3c432b91d5e59d1fae2258d37c5be00ac8f172656fa0d213012c7dc94ab8c04c3945ae33acfcd5db5fad8b37ccc9f5e980f')
+synergys.service
+unfuck-cryptopp-thanks-gentoo.patch)
+sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73'
+ '947406e72351145c65ba9884ed175bf781482d46'
+ '00f2259c31c9551c0830d9e889fd0a0790cf9045'
+ '129151952e6d25504ca823aee8ebe93ce3d376ce')
build() {
cd ${srcdir}/${pkgname}-${pkgver}-Source
- # Unzip the crypto library
- unzip -d tools/cryptopp562 tools/cryptopp562.zip
+ # Unfuck the bundled cryptopp stuff. Thanks a lot, Gentoo!
+ # You and Fedora are our only friends in this crazy world.
+ patch -Np1 ${srcdir}/unfuck-cryptopp-thanks-gentoo.patch
cmake -D CMAKE_INSTALL_PREFIX=/usr .
make
Added: unfuck-cryptopp-thanks-gentoo.patch
===
--- unfuck-cryptopp-thanks-gentoo.patch (rev 0)
+++ unfuck-cryptopp-thanks-gentoo.patch 2013-11-22 16:04:29 UTC (rev 101310)
@@ -0,0 +1,97 @@
+--- 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)
+--- a/tools/CMakeLists.txt
b/tools/CMakeLists.txt
+@@ -13,47 +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/.
+
+-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)
+ 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)
+ 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
+
+-#include cryptopp562/gcm.h
+-#include cryptopp562/modes.h
+-#include cryptopp562/aes.h
++#include cryptopp/gcm.h
++#include cryptopp/modes.h
++#include cryptopp/aes.h
+ #include ECryptoMode.h
+ #include CString.h
+
+---
