From 725f2e0ef3eaba1ad46b597604a684125ab93911 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 8 Jun 2026 13:45:36 +0900 Subject: internal/rosa/package/wayland: wayland-protocols 1.48 to 1.49 This finally eliminates the backport patch. Signed-off-by: Ophestra --- internal/rosa/package/wayland.az | 60 +++++++++++++++++++++++++ internal/rosa/package/wayland/build-only.patch | 50 --------------------- internal/rosa/package/wayland/package.az | 61 -------------------------- 3 files changed, 60 insertions(+), 111 deletions(-) create mode 100644 internal/rosa/package/wayland.az delete mode 100644 internal/rosa/package/wayland/build-only.patch delete mode 100644 internal/rosa/package/wayland/package.az diff --git a/internal/rosa/package/wayland.az b/internal/rosa/package/wayland.az new file mode 100644 index 00000000..61ab0f6a --- /dev/null +++ b/internal/rosa/package/wayland.az @@ -0,0 +1,60 @@ +package wayland { + description = "core Wayland window system code and protocol"; + website = "https://wayland.freedesktop.org"; + anitya = 10061; + + version# = "1.25.0"; + source = remoteGitLab { + domain = "gitlab.freedesktop.org"; + suffix = "wayland/wayland"; + ref = version; + checksum = "q-4dYXme46JPgLGtXAxyZGTy7udll9RfT0VXtcW2YRR1WWViUhvdZXZneXzLqpCg"; + }; + + writable = true; + early = ` +chmod +w tests tests/sanity-test.c +echo 'int main(){}' > tests/sanity-test.c +`; + + exec = meson { + setup = { + "Ddefault_library": "both"; + "Ddocumentation": "false"; + "Dtests": "true"; + }; + }; + + inputs = [ + gawk, + diffutils, + + libffi, + libexpat, + libxml2, + ]; + + runtime = [ + libffi, + libexpat, + libxml2, + ]; +} + +package wayland-protocols { + description = "additional standard Wayland protocols"; + website = "https://wayland.freedesktop.org"; + anitya = 13997; + + version# = "1.49"; + source = remoteGitLab { + domain = "gitlab.freedesktop.org"; + suffix = "wayland/wayland-protocols"; + ref = version; + checksum = "HvV0Zk4KadZNqVBD-FXYN1ZcOsHI2HKnqVFk0hZzEF2jt3UZjkddgZLJthF0v8Ki"; + }; + + exec = meson {}; + + inputs = [ wayland ]; +} 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" -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 -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 diff --git a/internal/rosa/package/wayland/package.az b/internal/rosa/package/wayland/package.az deleted file mode 100644 index 1c3e3ffe..00000000 --- a/internal/rosa/package/wayland/package.az +++ /dev/null @@ -1,61 +0,0 @@ -package wayland { - description = "core Wayland window system code and protocol"; - website = "https://wayland.freedesktop.org"; - anitya = 10061; - - version# = "1.25.0"; - source = remoteGitLab { - domain = "gitlab.freedesktop.org"; - suffix = "wayland/wayland"; - ref = version; - checksum = "q-4dYXme46JPgLGtXAxyZGTy7udll9RfT0VXtcW2YRR1WWViUhvdZXZneXzLqpCg"; - }; - - writable = true; - early = ` -chmod +w tests tests/sanity-test.c -echo 'int main(){}' > tests/sanity-test.c -`; - - exec = meson { - setup = { - "Ddefault_library": "both"; - "Ddocumentation": "false"; - "Dtests": "true"; - }; - }; - - inputs = [ - gawk, - diffutils, - - libffi, - libexpat, - libxml2, - ]; - - runtime = [ - libffi, - libexpat, - libxml2, - ]; -} - -package wayland-protocols { - description = "additional standard Wayland protocols"; - website = "https://wayland.freedesktop.org"; - anitya = 13997; - - version# = "1.48"; - source = remoteGitLab { - domain = "gitlab.freedesktop.org"; - suffix = "wayland/wayland-protocols"; - ref = version; - checksum = "xvfHCBIzXGwOqOu9b8dfhGw_U29Pd-g4JBwpYIaxee8SwEbxi6NaVU-Y1Q7wY4jK"; - }; - patches = [ "build-only.patch" ]; - - exec = meson {}; - - inputs = [ wayland ]; -} -- cgit v1.3.1