zepto-forks/meta-kde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Wayland pckgconfig patch for 1.20.0

Browse Source
This commit is contained in:
Andreas Cord-Landwehr
2022-05-28 18:21:28 +02:00
parent 5489c86bb0
commit f49385dd8a
1 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
recipes-graphics/wayland/wayland/wayland-1.20.0_0001-Consider-pkgconfig-sysroot-for-pkgdatadir.patch Normal file
View File

@@ -0,0 +1,48 @@
From ff8ecbe8891d592e645927659318720f9e190054 Mon Sep 17 00:00:00 2001
From: Andreas Cord-Landwehr <cordlandwehr@kde.org>
Date: Sun, 6 Feb 2022 17:23:46 +0100
Subject: [PATCH] [PATCH] Consider pkgconfig sysroot for pkgdatadir
For libs/cflags this is done automatically, but not for manually accessed
variables. This matches what wayland-protocols does.
---
src/meson.build | 6 +++---
src/wayland-client.pc.in | 2 +-
src/wayland-scanner.pc.in | 2 +-
src/wayland-server.pc.in | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/meson.build b/src/meson.build
index 61edbc8..d621efd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -50,7 +50,7 @@ if get_option('scanner')
version: meson.project_version(),
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()),
'bindir=' + join_paths('${prefix}', get_option('bindir')),
'wayland_scanner=wayland-scanner'
],
@@ -179,7 +179,7 @@ if get_option('libraries')
filebase: 'wayland-server',
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name())
+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name())
]
)
@@ -211,7 +211,7 @@ if get_option('libraries')
filebase: 'wayland-client',
variables: [
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name())
+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name())
]
)
--
2.32.0