Date: Wednesday, December 4, 2013 @ 13:45:20 Author: svenstaro Revision: 102038
archrelease: copy trunk to community-i686, community-x86_64 Added: synergy/repos/community-i686/PKGBUILD (from rev 102037, synergy/trunk/PKGBUILD) synergy/repos/community-i686/synergys.service (from rev 102037, synergy/trunk/synergys.service) synergy/repos/community-i686/synergys.socket (from rev 102037, synergy/trunk/synergys.socket) synergy/repos/community-i686/unfuck-cryptopp-thanks-gentoo.patch (from rev 102037, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch) synergy/repos/community-x86_64/PKGBUILD (from rev 102037, synergy/trunk/PKGBUILD) synergy/repos/community-x86_64/synergys.service (from rev 102037, synergy/trunk/synergys.service) synergy/repos/community-x86_64/synergys.socket (from rev 102037, synergy/trunk/synergys.socket) synergy/repos/community-x86_64/unfuck-cryptopp-thanks-gentoo.patch (from rev 102037, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch) Deleted: synergy/repos/community-i686/PKGBUILD synergy/repos/community-i686/synergys.service synergy/repos/community-i686/synergys.socket synergy/repos/community-i686/unfuck-cryptopp-thanks-gentoo.patch synergy/repos/community-x86_64/PKGBUILD synergy/repos/community-x86_64/synergys.service synergy/repos/community-x86_64/synergys.socket synergy/repos/community-x86_64/unfuck-cryptopp-thanks-gentoo.patch ------------------------------------------------------+ /PKGBUILD | 122 ++++++++++ /synergys.service | 20 + /synergys.socket | 18 + /unfuck-cryptopp-thanks-gentoo.patch | 194 +++++++++++++++++ community-i686/PKGBUILD | 61 ----- community-i686/synergys.service | 10 community-i686/synergys.socket | 9 community-i686/unfuck-cryptopp-thanks-gentoo.patch | 97 -------- community-x86_64/PKGBUILD | 61 ----- community-x86_64/synergys.service | 10 community-x86_64/synergys.socket | 9 community-x86_64/unfuck-cryptopp-thanks-gentoo.patch | 97 -------- 12 files changed, 354 insertions(+), 354 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2013-12-04 12:39:52 UTC (rev 102037) +++ community-i686/PKGBUILD 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,61 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Jelle van der Waa <jelle vdwaa nl> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Michael Düll <m...@akurei.me> - -pkgname=synergy -pkgver=1.4.15 -pkgrel=2 -pkgdesc="Share a single mouse and keyboard between multiple computers" -url="http://synergy-foss.org" -arch=('i686' 'x86_64') -depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') -makedepends=('libxt' 'cmake' 'qt4' 'unzip') -optdepends=('qt4: gui support') -license=('GPL2') -source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" - "synergys.socket" - "synergys.service" - "unfuck-cryptopp-thanks-gentoo.patch") -sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73' - '947406e72351145c65ba9884ed175bf781482d46' - '00f2259c31c9551c0830d9e889fd0a0790cf9045' - '129151952e6d25504ca823aee8ebe93ce3d376ce') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-Source" - - # 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 - - cd src/gui - qmake-qt4 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" - - # install binary - install -Dm755 synergy "$pkgdir/usr/bin/synergy" - install -Dm755 synergyc "$pkgdir/usr/bin/synergyc" - install -Dm755 synergys "$pkgdir/usr/bin/synergys" - - # install config - install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" - - # install systemd service and socket - install -d "$pkgdir/usr/lib/systemd/system" - install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" - install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" - - # install desktop/icon stuff - cd ../res - install -Dm644 "synergy.ico" "$pkgdir/usr/share/pixmaps/synergy.ico" - install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" -} Copied: synergy/repos/community-i686/PKGBUILD (from rev 102037, synergy/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2013-12-04 12:45:20 UTC (rev 102038) @@ -0,0 +1,61 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Jelle van der Waa <jelle vdwaa nl> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Michael Düll <m...@akurei.me> + +pkgname=synergy +pkgver=1.4.15 +pkgrel=3 +pkgdesc="Share a single mouse and keyboard between multiple computers" +url="http://synergy-foss.org" +arch=('i686' 'x86_64') +depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') +makedepends=('libxt' 'cmake' 'qt4' 'unzip') +optdepends=('qt4: gui support') +license=('GPL2') +source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" + "synergys.socket" + "synergys.service" + "unfuck-cryptopp-thanks-gentoo.patch") +sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73' + '947406e72351145c65ba9884ed175bf781482d46' + '00f2259c31c9551c0830d9e889fd0a0790cf9045' + '129151952e6d25504ca823aee8ebe93ce3d376ce') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + # 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 + + cd src/gui + qmake-qt4 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" + + # install binary + install -Dm755 synergy "$pkgdir/usr/bin/synergy" + install -Dm755 synergyc "$pkgdir/usr/bin/synergyc" + install -Dm755 synergys "$pkgdir/usr/bin/synergys" + + # install config + install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" + + # install systemd service and socket + install -d "$pkgdir/usr/lib/systemd/system" + install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" + install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" + + # install desktop/icon stuff + cd ../res + install -Dm644 "synergy.ico" "$pkgdir/usr/share/icons/synergy.ico" + install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" +} Deleted: community-i686/synergys.service =================================================================== --- community-i686/synergys.service 2013-12-04 12:39:52 UTC (rev 102037) +++ community-i686/synergys.service 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,10 +0,0 @@ -[Unit] -Description=Synergy Server Daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/synergys --config /etc/synergy.conf - -[Install] -WantedBy=multi-user.target Copied: synergy/repos/community-i686/synergys.service (from rev 102037, synergy/trunk/synergys.service) =================================================================== --- community-i686/synergys.service (rev 0) +++ community-i686/synergys.service 2013-12-04 12:45:20 UTC (rev 102038) @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Server Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/synergys --config /etc/synergy.conf + +[Install] +WantedBy=multi-user.target Deleted: community-i686/synergys.socket =================================================================== --- community-i686/synergys.socket 2013-12-04 12:39:52 UTC (rev 102037) +++ community-i686/synergys.socket 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,9 +0,0 @@ -[Unit] -Conflicts=synergys.service - -[Socket] -ListenStream=24800 -Accept=false - -[Install] -WantedBy=sockets.target Copied: synergy/repos/community-i686/synergys.socket (from rev 102037, synergy/trunk/synergys.socket) =================================================================== --- community-i686/synergys.socket (rev 0) +++ community-i686/synergys.socket 2013-12-04 12:45:20 UTC (rev 102038) @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target Deleted: community-i686/unfuck-cryptopp-thanks-gentoo.patch =================================================================== --- community-i686/unfuck-cryptopp-thanks-gentoo.patch 2013-12-04 12:39:52 UTC (rev 102037) +++ community-i686/unfuck-cryptopp-thanks-gentoo.patch 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,97 +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) ---- 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" - ---- a/src/lib/io/CCryptoStream.h -+++ b/src/lib/io/CCryptoStream.h -@@ -20,8 +20,8 @@ - #include "BasicTypes.h" - #include "CStreamFilter.h" - #include "CCryptoMode.h" --#include <cryptopp562/osrng.h> --#include <cryptopp562/sha.h> -+#include <cryptopp/osrng.h> -+#include <cryptopp/sha.h> - - class CCryptoOptions; - Copied: synergy/repos/community-i686/unfuck-cryptopp-thanks-gentoo.patch (from rev 102037, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch) =================================================================== --- community-i686/unfuck-cryptopp-thanks-gentoo.patch (rev 0) +++ community-i686/unfuck-cryptopp-thanks-gentoo.patch 2013-12-04 12:45:20 UTC (rev 102038) @@ -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" + +--- a/src/lib/io/CCryptoStream.h ++++ b/src/lib/io/CCryptoStream.h +@@ -20,8 +20,8 @@ + #include "BasicTypes.h" + #include "CStreamFilter.h" + #include "CCryptoMode.h" +-#include <cryptopp562/osrng.h> +-#include <cryptopp562/sha.h> ++#include <cryptopp/osrng.h> ++#include <cryptopp/sha.h> + + class CCryptoOptions; + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2013-12-04 12:39:52 UTC (rev 102037) +++ community-x86_64/PKGBUILD 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,61 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> -# Contributor: Jelle van der Waa <jelle vdwaa nl> -# Contributor: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Dale Blount <d...@archlinux.org> -# Contributor: Michael Düll <m...@akurei.me> - -pkgname=synergy -pkgver=1.4.15 -pkgrel=2 -pkgdesc="Share a single mouse and keyboard between multiple computers" -url="http://synergy-foss.org" -arch=('i686' 'x86_64') -depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') -makedepends=('libxt' 'cmake' 'qt4' 'unzip') -optdepends=('qt4: gui support') -license=('GPL2') -source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" - "synergys.socket" - "synergys.service" - "unfuck-cryptopp-thanks-gentoo.patch") -sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73' - '947406e72351145c65ba9884ed175bf781482d46' - '00f2259c31c9551c0830d9e889fd0a0790cf9045' - '129151952e6d25504ca823aee8ebe93ce3d376ce') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-Source" - - # 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 - - cd src/gui - qmake-qt4 - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" - - # install binary - install -Dm755 synergy "$pkgdir/usr/bin/synergy" - install -Dm755 synergyc "$pkgdir/usr/bin/synergyc" - install -Dm755 synergys "$pkgdir/usr/bin/synergys" - - # install config - install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" - - # install systemd service and socket - install -d "$pkgdir/usr/lib/systemd/system" - install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" - install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" - - # install desktop/icon stuff - cd ../res - install -Dm644 "synergy.ico" "$pkgdir/usr/share/pixmaps/synergy.ico" - install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" -} Copied: synergy/repos/community-x86_64/PKGBUILD (from rev 102037, synergy/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2013-12-04 12:45:20 UTC (rev 102038) @@ -0,0 +1,61 @@ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> +# Contributor: Jelle van der Waa <jelle vdwaa nl> +# Contributor: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Dale Blount <d...@archlinux.org> +# Contributor: Michael Düll <m...@akurei.me> + +pkgname=synergy +pkgver=1.4.15 +pkgrel=3 +pkgdesc="Share a single mouse and keyboard between multiple computers" +url="http://synergy-foss.org" +arch=('i686' 'x86_64') +depends=('gcc-libs' 'libxtst' 'libxinerama' 'crypto++') +makedepends=('libxt' 'cmake' 'qt4' 'unzip') +optdepends=('qt4: gui support') +license=('GPL2') +source=("http://synergy.googlecode.com/files/$pkgname-$pkgver-Source.tar.gz" + "synergys.socket" + "synergys.service" + "unfuck-cryptopp-thanks-gentoo.patch") +sha1sums=('0766bc3d95d6971746764d30e0853db14926ae73' + '947406e72351145c65ba9884ed175bf781482d46' + '00f2259c31c9551c0830d9e889fd0a0790cf9045' + '129151952e6d25504ca823aee8ebe93ce3d376ce') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-Source" + + # 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 + + cd src/gui + qmake-qt4 + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}-Source/bin" + + # install binary + install -Dm755 synergy "$pkgdir/usr/bin/synergy" + install -Dm755 synergyc "$pkgdir/usr/bin/synergyc" + install -Dm755 synergys "$pkgdir/usr/bin/synergys" + + # install config + install -Dm644 "$srcdir/$pkgname-$pkgver-Source/doc/${pkgname}.conf.example" "${pkgdir}/etc/${pkgname}.conf.example" + + # install systemd service and socket + install -d "$pkgdir/usr/lib/systemd/system" + install -Dm644 "$srcdir/synergys.service" "$pkgdir/usr/lib/systemd/system/" + install -Dm644 "$srcdir/synergys.socket" "$pkgdir/usr/lib/systemd/system/" + + # install desktop/icon stuff + cd ../res + install -Dm644 "synergy.ico" "$pkgdir/usr/share/icons/synergy.ico" + install -Dm644 "synergy.desktop" "$pkgdir/usr/share/applications/synergy.desktop" +} Deleted: community-x86_64/synergys.service =================================================================== --- community-x86_64/synergys.service 2013-12-04 12:39:52 UTC (rev 102037) +++ community-x86_64/synergys.service 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,10 +0,0 @@ -[Unit] -Description=Synergy Server Daemon -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/synergys --config /etc/synergy.conf - -[Install] -WantedBy=multi-user.target Copied: synergy/repos/community-x86_64/synergys.service (from rev 102037, synergy/trunk/synergys.service) =================================================================== --- community-x86_64/synergys.service (rev 0) +++ community-x86_64/synergys.service 2013-12-04 12:45:20 UTC (rev 102038) @@ -0,0 +1,10 @@ +[Unit] +Description=Synergy Server Daemon +After=network.target + +[Service] +Type=forking +ExecStart=/usr/bin/synergys --config /etc/synergy.conf + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/synergys.socket =================================================================== --- community-x86_64/synergys.socket 2013-12-04 12:39:52 UTC (rev 102037) +++ community-x86_64/synergys.socket 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,9 +0,0 @@ -[Unit] -Conflicts=synergys.service - -[Socket] -ListenStream=24800 -Accept=false - -[Install] -WantedBy=sockets.target Copied: synergy/repos/community-x86_64/synergys.socket (from rev 102037, synergy/trunk/synergys.socket) =================================================================== --- community-x86_64/synergys.socket (rev 0) +++ community-x86_64/synergys.socket 2013-12-04 12:45:20 UTC (rev 102038) @@ -0,0 +1,9 @@ +[Unit] +Conflicts=synergys.service + +[Socket] +ListenStream=24800 +Accept=false + +[Install] +WantedBy=sockets.target Deleted: community-x86_64/unfuck-cryptopp-thanks-gentoo.patch =================================================================== --- community-x86_64/unfuck-cryptopp-thanks-gentoo.patch 2013-12-04 12:39:52 UTC (rev 102037) +++ community-x86_64/unfuck-cryptopp-thanks-gentoo.patch 2013-12-04 12:45:20 UTC (rev 102038) @@ -1,97 +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) ---- 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" - ---- a/src/lib/io/CCryptoStream.h -+++ b/src/lib/io/CCryptoStream.h -@@ -20,8 +20,8 @@ - #include "BasicTypes.h" - #include "CStreamFilter.h" - #include "CCryptoMode.h" --#include <cryptopp562/osrng.h> --#include <cryptopp562/sha.h> -+#include <cryptopp/osrng.h> -+#include <cryptopp/sha.h> - - class CCryptoOptions; - Copied: synergy/repos/community-x86_64/unfuck-cryptopp-thanks-gentoo.patch (from rev 102037, synergy/trunk/unfuck-cryptopp-thanks-gentoo.patch) =================================================================== --- community-x86_64/unfuck-cryptopp-thanks-gentoo.patch (rev 0) +++ community-x86_64/unfuck-cryptopp-thanks-gentoo.patch 2013-12-04 12:45:20 UTC (rev 102038) @@ -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" + +--- a/src/lib/io/CCryptoStream.h ++++ b/src/lib/io/CCryptoStream.h +@@ -20,8 +20,8 @@ + #include "BasicTypes.h" + #include "CStreamFilter.h" + #include "CCryptoMode.h" +-#include <cryptopp562/osrng.h> +-#include <cryptopp562/sha.h> ++#include <cryptopp/osrng.h> ++#include <cryptopp/sha.h> + + class CCryptoOptions; +