Compare commits

..

64 commits

Author SHA1 Message Date
Yaakov Selkowitz
74f80e5c3a Conditionalize book documentation
Documentation which requires unwanted dependencies is generally disabled.

https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/548
2026-07-17 12:25:08 -04:00
7c0e7207fb Update to 1.26.0 2026-07-16 14:50:22 -04:00
be4e52d0c3 Fixup to use with mdbook 2026-07-07 12:18:42 -04:00
bd520c4a94 Update to 1.25.0
- Modernize spec
2026-06-07 15:38:14 -04:00
Fedora Release Engineering
edd1358dd6 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-17 20:08:20 +00:00
Olivier Fourdan
8972bb67c3 Add dependency on libffi for the devel package
Resolves: rhbz#2403323
2025-10-13 11:11:11 +02:00
3106b90b36 Update to 1.24.0 2025-08-05 12:16:41 -04:00
Fedora Release Engineering
56d5271474 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 20:18:44 +00:00
Olivier Fourdan
1403f25004 Update to 1.23.1 2025-04-14 15:03:19 +02:00
Fedora Release Engineering
c3f36e955b Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 14:48:09 +00:00
Fedora Release Engineering
d5241dfae4 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 09:09:50 +00:00
Olivier Fourdan
8d2ca22880 Update to 1.23.0 2024-06-28 14:32:36 +02:00
Fedora Release Engineering
7df0dff27b Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-27 08:27:01 +00:00
José Expósito
e798a17125 SPDX migration: license is already SPDX compatible 2023-09-07 15:49:29 +02:00
Fedora Release Engineering
d7a0b3e5f5 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-22 18:00:45 +00:00
Kalev Lember
88bd57ff85 Update to 1.22.0 2023-04-04 20:38:42 +02:00
Fedora Release Engineering
8622ce5e5a Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-21 06:38:33 +00:00
Mike Rochefort
b775661bbf Update to 1.21.0
* Add GPG verification
2022-07-26 18:02:21 -04:00
Fedora Release Engineering
65647ec64e Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-23 12:14:32 +00:00
Olivier Fourdan
29979b007d Close file descriptors not needed
Patch from upstream:
https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/203

