mirror of
https://github.com/archr-linux/Arch-R.git
synced 2026-07-12 18:19:42 -07:00
wayland: rebase pkgconfig patch for 1.25.0
The 00-fix-wayland-scanner-pkgconfig.patch was anchored on a context
line ('bindir=' + join_paths(...)) that Wayland removed between 1.24
and 1.25. After our F0 bump to 1.25.0 the unpack step rejected the
patch and aborted the build_compat arm pass.
Pull the rebased patch from ROCKNIX (commit a9e464274a in their
graphics/display sync) where the same context shift was already
resolved: the bindir line is gone, the filebase line stays.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
+2
-2
@@ -1,5 +1,5 @@
|
||||
diff --git a/src/meson.build b/src/meson.build
|
||||
index 5d04334..59af71a 100644
|
||||
index b3b9ea5..19a5f5f 100644
|
||||
--- a/src/meson.build
|
||||
+++ b/src/meson.build
|
||||
@@ -65,7 +65,7 @@ if get_option('scanner')
|
||||
@@ -8,6 +8,6 @@ index 5d04334..59af71a 100644
|
||||
'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
|
||||
- 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()),
|
||||
+ 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()),
|
||||
'bindir=' + join_paths('${prefix}', get_option('bindir')),
|
||||
'wayland_scanner=${bindir}/wayland-scanner'
|
||||
],
|
||||
filebase: 'wayland-scanner'
|
||||
|
||||
Reference in New Issue
Block a user