From nobody Sat Jul 29 00:49:49 2023 X-Original-To: dev-commits-ports-all@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 4RCQrY6rfMz4p2cB; Sat, 29 Jul 2023 00:49:49 +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 4RCQrY6Bp2z4HZ1; Sat, 29 Jul 2023 00:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690591789; 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=eVpoKI+Ny5L0LectIyFyQz+tMQ6sFI5C2CVQsHlyhDY=; b=piCs4Q6xfyMrbWFr+VlphWQb/O1Yj1jqOjpMgr8OpJZu510xHXlxueEngghjDP+zRwoTgh zpJbEp70lZAwA2OdF+Pyr/43QOTy4StueW6Ti2iDR0K/sYYxplYx3vrBhX6HvV0Tyah5BS nbDk566YSJYjVy9FVZF6rEdsJFTMxeqGLB+5kJjI9LzakR/LMG5QgsX4qI9mazBw6n4+qA qgN4G0aoKQWjUR9tmbe1bmgIF2QXUqL886LE5yRPARI59P9XkEbL4VmveU0p5IRRAEfm85 6cWBlfJJXcESG2yueoVOgluo1b4ZX1Eu4oJKo9pSLov91/Ghrc32qpPD7EFFgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690591789; 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=eVpoKI+Ny5L0LectIyFyQz+tMQ6sFI5C2CVQsHlyhDY=; b=I/yZcc7/847qszXbpB89EdYoETdJO24gyESiGHmmVKLUV00z0QqVqpEC7oVP8NpEY4/3hK kJ/yOR2m8nvwyY4pqZsePpLgFlkwYAAUHKphp5zt+F3M682geVCOY3ysKC0LtDTswiOzOX LXLDpJ1OO3HCIQG8FeSY34TIKTZ/PzoRkkma0LOAo8oNxPly4ZSIIaabDQThQuvlUOXLSs 5DGjU6jVbTCa5FKhShVlMYRFDfQ8bTMv9HgbK1sJr4C+etkll101ekqPTMiOQ7VuX2w/c/ W8Pf84O3i9Wvspg9roBcmwxKQYe4Eiq/UneHHO5c+zVLL6HSJ+qOxnvEmu7fSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690591789; a=rsa-sha256; cv=none; b=jRL0kSaAZ28ATwA9pSwG/J+dOv36n15gEeylXL2g1DBaQuoGYePU53azpMBsgtaLWva5P/ XJUys4S4Aor866H4KCYvdeqhvtEp+wN0QVdxWTJxM8a4NPkdCc0mqO/wR35rJ/c99bO3O9 SYRzrMRex4Eqg/IHXX8UonUW48C/67cRB8R4RGb5uGdienw/tWBQMxZ6ohZ/QBTNOWjyXu PU9a44W3T50kk3WsUkOKH8AwI8mRAyqRjtYN+r4PRJJXIbQFKSCEQ9GWP59GDGkgejDqig st+d4Ey5hErtLLfaBk3jdaYEPwOfxeAAh/NClAnW6oyoRs5eXfCVJbx/lP7M/A== 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 4RCQrY55CGz1C3j; Sat, 29 Jul 2023 00:49:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36T0nn0E020779; Sat, 29 Jul 2023 00:49:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36T0nnlP020778; Sat, 29 Jul 2023 00:49:49 GMT (envelope-from git) Date: Sat, 29 Jul 2023 00:49:49 GMT Message-Id: <202307290049.36T0nnlP020778@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: a088dbb45bd9 - main - net/gupnp-tools: unbreak build with Meson 1.2.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: a088dbb45bd994ff8aa98e4d50bf7e4fa3fe5fb5 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a088dbb45bd994ff8aa98e4d50bf7e4fa3fe5fb5 commit a088dbb45bd994ff8aa98e4d50bf7e4fa3fe5fb5 Author: Jan Beich AuthorDate: 2022-03-25 14:46:05 +0000 Commit: Jan Beich CommitDate: 2023-07-29 00:11:01 +0000 net/gupnp-tools: unbreak build with Meson 1.2.0 meson.build:1:0: ERROR: Unexpected "[provides]" section, did you mean "[provide]"? meson.build:1:0: ERROR: Multiple wrap files provide 'dependency_name' dependency: gupnp-av-1.0.wrap and gupnp-1.6.wrap PR: 272276 Reported by: antoine (via exp-run) Regressed by: https://github.com/mesonbuild/meson/commit/6f4973abad9e --- net/gupnp-tools/files/patch-meson | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/net/gupnp-tools/files/patch-meson b/net/gupnp-tools/files/patch-meson new file mode 100644 index 000000000000..37deaa3b9bc3 --- /dev/null +++ b/net/gupnp-tools/files/patch-meson @@ -0,0 +1,35 @@ +Reference: https://github.com/mesonbuild/meson/commit/6f4973abad9eec9fcc915117f1c3d1a93ccc948c + +--- subprojects/gssdp-1.6.wrap.orig 2022-10-11 21:00:49 UTC ++++ subprojects/gssdp-1.6.wrap +@@ -3,6 +3,6 @@ depth = 1 + revision = master + depth = 1 + +-[provides] +-dependency_name = gssdp-1.2 ++[provide] ++dependency_names = gssdp-1.6 + +--- subprojects/gupnp-1.6.wrap.orig 2022-10-11 21:00:49 UTC ++++ subprojects/gupnp-1.6.wrap +@@ -3,6 +3,6 @@ depth = 1 + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-1.2 ++[provide] ++dependency_names = gupnp-1.6 + +--- subprojects/gupnp-av-1.0.wrap.orig 2022-10-11 21:00:49 UTC ++++ subprojects/gupnp-av-1.0.wrap +@@ -3,6 +3,6 @@ depth = 1 + revision = master + depth = 1 + +-[provides] +-dependency_name = gupnp-av-1.0 ++[provide] ++dependency_names = gupnp-av-1.0 +