diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-11-11 07:51:56 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-11-11 16:59:05 +0000 |
| commit | a018b84a61bd687117d01d3c41a38b5922a1a964 (patch) | |
| tree | b9c2f15105739b8a784f434163ffa7f18a4c56e0 | |
| parent | ee05834038e0817d01cfc0989ecda635d980ae4b (diff) | |
| download | ports-a018b84a61bd687117d01d3c41a38b5922a1a964.tar.gz ports-a018b84a61bd687117d01d3c41a38b5922a1a964.zip | |
graphics/wayland-protocols: drop pkgconfig workaround after d48fab59daa5
| -rw-r--r-- | deskutils/dmenu-wayland/Makefile | 2 | ||||
| -rw-r--r-- | graphics/wayland-protocols/Makefile | 1 | ||||
| -rw-r--r-- | graphics/wayland-protocols/files/patch-meson.build | 14 | ||||
| -rw-r--r-- | 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 |