From nobody Wed Jan 12 01:25:16 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 1EE6819559E1; Wed, 12 Jan 2022 01:25:17 +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 4JYVHJ64xhz3sSV; Wed, 12 Jan 2022 01:25:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 B094823F08; Wed, 12 Jan 2022 01:25:16 +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 20C1PGkI002699; Wed, 12 Jan 2022 01:25:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20C1PGRx002698; Wed, 12 Jan 2022 01:25:16 GMT (envelope-from git) Date: Wed, 12 Jan 2022 01:25:16 GMT Message-Id: <202201120125.20C1PGRx002698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: bd1542622aff - main - security/p11-kit: unbreak build with Meson 0.61.0 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd1542622aff1a811f222a56307ed70b443351eb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641950716; 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=HTBqacUXMjdQdS7hg2w6SBSMf4pbc9b3ioWssUL1iho=; b=bpRu3l4IrwD0vFYB47X2COWkr5UOqP+nLP2t+8GBznnYz1Lu5l+2baZEoEiVyVDiy5MdU/ xvg8sVR4jKesOkU4/KPYRU78TtnXp8HcE7S/Gf6OjiPhfmKdumDRo/TgEJztwjl8e1L1Wk akBY84CI2sISM8mda+Op5aIu/9AWzRNLI2d4BJcJbQiTjtwgJEMq+cHTv6HZLNkHpFdDBk VJOxNzleYm2sJ9JdaepRxJ2f2Mc0KWCagiuGN/WTcewMJvtITFPjZBKV+LltOqCGcLg0lm lDVwssd7LVCpD8/3+2bp7xjaTm/tvN9jnt6wpTPCHvDF+kf/G7wa5OjM9xLQaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641950716; a=rsa-sha256; cv=none; b=PEfF+OpI8gQUlpfe4MPlKNd7/F8HUrjQc/LO16k1FINtQFMEc56BgUXgFC8UaP6Tz93pEW uFtuW8fVmWnJk5wdWtuFKsMXDEi/Wbn6OokHODE1mmD4TA3xlC5kBUF8KtoqAfSr0dRVm4 3g9sgT00dSQBjyHUDSfaeprah/qxqbASLqtBl4E0MIm/xHsYBZkHZJFT3u3CEN9SrHfi1B e/FL71SJGpQ0Scjz9VB1Q0B5dW9t3gMrbB1qyZZ2t9qLo4c6IXUH4AaXOWIPm52EX0wPfr Ep3lW/GqwjCajfVinjSZDue8VEDJzhanthNRnHosfo9fN56dupG417BFjMk8Vg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd1542622aff1a811f222a56307ed70b443351eb commit bd1542622aff1a811f222a56307ed70b443351eb Author: Jan Beich AuthorDate: 2022-01-12 01:14:29 +0000 Commit: Jan Beich CommitDate: 2022-01-12 01:24:58 +0000 security/p11-kit: unbreak build with Meson 0.61.0 doc/manual/meson.build:69:8: ERROR: gnome.gtkdoc keyword argument 'dependencies' was of type array[CustomTarget | PkgConfigDependency] but should have been array[Dependency | SharedLibrary | StaticLibrary] PR: 260943 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/566c2c9a9c98 --- security/p11-kit/files/patch-doc_manual_meson.build | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/security/p11-kit/files/patch-doc_manual_meson.build b/security/p11-kit/files/patch-doc_manual_meson.build new file mode 100644 index 000000000000..48d5b217852f --- /dev/null +++ b/security/p11-kit/files/patch-doc_manual_meson.build @@ -0,0 +1,13 @@ +https://github.com/p11-glue/p11-kit/issues/406 + +--- doc/manual/meson.build.orig 2021-05-25 07:15:23 UTC ++++ doc/manual/meson.build +@@ -70,7 +70,7 @@ if get_option('gtk_doc') + main_xml: 'p11-kit-docs.xml', + namespace: 'p11_kit', + src_dir: 'p11-kit', +- dependencies: libffi_deps + dlopen_deps + xml_deps, ++ dependencies: libffi_deps + dlopen_deps, + scan_args: [ + '--ignore-headers=' + ' '.join(ignore_headers), + '--rebuild-types',