From nobody Sat Nov 11 17:02:30 2023 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 4SSMSQ3Z6vz50N1q; Sat, 11 Nov 2023 17:02:30 +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 4SSMSQ37l6z4QDH; Sat, 11 Nov 2023 17:02:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699722150; 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=yuKgbDs/YCvDSJvxFNfhBQMb86yYKkLsgDteduY10pI=; b=OMTHjvSwiOjo/ssT6dmCt9R52DVG+GFWqWuhSI57oI5k/oWAvnDXqG9zTm1BolUupQp/Xe JTMiKc15hySK0stQZocanlzCCJpCnL++4HXxEJnEajl9is9OnM2bLwcvpCkJc8FiDegZwo XVAyXnfxFm0lX+GPSAtuswY4lXmaEVa42s7aBFN0nAlGV5BjOe/Ph9AXW2f0XTTFYG2C4V CDiyJGayTr2aeJEW4iBwaLZRGaH6FfXPBZiTNxh7htxF5TF9Ky8wr/wE9B/VK9QnrS+Utp 0Vl26SdjFc//V24ZOPyVOI/SgcEr94K8SAIJVvNXGXweE3jgDRdIUdnlBIEoXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1699722150; 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=yuKgbDs/YCvDSJvxFNfhBQMb86yYKkLsgDteduY10pI=; b=jcIuDZhUxeX0sGqS9hmXVlCvq8N1JPzyMwWJMWW3s9OFxUuFnHhHvOtxQcb5wyBhsWhBD+ p6a4ECul6aIVFDFOQV+uCbiPdhQiS6dpxw6JV2Mq1BJo6GVWT1UPfTTekvKMcGPFI/xhyZ xo6PTUGSbDZnwYIkSM73IuZp3Qr1p7DMcckeA5mK80TS88Rdd1JSTVV6sm8I4eRK7ReJyp eroHTmrajUmNCwuuKTSWFamTXzLug91241Cj87puj57qXwL0QbSl555hOR7ZlWGpm/wQxa TvTQTkt1Uim9QuXe3oN+iJdG44geJ0wSOuYk8EDpXsxkx9YgscomXXkVC1TPRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1699722150; a=rsa-sha256; cv=none; b=tWna2L6STA4DlRXnWNHMGYRFY0xpMpV82U1kaxLNPaj5zEKZXMrvlMGzcv2CpNWO/ryNjz hlXiRUoE+et37w7ffBjSv6JqFVaapmZCqAU6yU8W0yiP3Hw2yicE7Fi4oKACuZ2WY+rEms VC2C1wA6Y/RdpqnzHFD0UrBJZqcMIBHoeoSOMohIuJGRfkNBuSfFxI4py4oY2bnORc+FVE AmL8WG9P0y24APqoi1o4cbZlfn0pb5JI9/XzIU7Ngp4LmQlBd5fe6oLTsn0WU7Dk9yMzWu 6ZYi9mlye/1J14HZaxt2V06+NKeGAFVQu2p99774LyKK8075VswW0wOJJwAZ/w== 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 4SSMSQ2Bc6znhH; Sat, 11 Nov 2023 17:02:30 +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 3ABH2U0L020263; Sat, 11 Nov 2023 17:02:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3ABH2Us6020260; Sat, 11 Nov 2023 17:02:30 GMT (envelope-from git) Date: Sat, 11 Nov 2023 17:02:30 GMT Message-Id: <202311111702.3ABH2Us6020260@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: a018b84a61bd - main - graphics/wayland-protocols: drop pkgconfig workaround after d48fab59daa5 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: a018b84a61bd687117d01d3c41a38b5922a1a964 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=a018b84a61bd687117d01d3c41a38b5922a1a964 commit a018b84a61bd687117d01d3c41a38b5922a1a964 Author: Jan Beich AuthorDate: 2023-11-11 07:51:56 +0000 Commit: Jan Beich CommitDate: 2023-11-11 16:59:05 +0000 graphics/wayland-protocols: drop pkgconfig workaround after d48fab59daa5 --- deskutils/dmenu-wayland/Makefile | 2 +- graphics/wayland-protocols/Makefile | 1 + graphics/wayland-protocols/files/patch-meson.build | 14 -------------- graphics/wayland-protocols/pkg-plist | 2 +- 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/deskutils/dmenu-wayland/Makefile b/deskutils/dmenu-wayland/Makefile index d0576b55b527..925d0fdd8b36 100644 --- a/deskutils/dmenu-wayland/Makefile +++ b/deskutils/dmenu-wayland/Makefile @@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gnome meson pkgconfig -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols +BUILD_DEPENDS= ${LOCALBASE}/share/pkgconfig/wayland-protocols.pc:graphics/wayland-protocols LIB_DEPENDS= libwayland-client.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon diff --git a/graphics/wayland-protocols/Makefile b/graphics/wayland-protocols/Makefile index c27b929edaf5..bf1693744792 100644 --- a/graphics/wayland-protocols/Makefile +++ b/graphics/wayland-protocols/Makefile @@ -1,5 +1,6 @@ PORTNAME= wayland-protocols PORTVERSION= 1.32 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= https://gitlab.freedesktop.org/wayland/${PORTNAME}/-/releases/${DISTVERSION}/downloads/ diff --git a/graphics/wayland-protocols/files/patch-meson.build b/graphics/wayland-protocols/files/patch-meson.build deleted file mode 100644 index 541eba6d6cca..000000000000 --- a/graphics/wayland-protocols/files/patch-meson.build +++ /dev/null @@ -1,14 +0,0 @@ -devel/pkgconfig removed share/pkgconfig from PKG_DEFAULT_PATH -via --with-pkg-config-dir override. Similar to lib/pkgconfig. - ---- meson.build.orig 2021-11-26 04:47:33 UTC -+++ meson.build -@@ -91,7 +91,7 @@ pkgconfig_configuration.set('abs_top_srcdir', wayland_ - pkgconfig_configuration.set('PACKAGE', 'wayland-protocols') - pkgconfig_configuration.set('WAYLAND_PROTOCOLS_VERSION', wayland_protocols_version) - --pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig') -+pkg_install_dir = join_paths(get_option('prefix'), 'libdata/pkgconfig') - configure_file( - input: 'wayland-protocols.pc.in', - output: 'wayland-protocols.pc', diff --git a/graphics/wayland-protocols/pkg-plist b/graphics/wayland-protocols/pkg-plist index f019c6dbd173..503bb887b9dc 100644 --- a/graphics/wayland-protocols/pkg-plist +++ b/graphics/wayland-protocols/pkg-plist @@ -1,4 +1,4 @@ -libdata/pkgconfig/wayland-protocols.pc +share/pkgconfig/wayland-protocols.pc %%DATADIR%%/stable/presentation-time/presentation-time.xml %%DATADIR%%/stable/viewporter/viewporter.xml %%DATADIR%%/stable/xdg-shell/xdg-shell.xml