From e820ca5a6e37a751c6701ae40419699ab358ad06 Mon Sep 17 00:00:00 2001 From: sergiotarxz Date: Fri, 13 May 2022 02:59:37 +0200 Subject: [PATCH] Making further changes in the patch. --- x11-packages/libwayland/libwayland.patch | 43 ++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/x11-packages/libwayland/libwayland.patch b/x11-packages/libwayland/libwayland.patch index e69de29bb..7265ca4ac 100644 --- a/x11-packages/libwayland/libwayland.patch +++ b/x11-packages/libwayland/libwayland.patch @@ -0,0 +1,43 @@ +diff --git a/src/meson.build b/src/meson.build +index ae8f387..359463c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -55,23 +55,24 @@ if get_option('scanner') + install: true + ) + +- pkgconfig.generate( +- name: 'Wayland Scanner', +- description: 'Wayland scanner', +- version: meson.project_version(), +- variables: [ +- 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), +- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), +- 'bindir=' + join_paths('${prefix}', get_option('bindir')), +- 'wayland_scanner=${bindir}/wayland-scanner' +- ], +- filebase: 'wayland-scanner' +- ) ++ if not meson.is_cross_build() ++ pkgconfig.generate( ++ name: 'Wayland Scanner', ++ description: 'Wayland scanner', ++ version: meson.project_version(), ++ variables: [ ++ 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), ++ 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), ++ 'bindir=' + join_paths('${prefix}', get_option('bindir')), ++ 'wayland_scanner=${bindir}/wayland-scanner' ++ ], ++ filebase: 'wayland-scanner' ++ ) ++ endif + endif + + if meson.is_cross_build() or not get_option('scanner') +- scanner_dep = dependency('wayland-scanner', native: true, version: meson.project_version()) +- wayland_scanner_for_build = find_program(scanner_dep.get_pkgconfig_variable('wayland_scanner')) ++ wayland_scanner_for_build = '/usr/bin/wayland-scanner' + else + wayland_scanner_for_build = wayland_scanner + endif