Resolves: #2062030
2022-03-21 10:27:21 +01:00
Fedora Release Engineering
4af4e7014a - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-22 04:18:15 +00:00
Miro Hrončok
53022cd52a Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 2022-01-08 11:12:53 +01:00
Kalev Lember
e65c2b997b Update to 1.20.0 2021-12-16 21:53:21 +01:00
Fedora Release Engineering
82362c4c91 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-23 20:47:26 +00:00
Kalev Lember
dea79e9dc6 Drop old provides
Nothing in Fedora relies on them any more.
2021-01-28 08:31:47 +01:00
Kalev Lember
dcd5dbe649 Switch to meson build system 2021-01-28 08:24:28 +01:00
Kalev Lember
cc82a4d7c8 Update to 1.19.0 2021-01-28 08:17:22 +01:00
Fedora Release Engineering
9c07287252 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-27 23:21:06 +00:00
Tom Stellard
966a007c54 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-09 00:50:34 +00:00
Fedora Release Engineering
41dc52f2d1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-29 13:59:50 +00:00
Kalev Lember
e60298f379 Drop no longer needed obsoletes/provides 2020-02-12 12:25:03 +01:00
Kalev Lember
e6b36b1253 Update to 1.18.0 2020-02-12 12:03:14 +01:00
Fedora Release Engineering
2252ff05ff - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-31 03:31:19 +00:00
Fedora Release Engineering
c9e12fc7b0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-27 03:18:43 +00:00
Kalev Lember
bbb6c8fc2d Update to 1.17.0 2019-03-21 21:25:25 +00:00
Kalev Lember
e89a19213c Update to 1.16.92 2019-03-07 11:16:42 +01:00
Kalev Lember
d89f898d40 Update to 1.16.91 2019-02-28 21:30:32 +01:00
Fedora Release Engineering
1a916fc9a2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-03 11:33:53 +00:00
Kalev Lember
5e38b304fc Update to 1.16.0 2018-09-11 14:00:37 +02:00
Kalev Lember
f37cb0647a Update to 1.15.93 2018-08-13 12:35:40 +02:00
Florian Weimer
685f2d3caf Rebuild with fixed binutils 2018-07-31 13:09:15 +02:00
Kalev Lember
3dd477f197 Update to 1.15.92 2018-07-29 06:23:56 +02:00
Fedora Release Engineering
d3132eba70 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-14 08:44:11 +00:00
Igor Gnatenko
4507b34585 add BuildRequires: gcc
Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot
2018-07-09 19:06:53 +02:00
Kalev Lember
7e624d644b Update to 1.15.0 2018-04-10 01:03:07 +02:00
Kalev Lember
7564eb8eb8 Really move obsoletes to the correct subpackage
Commit df7203a moved the obsoletes to -client, not -egl.
2018-04-04 23:00:16 +02:00
Kalev Lember
df748a2dff Whitespace fixes 2018-04-04 22:58:49 +02:00
Kalev Lember
df7203a144 Make mesa-libwayland-egl obsoleting actually work
This moves the obsoletes from a nonexistant package (wayland) to the
correct subpackage (libwayland-egl).
2018-04-04 22:57:33 +02:00
Kalev Lember
ac0e0c98bf Update to 1.14.93 2018-04-03 10:44:00 +02:00
Kalev Lember
cc3e55fda6 Fix the tests on arm 2018-03-20 16:37:52 +01:00
Kalev Lember
d537b5c095 Remove F22 upgrade path obsoletes 2018-03-20 11:03:38 +01:00
Kalev Lember
b760b95560 Update to 1.14.92 2018-03-20 11:03:28 +01:00
46465439c7
Improve mesa-libwayland-egl Obsoletes
Mesa will remove libwayland-egl in 18.1.0, so better to be safe.
Also add provides with %{?_isa}.

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2018-03-03 09:00:16 +01:00
Kalev Lember
40f41c6b66 Remove ldconfig scriptlets 2018-02-27 10:05:43 +01:00
Kalev Lember
45b1cec8b4 Add new libwayland-egl subpackage and obsolete mesa-libwayland-egl 2018-02-27 10:04:03 +01:00
Kalev Lember
700bbaa6f2 Update to 1.14.91 2018-02-27 09:31:00 +01:00
Fedora Release Engineering
972f0b0033 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-09 20:46:51 +00:00
Kalev Lember
495334024e cursor: Fix heap overflows when parsing malicious files
https://bugzilla.redhat.com/show_bug.cgi?id=1522638
2017-12-12 16:03:36 +01:00
Kalev Lember
a80cb1c29b Update to 1.14.0 2017-08-09 09:47:26 +02:00
Kalev Lember
a81e16b0b1 Update to 1.13.93 2017-08-02 20:05:23 +02:00
Florian Weimer
a2a26cefbb Rebuild with binutils fix for ppc64le (#1475636) 2017-07-30 18:31:05 +02:00
Kalev Lember
99d781b028 Update to 1.13.92 2017-07-26 18:24:01 +02:00
Kalev Lember
5a86549969 Update to 1.13.91 2017-07-19 11:44:45 +02:00
Owen W. Taylor
8e4b8384e7 Add a patch fixing a build error with newer versions of graphviz
https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html
2017-06-12 14:45:18 -04:00
8 changed files with 326 additions and 279 deletions

31
.gitignore vendored
View file

@ -41,3 +41,34 @@
/wayland-1.12.0.tar.xz
/wayland-1.12.91.tar.xz
/wayland-1.13.0.tar.xz
/wayland-1.13.91.tar.xz
/wayland-1.13.92.tar.xz
/wayland-1.13.93.tar.xz
/wayland-1.14.0.tar.xz
/wayland-1.14.91.tar.xz
/wayland-1.14.92.tar.xz
/wayland-1.14.93.tar.xz
/wayland-1.15.0.tar.xz
/wayland-1.15.92.tar.xz
/wayland-1.15.93.tar.xz
/wayland-1.16.0.tar.xz
/wayland-1.16.91.tar.xz
/wayland-1.16.92.tar.xz
/wayland-1.17.0.tar.xz
/wayland-1.18.0.tar.xz
/wayland-1.19.0.tar.xz
/wayland-1.20.0.tar.xz
/wayland-1.21.0.tar.xz
/wayland-1.21.0.tar.xz.sig
/wayland-1.22.0.tar.xz
/wayland-1.22.0.tar.xz.sig
/wayland-1.23.0.tar.xz
/wayland-1.23.0.tar.xz.sig
/wayland-1.23.1.tar.xz
/wayland-1.23.1.tar.xz.sig
/wayland-1.24.0.tar.xz
/wayland-1.24.0.tar.xz.sig
/wayland-1.25.0.tar.xz
/wayland-1.25.0.tar.xz.sig
/wayland-1.26.0.tar.xz
/wayland-1.26.0.tar.xz.sig

View file

@ -1,52 +0,0 @@
From 5d201df72f3d4f4cb8b8f75f980169b03507da38 Mon Sep 17 00:00:00 2001
From: Tobias Stoeckmann <tobias@stoeckmann.org>
Date: Tue, 28 Nov 2017 21:38:07 +0100
Subject: [PATCH] cursor: Fix heap overflows when parsing malicious files.
It is possible to trigger heap overflows due to an integer overflow
while parsing images.
The integer overflow occurs because the chosen limit 0x10000 for
dimensions is too large for 32 bit systems, because each pixel takes
4 bytes. Properly chosen values allow an overflow which in turn will
lead to less allocated memory than needed for subsequent reads.
See also: https://cgit.freedesktop.org/xorg/lib/libXcursor/commit/?id=4794b5dd34688158fb51a2943032569d3780c4b8
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=103961
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
[Pekka: add link to the corresponding libXcursor commit]
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
---
cursor/xcursor.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/cursor/xcursor.c b/cursor/xcursor.c
index ca41c4ac611f..689c7026729d 100644
--- a/cursor/xcursor.c
+++ b/cursor/xcursor.c
@@ -202,6 +202,11 @@ XcursorImageCreate (int width, int height)
{
XcursorImage *image;
+ if (width < 0 || height < 0)
+ return NULL;
+ if (width > XCURSOR_IMAGE_MAX_SIZE || height > XCURSOR_IMAGE_MAX_SIZE)
+ return NULL;
+
image = malloc (sizeof (XcursorImage) +
width * height * sizeof (XcursorPixel));
if (!image)
@@ -482,7 +487,8 @@ _XcursorReadImage (XcursorFile *file,
if (!_XcursorReadUInt (file, &head.delay))
return NULL;
/* sanity check data */
- if (head.width >= 0x10000 || head.height > 0x10000)
+ if (head.width > XCURSOR_IMAGE_MAX_SIZE ||
+ head.height > XCURSOR_IMAGE_MAX_SIZE)
return NULL;
if (head.width == 0 || head.height == 0)
return NULL;
--
2.14.3

View file

@ -0,0 +1,53 @@
From f1798e0601aff530f1f9025067ff46d2867a1009 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 9 Jul 2026 17:02:36 -0400
Subject: [PATCH] doc: add option to not build the book
mdbook is not available in all distributions, and other documentation does
not require it.
Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>
---
doc/meson.build | 6 ++++--
meson_options.txt | 4 ++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/doc/meson.build b/doc/meson.build
index b9f6fcb..7b3d7d8 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -6,7 +6,7 @@ dot = find_program('dot')
doxygen = find_program('doxygen')
xsltproc = find_program('xsltproc')
xmlto = find_program('xmlto')
-mdbook = find_program('mdbook')
+mdbook = find_program('mdbook', required: get_option('book'))
cmd = run_command(doxygen, '--version', check: true)
message('doxygen: ' + cmd.stdout().strip())
@@ -40,4 +40,6 @@ publican_html_dir = 'html'
subdir('doxygen')
subdir('publican')
-subdir('book')
+if mdbook.found()
+ subdir('book')
+endif
diff --git a/meson_options.txt b/meson_options.txt
index 02c2346..3445f3f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -22,6 +22,10 @@ option('dtd_validation',
description: 'Validate the protocol DTD (requires libxml2)',
type: 'boolean',
value: true)
+option('book',
+ description: 'Build the Wayland Book (requires mdbook)',
+ type: 'boolean',
+ value: true)
option('icon_directory',
description: 'Location used to look for cursors (defaults to ${datadir}/icons if unset)',
type: 'string',
--
2.55.0

View file

@ -1,104 +0,0 @@
From b0d9d7fae7752f3d5f15b15d08986a8e602c832f Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" <otaylor@fishsoup.net>
Date: Thu, 1 Jun 2017 18:03:28 -0400
Subject: [PATCH] Switch graphviz files to use HTML-style labels
With recent versions of graphviz, generation of the diagrams in the documentation
fails with:
/usr/bin/dot -Tpng -oxml/x-architecture.png dot/x-architecture.gv
Warning: flat edge between adjacent nodes one of which has a record shape - replace records with HTML-like labels
Edge xserver -> comp
Error: getsplinepoints: no spline points available for edge (xserver,comp)
Error: lost xserver comp edge
Error: lost xserver comp edge
Error: lost comp xserver edge
Error: lost comp xserver edge
http://www.graphviz.org/content/i-havent-been-able-render-these-files-graphviz-226 indicates
that the error message basically means that the authors of graphviz consider record-style
labels to be deprecated and are no longer fixing errors with them. This patch changes
the labels to be in the HTML style, which seems to require duplicating style between all
the nodes, but it's not like these files are often edited.
The result is not exactly the same but is quite similar.
---
doc/doxygen/dot/wayland-architecture.gv | 13 +++++--------
doc/doxygen/dot/x-architecture.gv | 17 ++++++++---------
2 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/doc/doxygen/dot/wayland-architecture.gv b/doc/doxygen/dot/wayland-architecture.gv
index 2d5db84..f2c3507 100644
--- a/doc/doxygen/dot/wayland-architecture.gv
+++ b/doc/doxygen/dot/wayland-architecture.gv
@@ -9,21 +9,18 @@ digraph arch_wayland {
]
node[
- shape="Mrecord",
color=none,
- fillcolor="#ffbc00",
- style="filled",
+ margin=0,
fontname="DejaVu Sans",
fontsize="18",
]
- c1 [label="Wayland Client", URL="#c1"]
- c2 [label="Wayland Client", URL="#c2"]
+ c1 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>Wayland Client</TD></TR></TABLE>>, URL="#c1"]
+ c2 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>Wayland Client</TD></TR></TABLE>>, URL="#c2"]
- comp [tooltip="Wayland Compositor", label="|{|Wayland\nCompositor|}|", URL="#comp"]
-
- impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"]
+ comp [tooltip="Wayland Compositor", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>Wayland<BR/>Compositor<BR/><BR/></TD></TR></TABLE>>, URL="#comp"]
+ impl [tooltip="KMS evdev Kernel", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>KMS</TD><TD>evdev</TD></TR><TR><TD COLSPAN="2">Kernel</TD></TR></TABLE>>, URL="#impl"]
c1 -> comp [taillabel="③", labeldistance=2.5, URL="#step_3"];
c2 -> comp;
diff --git a/doc/doxygen/dot/x-architecture.gv b/doc/doxygen/dot/x-architecture.gv
index 4ea49bf..b223d1d 100644
--- a/doc/doxygen/dot/x-architecture.gv
+++ b/doc/doxygen/dot/x-architecture.gv
@@ -9,28 +9,27 @@ digraph arch_x {
]
node[
- shape="Mrecord",
+ shape="none",
color=none,
- fillcolor="#ffbc00",
- style="filled",
+ margin=0,
fontname="DejaVu Sans",
fontsize="18",
]
{
rank=same;
- c1 [label="X Client", URL="#c1"]
- c3 [label="X Client", URL="#c3"]
+ c1 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c1"]
+ c3 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c3"]
}
- c2 [label="X Client", URL="#c2"]
+ c2 [label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>X Client</TD></TR></TABLE>>, URL="#c2"]
{
rank=same;
- xserver [tooltip="X Server", label="|{|X Server|}|", URL="#xserver"]
- comp [tooltip="Compositor", label="|{|Compositor|}|", URL="#comp"]
+ xserver [tooltip="X Server", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>X Server<BR/><BR/></TD></TR></TABLE>>, URL="#xserver"]
+ comp [tooltip="Compositor", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD><BR/>Compositor<BR/><BR/></TD></TR></TABLE>>, URL="#comp"]
}
- impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"]
+ impl [tooltip="KMS evdev Kernel", label=<<TABLE STYLE="rounded" BGCOLOR="#ffbc00"><TR><TD>KMS</TD><TD>evdev</TD></TR><TR><TD COLSPAN="2">Kernel</TD></TR></TABLE>>, URL="#impl"]
c1 -> xserver [taillabel="③", labeldistance=2, URL="#step_3"];
c2 -> xserver;
--
2.13.0

BIN
emersion-gpg-key.asc Normal file

Binary file not shown.

View file

@ -1 +1,2 @@
SHA512 (wayland-1.13.0.tar.xz) = 163bae2c2c2e79e03dda9a57b1e3a1060eff9e0b053b70ad00a6949a1d40f4c40d0244340c2603109fcbfe919533c2ce196338b27587fd3bda996e615d51e543
SHA512 (wayland-1.26.0.tar.xz) = 50861b0c40cedec5f31b49ff1e99fc135a299fa4a8e2ff50ff4bac3f42e2f3f7be38271929fd2f6e58d83d5df516f643946ceba7937cc199581487c082c7ec31
SHA512 (wayland-1.26.0.tar.xz.sig) = 051de7c3c80c8cef9cf713d7346467a2ce10c10ed7a39f49f3567d0ed08f409179c56e10ce8657e9eed8c544eafb2e254e251d147b13e472e60becf46100d56a

View file

@ -1,55 +0,0 @@
From patchwork Thu Feb 23 12:47:41 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: tests: Fix "new ID" type handling in argument_from_va_list test
From: Carlos Garnacho <carlosg@gnome.org>
X-Patchwork-Id: 140495
Message-Id: <20170223124741.471-1-carlosg@gnome.org>
To: wayland-devel@lists.freedesktop.org
Cc: Carlos Garnacho <carlosg@gnome.org>
Date: Thu, 23 Feb 2017 13:47:41 +0100
New IDs are internally dealt with as objects, however this test
expected to deal with 'n' as the uint32_t type that's just seen
through the wire. We should give it an object instead, and
expect an object from it.
https://bugs.freedesktop.org/show_bug.cgi?id=99899
Signed-off-by: Carlos Garnacho <carlosg@gnome.org>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Kalev Lember <kalevlember@gmail.com>
---
tests/connection-test.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/connection-test.c b/tests/connection-test.c
index 1c688f1..8be6c38 100644
--- a/tests/connection-test.c
+++ b/tests/connection-test.c
@@ -142,7 +142,7 @@ va_list_wrapper(const char *signature, union wl_argument *args, int count, ...)
TEST(argument_from_va_list)
{
union wl_argument args[WL_CLOSURE_MAX_ARGS];
- struct wl_object fake_object;
+ struct wl_object fake_object, fake_new_object;
struct wl_array fake_array;
va_list_wrapper("i", args, 1, 100);
@@ -154,13 +154,13 @@ TEST(argument_from_va_list)
va_list_wrapper("?iuf?sonah", args, 8,
102, 103, wl_fixed_from_int(104), "value",
- &fake_object, 105, &fake_array, 106);
+ &fake_object, &fake_new_object, &fake_array, 106);
assert(args[0].i == 102);
assert(args[1].u == 103);
assert(args[2].f == wl_fixed_from_int(104));
assert(strcmp(args[3].s, "value") == 0);
assert(args[4].o == &fake_object);
- assert(args[5].n == 105);
+ assert(args[5].o == &fake_new_object);
assert(args[6].a == &fake_array);
assert(args[7].h == 106);
}

View file

@ -1,29 +1,38 @@
%bcond book %{undefined rhel}
Name: wayland
Version: 1.13.0
Release: 3%{?dist}
Version: 1.26.0
Release: 2%{?dist}
Summary: Wayland Compositor Infrastructure
# SPDX
License: MIT
URL: http://wayland.freedesktop.org/
Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
# Fix the tests to pass on ppc64
Patch0: tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch
# https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html
Patch1: Switch-graphviz-files-to-use-HTML-style-labels.patch
# https://lists.freedesktop.org/archives/wayland-devel/2017-November/035979.html
# Backported from upstream
Patch2: 0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch
Source0: https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
Source1: https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz.sig
Source2: emersion-gpg-key.asc
BuildRequires: chrpath
# https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/548
Patch0: 0001-doc-add-option-to-not-build-the-book.patch
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: docbook-style-xsl
BuildRequires: doxygen
BuildRequires: expat-devel
BuildRequires: graphviz
BuildRequires: libxml2-devel
BuildRequires: libxslt
%if %{with book}
BuildRequires: mdbook
%endif
BuildRequires: meson
BuildRequires: pkgconfig(libffi)
BuildRequires: xmlto
# For origin certification
BuildRequires: gnupg2
%description
Wayland is a protocol for a compositor to talk to its clients as well as a C
library implementation of that protocol. The compositor can be a standalone
@ -31,83 +40,20 @@ display server running on Linux kernel modesetting and evdev input devices,
an X application, or a wayland client itself. The clients can be traditional
applications, X servers (rootless or fullscreen) or other display servers.
%dnl ------------------------------------------------------------------------
%package devel
Summary: Development files for %{name}
Requires: libwayland-client%{?_isa} = %{version}-%{release}
Requires: libwayland-cursor%{?_isa} = %{version}-%{release}
Requires: libwayland-egl%{?_isa} = %{version}-%{release}
Requires: libwayland-server%{?_isa} = %{version}-%{release}
# For upgrade path from F24
Provides: libwayland-client-devel = %{version}-%{release}
Obsoletes: libwayland-client-devel < 1.11.91
Provides: libwayland-cursor-devel = %{version}-%{release}
Obsoletes: libwayland-cursor-devel < 1.11.91
Provides: libwayland-server-devel = %{version}-%{release}
Obsoletes: libwayland-server-devel < 1.11.91
Requires: pkgconfig(libffi)
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package doc
Summary: Wayland development documentation
BuildArch: noarch
# For upgrade path from F22
Obsoletes: wayland < 1.8.91
%description doc
Wayland development documentation
%package -n libwayland-client
Summary: Wayland client library
%description -n libwayland-client
Wayland client library
%package -n libwayland-cursor
Summary: Wayland cursor library
%description -n libwayland-cursor
Wayland cursor library
%package -n libwayland-server
Summary: Wayland server library
%description -n libwayland-server
Wayland server library
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%build
%configure --disable-static --enable-documentation
make %{?_smp_mflags}
%install
%make_install
find $RPM_BUILD_ROOT -name \*.la | xargs rm -f
# Remove lib64 rpaths
chrpath -d $RPM_BUILD_ROOT%{_libdir}/libwayland-cursor.so
%check
mkdir -m 700 tests/run
XDG_RUNTIME_DIR=$PWD/tests/run make check || \
{ rc=$?; cat test-suite.log; exit $rc; }
%post -n libwayland-client -p /sbin/ldconfig
%postun -n libwayland-client -p /sbin/ldconfig
%post -n libwayland-cursor -p /sbin/ldconfig
%postun -n libwayland-cursor -p /sbin/ldconfig
%post -n libwayland-server -p /sbin/ldconfig
%postun -n libwayland-server -p /sbin/ldconfig
%files devel
%{_bindir}/wayland-scanner
%{_includedir}/wayland-*.h
@ -120,26 +66,253 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \
%{_datadir}/wayland/wayland.dtd
%{_mandir}/man3/*.3*
%dnl ------------------------------------------------------------------------
%package doc
Summary: Wayland development documentation
BuildArch: noarch
%if %{with book}
# Required for mdbook generated docs
Requires: adobe-source-code-pro-fonts
Requires: open-sans-fonts
%endif
%description doc
Wayland development documentation
%files doc
%doc README TODO
%doc README.md
%{_datadir}/doc/wayland/
%dnl ------------------------------------------------------------------------
%package -n libwayland-client
Summary: Wayland client library
%description -n libwayland-client
Wayland client library
%files -n libwayland-client
%license COPYING
%{_libdir}/libwayland-client.so.0*
%dnl ------------------------------------------------------------------------
%package -n libwayland-cursor
Summary: Wayland cursor library
Requires: libwayland-client%{?_isa} = %{version}-%{release}
%description -n libwayland-cursor
Wayland cursor library
%files -n libwayland-cursor
%license COPYING
%{_libdir}/libwayland-cursor.so.0*
%dnl ------------------------------------------------------------------------
%package -n libwayland-egl
Summary: Wayland egl library
%description -n libwayland-egl
Wayland egl library
%files -n libwayland-egl
%license COPYING
%{_libdir}/libwayland-egl.so.1*
%dnl ------------------------------------------------------------------------
%package -n libwayland-server
Summary: Wayland server library
%description -n libwayland-server
Wayland server library
%files -n libwayland-server
%license COPYING
%{_libdir}/libwayland-server.so.0*
%dnl ------------------------------------------------------------------------
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%autosetup -p1
%conf
%meson %{!?with_book:-Dbook=false}
%build
%meson_build
%install
%meson_install
%check
%meson_test
%changelog
* Tue Dec 12 2017 Kalev Lember <klember@redhat.com> - 1.13.0-3
* Fri Jul 17 2026 Yaakov Selkowitz <yselkowi@redhat.com> - 1.26.0-2
- Conditionalize book documentation
* Thu Jul 16 2026 Neal Gompa <ngompa@fedoraproject.org> - 1.26.0-1
- Update to 1.26.0
* Sun Jun 07 2026 Neal Gompa <ngompa@fedoraproject.org> - 1.25.0-1
- Update to 1.25.0
- Modernize spec
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.24.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Mon Oct 13 2025 Olivier Fourdan <ofourdan@redhat.com> - 1.24.0-2
- Add dependency on libffi for the devel package (#2403323)
* Tue Aug 05 2025 Neal Gompa <ngompa@fedoraproject.org> - 1.24.0-1
- Update to 1.24.0
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Mon Apr 14 2025 Olivier Fourdan <ofourdan@redhat.com> - 1.23.1-1
- Update to 1.23.1
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.23.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Fri Jun 28 2024 Olivier Fourdan <ofourdan@redhat.com> - 1.23.0-1
- Update to 1.23.0
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Sep 07 2023 José Expósito <jexposit@redhat.com>
- SPDX migration: license is already SPDX compatible
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.22.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Tue Apr 04 2023 Kalev Lember <klember@redhat.com> - 1.22.0-1
- Update to 1.22.0
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.21.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jul 26 2022 Mike Rochefort <mroche@redhat.com> - 1.21.0-1
- Update to 1.21.0
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Mar 21 2022 Olivier Fourdan <ofourdan@redhat.com> - 1.20.0-4
- Close file descriptors not needed
rhbz#2062030
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sat Jan 08 2022 Miro Hrončok <mhroncok@redhat.com> - 1.20.0-2
- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34
* Thu Dec 16 2021 Kalev Lember <klember@redhat.com> - 1.20.0-1
- Update to 1.20.0
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.19.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Thu Jan 28 2021 Kalev Lember <klember@redhat.com> - 1.19.0-1
- Update to 1.19.0
- Switch to meson build system
- Drop old provides
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Feb 12 2020 Kalev Lember <klember@redhat.com> - 1.18.0-1
- Update to 1.18.0
- Drop no longer needed obsoletes/provides
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Mar 21 2019 Kalev Lember <klember@redhat.com> - 1.17.0-1
- Update to 1.17.0
* Thu Mar 07 2019 Kalev Lember <klember@redhat.com> - 1.16.92-1
- Update to 1.16.92
* Thu Feb 28 2019 Kalev Lember <klember@redhat.com> - 1.16.91-1
- Update to 1.16.91
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Sep 11 2018 Kalev Lember <klember@redhat.com> - 1.16.0-1
- Update to 1.16.0
* Mon Aug 13 2018 Kalev Lember <klember@redhat.com> - 1.15.93-1
- Update to 1.15.93
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.15.92-2
- Rebuild with fixed binutils
* Sun Jul 29 2018 Kalev Lember <klember@redhat.com> - 1.15.92-1
- Update to 1.15.92
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.15.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Apr 09 2018 Kalev Lember <klember@redhat.com> - 1.15.0-1
- Update to 1.15.0
* Wed Apr 04 2018 Kalev Lember <klember@redhat.com> - 1.14.93-2
- Make mesa-libwayland-egl obsoleting actually work
* Tue Apr 03 2018 Kalev Lember <klember@redhat.com> - 1.14.93-1
- Update to 1.14.93
* Tue Mar 20 2018 Kalev Lember <klember@redhat.com> - 1.14.92-1
- Update to 1.14.92
- Remove F22 upgrade path obsoletes
* Sat Mar 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.14.91-2
- Improve Obsoletes
* Tue Feb 27 2018 Kalev Lember <klember@redhat.com> - 1.14.91-1
- Update to 1.14.91
- Add new libwayland-egl subpackage and obsolete mesa-libwayland-egl
- Remove ldconfig scriptlets
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Dec 12 2017 Kalev Lember <klember@redhat.com> - 1.14.0-2
- cursor: Fix heap overflows when parsing malicious files (#1522638)
* Wed Aug 09 2017 Kalev Lember <klember@redhat.com> - 1.14.0-1
- Update to 1.14.0
* Wed Aug 02 2017 Kalev Lember <klember@redhat.com> - 1.13.93-1
- Update to 1.13.93
* Sun Jul 30 2017 Florian Weimer <fweimer@redhat.com> - 1.13.92-2
- Rebuild with binutils fix for ppc64le (#1475636)
* Wed Jul 26 2017 Kalev Lember <klember@redhat.com> - 1.13.92-1
- Update to 1.13.92
* Wed Jul 19 2017 Kalev Lember <klember@redhat.com> - 1.13.91-1
- Update to 1.13.91
* Thu Jun 1 2017 Owen Taylor otaylor@redhat.com> - 1.13.0-2
- Add a patch fixing a build error with newer versions of graphviz