diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2020-12-14 13:26:07 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2020-12-14 13:28:56 +0100 |
| commit | 1d8baf1ca102bd80ca28ab4b093284ceba702a68 (patch) | |
| tree | cb78759c055f0f03277b5376f1ee4d4606529cc2 /x11-misc | |
| parent | dev-python/dataclasses: Bump to 0.8 (diff) | |
| download | gentoo-1d8baf1ca102bd80ca28ab4b093284ceba702a68.tar.gz gentoo-1d8baf1ca102bd80ca28ab4b093284ceba702a68.tar.bz2 gentoo-1d8baf1ca102bd80ca28ab4b093284ceba702a68.zip | |
x11-misc/synergy: Fix non-GUI build without avahi
Closes: https://bugs.gentoo.org/759412
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'x11-misc')
| -rw-r--r-- | x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch | 42 | ||||
| -rw-r--r-- | x11-misc/synergy/synergy-1.12.0.ebuild | 4 |
2 files changed, 46 insertions, 0 deletions
diff --git a/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch new file mode 100644 index 000000000000..1905fc552ea1 --- /dev/null +++ b/x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch @@ -0,0 +1,42 @@ +From 91e150889814ddf97a75b881bb979c975894f34f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Thu, 10 Dec 2020 22:40:40 +0100 +Subject: [PATCH] Check for dns_sd.h only when building GUI + +The <dns_sd.h> header is only used in the synergy GUI component. Update +the CMake check to be done only if SYNERGY_BUILD_LEGACY_GUI is enabled. +This fixes build failures when GUI is not being built and <dns_sd.h> +is not installed. + +While at it, fix indentation around the added check to match the rest +of the file and avoid being misleading. +--- + CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 581fdf77..35d806d9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -235,11 +235,13 @@ if (UNIX) + list (APPEND libs Xi) + endif() + +- set (DnsSdlib "dns_sd.h") +- set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") +- check_include_files ("${DnsSdlib}" HAVE_DNS_SD) +- if (NOT HAVE_DNS_SD) +- message (FATAL_ERROR "Missing header: " ${DnsSdlib}) ++ if (SYNERGY_BUILD_LEGACY_GUI) ++ set (DnsSdlib "dns_sd.h") ++ set (CMAKE_EXTRA_INCLUDE_FILES "${CMAKE_EXTRA_INCLUDE_FILES};${DnsSdlib}") ++ check_include_files ("${DnsSdlib}" HAVE_DNS_SD) ++ if (NOT HAVE_DNS_SD) ++ message (FATAL_ERROR "Missing header: " ${DnsSdlib}) ++ endif() + endif() + endif() + +-- +2.29.2 + diff --git a/x11-misc/synergy/synergy-1.12.0.ebuild b/x11-misc/synergy/synergy-1.12.0.ebuild index b0539697f5b9..d144f9cb3919 100644 --- a/x11-misc/synergy/synergy-1.12.0.ebuild +++ b/x11-misc/synergy/synergy-1.12.0.ebuild @@ -53,6 +53,10 @@ DEPEND=" DOCS=( ChangeLog doc/synergy.conf.example{,-advanced,-basic} ) +PATCHES=( + "${FILESDIR}"/synergy-1.12.0-dnssd-dep.patch +) + src_prepare() { # broken on Xvfb rm src/test/integtests/platform/XWindowsScreenTests.cpp || die |