From 3fefc5af7e5ed4c2bc924cd096496e5acdc9ca5f Mon Sep 17 00:00:00 2001 From: Michael Carlberg Date: Mon, 7 Mar 2016 21:34:11 +0100 Subject: [PATCH] synergy: update to 1.7.5 - Bumps version to 1.7.5 - Adds patches to fix build using Qt>=5.5 - Install service files --- srcpkgs/synergy/files/synergyc/run | 5 +++++ srcpkgs/synergy/files/synergys/run | 4 ++++ srcpkgs/synergy/patches/qt5-build-musl.patch | 10 ++++++++++ srcpkgs/synergy/patches/qt5-build.patch | 10 ++++++++++ srcpkgs/synergy/template | 9 ++++++--- srcpkgs/synergy/update | 1 - 6 files changed, 35 insertions(+), 4 deletions(-) create mode 100755 srcpkgs/synergy/files/synergyc/run create mode 100755 srcpkgs/synergy/files/synergys/run create mode 100644 srcpkgs/synergy/patches/qt5-build-musl.patch create mode 100644 srcpkgs/synergy/patches/qt5-build.patch diff --git a/srcpkgs/synergy/files/synergyc/run b/srcpkgs/synergy/files/synergyc/run new file mode 100755 index 00000000000..eed442178d7 --- /dev/null +++ b/srcpkgs/synergy/files/synergyc/run @@ -0,0 +1,5 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +[ -z $SERVER_ADDR ] && exit 0 +[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0 +exec synergyc --no-daemon ${OPTS:=--restart} $SERVER_ADDR diff --git a/srcpkgs/synergy/files/synergys/run b/srcpkgs/synergy/files/synergys/run new file mode 100755 index 00000000000..65bc0a52d76 --- /dev/null +++ b/srcpkgs/synergy/files/synergys/run @@ -0,0 +1,4 @@ +#!/bin/sh +[ -r ./conf ] && . ./conf +[ -z $SKIP_X11_TEST ] && ! ps -C Xorg >/dev/null 2>&1 && exit 0 +exec synergys --no-daemon ${OPTS:=--restart} diff --git a/srcpkgs/synergy/patches/qt5-build-musl.patch b/srcpkgs/synergy/patches/qt5-build-musl.patch new file mode 100644 index 00000000000..fb90c3decea --- /dev/null +++ b/srcpkgs/synergy/patches/qt5-build-musl.patch @@ -0,0 +1,10 @@ +--- src/gui/src/ZeroconfService.h ++++ src/gui/src/ZeroconfService.h +@@ -20,6 +20,7 @@ + #include "ZeroconfServer.h" + #include "ZeroconfRecord.h" + ++#include + #include + + typedef int32_t DNSServiceErrorType; diff --git a/srcpkgs/synergy/patches/qt5-build.patch b/srcpkgs/synergy/patches/qt5-build.patch new file mode 100644 index 00000000000..a10ceb68309 --- /dev/null +++ b/srcpkgs/synergy/patches/qt5-build.patch @@ -0,0 +1,10 @@ +--- src/gui/src/CommandProcess.h ++++ src/gui/src/CommandProcess.h +@@ -18,6 +18,7 @@ + #ifndef COMMANDTHREAD_H + #define COMMANDTHREAD_H + ++#include + #include + + class CommandProcess : public QObject diff --git a/srcpkgs/synergy/template b/srcpkgs/synergy/template index 67384012518..9fe4d76e2d3 100644 --- a/srcpkgs/synergy/template +++ b/srcpkgs/synergy/template @@ -1,6 +1,6 @@ # Template file for 'synergy' pkgname=synergy -version=1.7.3 +version=1.7.5 revision=1 wrksrc="${pkgname}-${version}-stable" build_style=cmake @@ -11,8 +11,8 @@ short_desc="Share a single mouse and keyboard between multiple computers" maintainer="Juan RP " homepage="http://synergy-foss.org/" license="GPL-2" -distfiles="https://github.com/synergy/synergy/archive/v${version}-stable.tar.gz" -checksum=a4effc3ddb0ef6de95f83fa62b5290e2909f8b76729b1bde89c5061e5d381e25 +distfiles="https://github.com/symless/synergy/archive/v${version}-stable.tar.gz" +checksum=b50c79f5c8aca2048cb0e11ba37f75722d1acdda23b0352e25ad66aff999f192 CXXFLAGS="-pthread" @@ -51,5 +51,8 @@ do_install() { vinstall ${FILESDIR}/synergy.png 644 usr/share/pixmaps vinstall ${FILESDIR}/synergy.desktop 644 usr/share/applications + + vsv synergys + vsv synergyc } diff --git a/srcpkgs/synergy/update b/srcpkgs/synergy/update index 9696505bf38..af4eed7cc2e 100644 --- a/srcpkgs/synergy/update +++ b/srcpkgs/synergy/update @@ -1,3 +1,2 @@ site=https://github.com/symless/synergy/tags pattern="v\K[\d.]+(?=-stable)" -