From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EBF051382C5 for ; Mon, 14 Dec 2020 12:29:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3AAF0E0AC5; Mon, 14 Dec 2020 12:29:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24742E0AC5 for ; Mon, 14 Dec 2020 12:29:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABD343413A1 for ; Mon, 14 Dec 2020 12:29:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D7798C3 for ; Mon, 14 Dec 2020 12:29:04 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1607948936.1d8baf1ca102bd80ca28ab4b093284ceba702a68.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/synergy/files/, x11-misc/synergy/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/synergy/files/synergy-1.12.0-dnssd-dep.patch x11-misc/synergy/synergy-1.12.0.ebuild X-VCS-Directories: x11-misc/synergy/ x11-misc/synergy/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 1d8baf1ca102bd80ca28ab4b093284ceba702a68 X-VCS-Branch: master Date: Mon, 14 Dec 2020 12:29:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 946ddef9-902e-4b2f-8490-e35f4a98e92e X-Archives-Hash: f6fb334b38aa37de31660fec8f18c5e4 commit: 1d8baf1ca102bd80ca28ab4b093284ceba702a68 Author: Michał Górny gentoo org> AuthorDate: Mon Dec 14 12:26:07 2020 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Dec 14 12:28:56 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d8baf1c x11-misc/synergy: Fix non-GUI build without avahi Closes: https://bugs.gentoo.org/759412 Signed-off-by: Michał Górny gentoo.org> .../synergy/files/synergy-1.12.0-dnssd-dep.patch | 42 ++++++++++++++++++++++ x11-misc/synergy/synergy-1.12.0.ebuild | 4 +++ 2 files changed, 46 insertions(+) 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 00000000000..1905fc552ea --- /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?= +Date: Thu, 10 Dec 2020 22:40:40 +0100 +Subject: [PATCH] Check for dns_sd.h only when building GUI + +The 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 +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 b0539697f5b..d144f9cb391 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