diff options
| author | Ophestra <cat@gensokyo.uk> | 2026-06-08 13:45:36 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2026-06-08 13:45:36 +0900 |
| commit | 725f2e0ef3eaba1ad46b597604a684125ab93911 (patch) | |
| tree | 495fd7069c12a183f9b4898d2fd762e380529684 | |
| parent | 4ffa20cd3f4f57ebe643f4e29abbd947ba35830f (diff) | |
internal/rosa/package/wayland: wayland-protocols 1.48 to 1.49
This finally eliminates the backport patch.
Signed-off-by: Ophestra <cat@gensokyo.uk>
| -rw-r--r-- | internal/rosa/package/wayland.az (renamed from internal/rosa/package/wayland/package.az) | 5 | ||||
| -rw-r--r-- | internal/rosa/package/wayland/build-only.patch | 50 |
2 files changed, 2 insertions, 53 deletions
diff --git a/internal/rosa/package/wayland/package.az b/internal/rosa/package/wayland.az index 1c3e3ffe..61ab0f6a 100644 --- a/internal/rosa/package/wayland/package.az +++ b/internal/rosa/package/wayland.az @@ -46,14 +46,13 @@ package wayland-protocols { website = "https://wayland.freedesktop.org"; anitya = 13997; - version# = "1.48"; + version# = "1.49"; source = remoteGitLab { domain = "gitlab.freedesktop.org"; suffix = "wayland/wayland-protocols"; ref = version; - checksum = "xvfHCBIzXGwOqOu9b8dfhGw_U29Pd-g4JBwpYIaxee8SwEbxi6NaVU-Y1Q7wY4jK"; + checksum = "HvV0Zk4KadZNqVBD-FXYN1ZcOsHI2HKnqVFk0hZzEF2jt3UZjkddgZLJthF0v8Ki"; }; - patches = [ "build-only.patch" ]; exec = meson {}; diff --git a/internal/rosa/package/wayland/build-only.patch b/internal/rosa/package/wayland/build-only.patch deleted file mode 100644 index 22765173..00000000 --- a/internal/rosa/package/wayland/build-only.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8b4c76275fa1b6e0a99a53494151d9a2c907144d Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 8 Nov 2024 11:27:25 -0600 -Subject: [PATCH] tests: Make build-only tests actually build-only - -The goal behind the pedantic compiler tests are to ensure that the code -that wayland-scanner is generating can be compiled in pedantic mode by -the system C compiler. - -Trying to execute the built tests may fail because of undefined symbols. -This affects certain platforms more than others; Linux/musl and Darwin -are examples of platforms that cannot execute binaries with undefined -symbols. This meant tests needlessly failed on these platforms. - -Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com> -Closes: #48, #228 ---- - tests/meson.build | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tests/meson.build b/tests/meson.build -index aa216ec2..5a93bb36 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -1,4 +1,5 @@ - prog_scan_sh = find_program('scan.sh') -+prog_true = find_program('true') - - libwayland = [ - dependency('wayland-client'), -@@ -100,7 +101,7 @@ foreach protocol_file : protocol_files - test_source, - client_header, - server_header, -- code -+ code, - ], - link_args: extra_linker_flags, - dependencies: libwayland, -@@ -111,7 +112,7 @@ foreach protocol_file : protocol_files - '-Werror' ], - install: false, - ) -- test(test_name, pedantic_test_executable) -+ test(test_name, prog_true, depends : [pedantic_test_executable]) - - # Check that the header - if not protocol_file.contains('xdg-foreign-unstable-v1') --- -GitLab |
