From nobody Mon Mar 28 19:22:09 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id F0F901A53A4B; Mon, 28 Mar 2022 19:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KS2dF6VKzz3LVf; Mon, 28 Mar 2022 19:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648495329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdV1Y7hlpnh38zcbBbaqYTidsHO8yZLVLL/2iSyY18s=; b=UaZkOT5aXiqu1hyJtVEKALK4PnXeyhampfIvYYPSlMqG1hHq1niekOoSTTLdn0/tJpjm8x JmJuFOiOncGPWMW1tZs7SyGc3vNOBCBAwouGM+79kc1dbGW8f3e0klAAkvf07crE9Xdqz6 46CGg8j/9T2eRFLejzDNKCARQ52c5k00UZ0phTny7GsfA7MLERf96Q6m+rJUjY1Wqq9lYq 3jIHcIHEda/rn0Sld/owI3+mRSi329MorQ25vALjubOL/IHqxR/uaHSL7lptJWeKRxgy03 3NGRbYRz9XeKZlrEB1eSdBGX107fgaAxUjm79VExS5gUj4B/MuPMYnokdbChpA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BEBD57E9D; Mon, 28 Mar 2022 19:22:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 22SJM9M9011681; Mon, 28 Mar 2022 19:22:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22SJM92a011680; Mon, 28 Mar 2022 19:22:09 GMT (envelope-from git) Date: Mon, 28 Mar 2022 19:22:09 GMT Message-Id: <202203281922.22SJM92a011680@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 8370ed121639 - main - sysutils/upower: Fix build when xsltproc is present and MANPAGES disabled List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8370ed121639270a4196b3d609f5d9baf92d698a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648495329; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kdV1Y7hlpnh38zcbBbaqYTidsHO8yZLVLL/2iSyY18s=; b=JhelAw6Mab7IgzeH7MjsucnbLRP9pHJmRluJHKcPimcrt9Af8TUW3XJcrm6fp7K+qyIsIv htNCOmVBhYYm9A1y9wSR8hiiEpY8UfZhxmb2WLy71Ii8zPo3JR+dWTs/2boh8geQQKTlpy U0Gkx2Q08Sn8jfTCuCa7GfvL1UyKL3sA+2adhY3a4S6CvADqbMJqHnzeNW3/vgbTzOkJ5C hmo1HHpBvedOEzjjVCT6JIZCTrtMU95S671SsoRgnyq+Qi7iLIFch0xfviWlUZXiHjSFDa hJBN9LxiJZzLuZZS0yWxA5IyyuA06WzZiNBmoj01IZ3QNlbyYnlTI//Z5BMFyw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648495329; a=rsa-sha256; cv=none; b=J4r9ZznMPr0ACedFuiVldl3DeRSTnAJGQN+BoKsKr9QNdCzjKolDqPRlL02BsVyTIq87Ax 3HTQiSkQHDP/UJyrqm3MGPCtGcwd5GCJsAGE77pWIUAEtY2YjpYaiu60l4tFPK9K3jFfVl NECSq7Ob+s11ah9/UbGUYH3ZPw7O3mr0NkkOcHiVzmorJaNIM46nmamc4jQ6J19Zn1lqkN UaP4l7miQku1r1WNaBmY7h8P1/WyKnfgTHjFIDUQxqlK06T1bf7xHS1hJlhESs/eYkO3nO 9Sd3+nXQTSqEbYASxd4JzkLvD05kAZy3HYjJjr9i4B6r/ESIIKyhg4VTA5viQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8370ed121639270a4196b3d609f5d9baf92d698a commit 8370ed121639270a4196b3d609f5d9baf92d698a Author: Guido Falsi AuthorDate: 2022-03-28 19:14:06 +0000 Commit: Guido Falsi CommitDate: 2022-03-28 19:22:04 +0000 sysutils/upower: Fix build when xsltproc is present and MANPAGES disabled The new meson build system performs an unconditional check for xsltproc, even when bot gtk_doc and man options are disabled, marking it only as required if any of those options are enabled. if xsltproc is found building manual pages and gtk_doc files is performed unconditionally, but, when the MANPAGES option is disabled, gtk-doc is not required and most probably missing from the system, causing the build to fail. Fix by performing the check for sltproc only when one of those two options are enabled, and disabling building all docs otherwise. PR: 262885 Fixes: 4025875f76dd78090a158a3077ca447a05722510 --- sysutils/upower/files/patch-meson.build | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sysutils/upower/files/patch-meson.build b/sysutils/upower/files/patch-meson.build index 9108eefe6942..42a7e4747166 100644 --- a/sysutils/upower/files/patch-meson.build +++ b/sysutils/upower/files/patch-meson.build @@ -1,6 +1,19 @@ --- meson.build.orig 2022-03-09 17:46:34 UTC +++ meson.build -@@ -105,7 +105,7 @@ endif +@@ -47,7 +47,11 @@ m_dep = cc.find_library('m', required: true) + gio_unix_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version) + m_dep = cc.find_library('m', required: true) + +-xsltproc = find_program('xsltproc', disabler: true, required: get_option('gtk-doc') or get_option('man')) ++if get_option('gtk-doc') or get_option('man') ++ xsltproc = find_program('xsltproc', disabler: true, required: get_option('gtk-doc') or get_option('man')) ++else ++ xsltproc = disabler() ++endif + + # Resolve OS backend + os_backend = get_option('os_backend') +@@ -105,7 +109,7 @@ subdir('etc') config_h = configure_file(output: 'config.h', configuration: cdata) subdir('etc')