diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 21:34:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-01-21 21:34:41 +0100 |
| commit | 715110a8a2e9e4b1a89635950744eb5260b8ee7f (patch) | |
| tree | 0d0e4c41631092a068d8b0823f4d6b0a8d725eed /gnu/packages/synergy.scm | |
| parent | b3c2ebda5bcedcfb88475e53b7f36c3a42cac8b4 (diff) | |
| parent | 79e074ea10875ff75ca613179c70de12d64b19f5 (diff) | |
| download | patches-715110a8a2e9e4b1a89635950744eb5260b8ee7f.tar patches-715110a8a2e9e4b1a89635950744eb5260b8ee7f.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/synergy.scm')
| -rw-r--r-- | gnu/packages/synergy.scm | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/gnu/packages/synergy.scm b/gnu/packages/synergy.scm index 9de3ee57e4..367bb323b3 100644 --- a/gnu/packages/synergy.scm +++ b/gnu/packages/synergy.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2014, 2015, 2016 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2014, 2015, 2016, 2020 Eric Bavier <bavier@posteo.net> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> @@ -37,17 +37,17 @@ (define-public synergy (package (name "synergy") - (version "1.10.1") + (version "1.11.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/symless/synergy-core.git") - (commit (string-append "v" version "-stable")))) + (commit (string-append version "-stable")))) (file-name (git-file-name name version)) (sha256 (base32 - "112w2xrp04cysd14xk1ax7cllqpcki0pyica4ivrdngr5qw0r9hp")) + "1jk60xw4h6s5crha89wk4y8rrf1f3bixgh5mzh3cq3xyrkba41gh")) (modules '((guix build utils))) (snippet ;; Remove unnecessary bundled source and binaries @@ -64,13 +64,6 @@ (setenv "CPLUS_INCLUDE_PATH" (string-append (assoc-ref inputs "avahi") "/include/avahi-compat-libdns_sd")) - ;; See https://github.com/symless/synergy-core/pull/6359/ - (substitute* "src/gui/src/ScreenSetupView.cpp" - (("#include <QtGui>" m) - (string-append m "\n#include <QHeaderView>"))) - (substitute* "src/gui/src/ActionDialog.cpp" - (("#include <QtGui>" m) - (string-append m "\n#include <QButtonGroup>"))) #t))))) (inputs `(("avahi" ,avahi) |