From 8e4b8384e78f8032ac87456f12e48739c69c3b13 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Thu, 1 Jun 2017 23:05:54 -0400 Subject: [PATCH 01/64] Add a patch fixing a build error with newer versions of graphviz https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html --- ...phviz-files-to-use-HTML-style-labels.patch | 104 ++++++++++++++++++ wayland.spec | 8 +- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 Switch-graphviz-files-to-use-HTML-style-labels.patch diff --git a/Switch-graphviz-files-to-use-HTML-style-labels.patch b/Switch-graphviz-files-to-use-HTML-style-labels.patch new file mode 100644 index 0000000..4371258 --- /dev/null +++ b/Switch-graphviz-files-to-use-HTML-style-labels.patch @@ -0,0 +1,104 @@ +From b0d9d7fae7752f3d5f15b15d08986a8e602c832f Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" +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=<
Wayland Client
>, URL="#c1"] ++ c2 [label=<
Wayland Client
>, 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=<

Wayland
Compositor

>, URL="#comp"] + ++ impl [tooltip="KMS evdev Kernel", label=<
KMSevdev
Kernel
>, 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=<
X Client
>, URL="#c1"] ++ c3 [label=<
X Client
>, URL="#c3"] + } +- c2 [label="X Client", URL="#c2"] ++ c2 [label=<
X Client
>, 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=<

X Server

>, URL="#xserver"] ++ comp [tooltip="Compositor", label=<

Compositor

>, URL="#comp"] + } + +- impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"] ++ impl [tooltip="KMS evdev Kernel", label=<
KMSevdev
Kernel
>, URL="#impl"] + + c1 -> xserver [taillabel="③", labeldistance=2, URL="#step_3"]; + c2 -> xserver; +-- +2.13.0 + diff --git a/wayland.spec b/wayland.spec index acf3c81..81852c6 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.13.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -8,6 +8,8 @@ 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 BuildRequires: chrpath BuildRequires: docbook-style-xsl @@ -70,6 +72,7 @@ Wayland server library %prep %setup -q %patch0 -p1 +%patch1 -p1 %build @@ -130,6 +133,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* 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 + * Wed Feb 22 2017 Kalev Lember - 1.13.0-1 - Update to 1.13.0 From 5a86549969442ca3f92dc992e1c91590819907d1 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Jul 2017 11:44:45 +0200 Subject: [PATCH 02/64] Update to 1.13.91 --- .gitignore | 1 + sources | 2 +- ...ndling-in-argument_from_va_list-test.patch | 55 ------------------- wayland.spec | 10 ++-- 4 files changed, 7 insertions(+), 61 deletions(-) delete mode 100644 tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch diff --git a/.gitignore b/.gitignore index 07ab210..ac7590e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /wayland-1.12.0.tar.xz /wayland-1.12.91.tar.xz /wayland-1.13.0.tar.xz +/wayland-1.13.91.tar.xz diff --git a/sources b/sources index c2d9ace..0fa722c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.13.0.tar.xz) = 163bae2c2c2e79e03dda9a57b1e3a1060eff9e0b053b70ad00a6949a1d40f4c40d0244340c2603109fcbfe919533c2ce196338b27587fd3bda996e615d51e543 +SHA512 (wayland-1.13.91.tar.xz) = 510772ab7e5dd89853b58ea5314f8eb4be7edbb3933589e3a6d82561967b767e85f37b008648b2cd04b63121b0544156d897b89b004af9579d007f8e39fc9ba6 diff --git a/tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch b/tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch deleted file mode 100644 index da0ff83..0000000 --- a/tests-Fix-new-ID-type-handling-in-argument_from_va_list-test.patch +++ /dev/null @@ -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 -X-Patchwork-Id: 140495 -Message-Id: <20170223124741.471-1-carlosg@gnome.org> -To: wayland-devel@lists.freedesktop.org -Cc: Carlos Garnacho -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 -Reviewed-by: Pekka Paalanen -Tested-by: Kalev Lember ---- - 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); - } diff --git a/wayland.spec b/wayland.spec index 81852c6..eae2e64 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,13 +1,11 @@ Name: wayland -Version: 1.13.0 -Release: 2%{?dist} +Version: 1.13.91 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure 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 @@ -71,7 +69,6 @@ Wayland server library %prep %setup -q -%patch0 -p1 %patch1 -p1 @@ -133,6 +130,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Jul 19 2017 Kalev Lember - 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 From 99d781b02882292227aa3101498c16ef542a0caf Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 26 Jul 2017 18:24:01 +0200 Subject: [PATCH 03/64] Update to 1.13.92 --- .gitignore | 1 + sources | 2 +- wayland.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ac7590e..2ec5ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /wayland-1.12.91.tar.xz /wayland-1.13.0.tar.xz /wayland-1.13.91.tar.xz +/wayland-1.13.92.tar.xz diff --git a/sources b/sources index 0fa722c..6c8b695 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.13.91.tar.xz) = 510772ab7e5dd89853b58ea5314f8eb4be7edbb3933589e3a6d82561967b767e85f37b008648b2cd04b63121b0544156d897b89b004af9579d007f8e39fc9ba6 +SHA512 (wayland-1.13.92.tar.xz) = ebf21fe83a8f096397df1ce838ac015ce66a35035250a4322db9d0fd85be58022813438e1be83e8e05a85dd33b3ce1d1a3d0e968dfde9cd9aef7ab3789cd387b diff --git a/wayland.spec b/wayland.spec index eae2e64..325e2c1 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.13.91 +Version: 1.13.92 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -130,6 +130,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Jul 26 2017 Kalev Lember - 1.13.92-1 +- Update to 1.13.92 + * Wed Jul 19 2017 Kalev Lember - 1.13.91-1 - Update to 1.13.91 From a2a26cefbbe598c2cc70831ebdd1ff507b76429c Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 30 Jul 2017 18:31:05 +0200 Subject: [PATCH 04/64] Rebuild with binutils fix for ppc64le (#1475636) --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 325e2c1..566bd30 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.13.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -130,6 +130,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Sun Jul 30 2017 Florian Weimer - 1.13.92-2 +- Rebuild with binutils fix for ppc64le (#1475636) + * Wed Jul 26 2017 Kalev Lember - 1.13.92-1 - Update to 1.13.92 From a81e16b0b1c1a669cfd66b5d40dea18ab887c520 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 2 Aug 2017 20:05:23 +0200 Subject: [PATCH 05/64] Update to 1.13.93 --- .gitignore | 1 + ...phviz-files-to-use-HTML-style-labels.patch | 104 ------------------ sources | 2 +- wayland.spec | 10 +- 4 files changed, 7 insertions(+), 110 deletions(-) delete mode 100644 Switch-graphviz-files-to-use-HTML-style-labels.patch diff --git a/.gitignore b/.gitignore index 2ec5ee1..520b6ac 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ /wayland-1.13.0.tar.xz /wayland-1.13.91.tar.xz /wayland-1.13.92.tar.xz +/wayland-1.13.93.tar.xz diff --git a/Switch-graphviz-files-to-use-HTML-style-labels.patch b/Switch-graphviz-files-to-use-HTML-style-labels.patch deleted file mode 100644 index 4371258..0000000 --- a/Switch-graphviz-files-to-use-HTML-style-labels.patch +++ /dev/null @@ -1,104 +0,0 @@ -From b0d9d7fae7752f3d5f15b15d08986a8e602c832f Mon Sep 17 00:00:00 2001 -From: "Owen W. Taylor" -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=<
Wayland Client
>, URL="#c1"] -+ c2 [label=<
Wayland Client
>, 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=<

Wayland
Compositor

>, URL="#comp"] - -+ impl [tooltip="KMS evdev Kernel", label=<
KMSevdev
Kernel
>, 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=<
X Client
>, URL="#c1"] -+ c3 [label=<
X Client
>, URL="#c3"] - } -- c2 [label="X Client", URL="#c2"] -+ c2 [label=<
X Client
>, 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=<

X Server

>, URL="#xserver"] -+ comp [tooltip="Compositor", label=<

Compositor

>, URL="#comp"] - } - -- impl [tooltip="KMS evdev Kernel", label="|{{KMS|evdev}|Kernel}|", URL="#impl"] -+ impl [tooltip="KMS evdev Kernel", label=<
KMSevdev
Kernel
>, URL="#impl"] - - c1 -> xserver [taillabel="③", labeldistance=2, URL="#step_3"]; - c2 -> xserver; --- -2.13.0 - diff --git a/sources b/sources index 6c8b695..88b3f04 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.13.92.tar.xz) = ebf21fe83a8f096397df1ce838ac015ce66a35035250a4322db9d0fd85be58022813438e1be83e8e05a85dd33b3ce1d1a3d0e968dfde9cd9aef7ab3789cd387b +SHA512 (wayland-1.13.93.tar.xz) = 26957a0bb058b60744a5ee880cab0cf6b9568cd5f5c71e464966f16eccca66c1a3204aa2cf513b5041bb7a715cc7c8356a74809a1c54a3910282556f997c1007 diff --git a/wayland.spec b/wayland.spec index 566bd30..15dc2dc 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,13 +1,11 @@ Name: wayland -Version: 1.13.92 -Release: 2%{?dist} +Version: 1.13.93 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz -# https://lists.freedesktop.org/archives/wayland-devel/2017-June/034218.html -Patch1: Switch-graphviz-files-to-use-HTML-style-labels.patch BuildRequires: chrpath BuildRequires: docbook-style-xsl @@ -69,7 +67,6 @@ Wayland server library %prep %setup -q -%patch1 -p1 %build @@ -130,6 +127,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Aug 02 2017 Kalev Lember - 1.13.93-1 +- Update to 1.13.93 + * Sun Jul 30 2017 Florian Weimer - 1.13.92-2 - Rebuild with binutils fix for ppc64le (#1475636) From a80cb1c29bace7a333b554f25d8349d841b57f96 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 9 Aug 2017 09:47:26 +0200 Subject: [PATCH 06/64] Update to 1.14.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 520b6ac..9716cfb 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /wayland-1.13.91.tar.xz /wayland-1.13.92.tar.xz /wayland-1.13.93.tar.xz +/wayland-1.14.0.tar.xz diff --git a/sources b/sources index 88b3f04..f619a6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.13.93.tar.xz) = 26957a0bb058b60744a5ee880cab0cf6b9568cd5f5c71e464966f16eccca66c1a3204aa2cf513b5041bb7a715cc7c8356a74809a1c54a3910282556f997c1007 +SHA512 (wayland-1.14.0.tar.xz) = bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5 diff --git a/wayland.spec b/wayland.spec index 15dc2dc..b5e49dd 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.13.93 +Version: 1.14.0 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -127,6 +127,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Aug 09 2017 Kalev Lember - 1.14.0-1 +- Update to 1.14.0 + * Wed Aug 02 2017 Kalev Lember - 1.13.93-1 - Update to 1.13.93 From 495334024e586dc5307fb59548275688be87545e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 12 Dec 2017 16:03:36 +0100 Subject: [PATCH 07/64] cursor: Fix heap overflows when parsing malicious files https://bugzilla.redhat.com/show_bug.cgi?id=1522638 --- ...overflows-when-parsing-malicious-fil.patch | 52 +++++++++++++++++++ wayland.spec | 11 +++- 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch diff --git a/0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch b/0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch new file mode 100644 index 0000000..e03e3f3 --- /dev/null +++ b/0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch @@ -0,0 +1,52 @@ +From 5d201df72f3d4f4cb8b8f75f980169b03507da38 Mon Sep 17 00:00:00 2001 +From: Tobias Stoeckmann +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 +[Pekka: add link to the corresponding libXcursor commit] +Signed-off-by: Pekka Paalanen +--- + 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 + diff --git a/wayland.spec b/wayland.spec index b5e49dd..72ac8ff 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,12 +1,16 @@ Name: wayland Version: 1.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +# https://lists.freedesktop.org/archives/wayland-devel/2017-November/035979.html +# Backported from upstream +Patch0: 0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch + BuildRequires: chrpath BuildRequires: docbook-style-xsl BuildRequires: doxygen @@ -66,7 +70,7 @@ Wayland server library %prep -%setup -q +%autosetup -p1 %build @@ -127,6 +131,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Tue Dec 12 2017 Kalev Lember - 1.14.0-2 +- cursor: Fix heap overflows when parsing malicious files (#1522638) + * Wed Aug 09 2017 Kalev Lember - 1.14.0-1 - Update to 1.14.0 From 972f0b0033503cdd03d3340b480b68d316f40ad8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 20:46:51 +0000 Subject: [PATCH 08/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 72ac8ff..6c77dbd 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.14.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -131,6 +131,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Dec 12 2017 Kalev Lember - 1.14.0-2 - cursor: Fix heap overflows when parsing malicious files (#1522638) From 700bbaa6f275c4d99cccf517cc05da86a5433e6f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 27 Feb 2018 09:30:36 +0100 Subject: [PATCH 09/64] Update to 1.14.91 --- .gitignore | 1 + ...overflows-when-parsing-malicious-fil.patch | 52 ------------------- sources | 2 +- wayland.spec | 11 ++-- 4 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch diff --git a/.gitignore b/.gitignore index 9716cfb..9965377 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /wayland-1.13.92.tar.xz /wayland-1.13.93.tar.xz /wayland-1.14.0.tar.xz +/wayland-1.14.91.tar.xz diff --git a/0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch b/0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch deleted file mode 100644 index e03e3f3..0000000 --- a/0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5d201df72f3d4f4cb8b8f75f980169b03507da38 Mon Sep 17 00:00:00 2001 -From: Tobias Stoeckmann -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 -[Pekka: add link to the corresponding libXcursor commit] -Signed-off-by: Pekka Paalanen ---- - 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 - diff --git a/sources b/sources index f619a6c..6e8af13 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.14.0.tar.xz) = bd38b2b8963d4d98d42c270e5d7dbff6323789a173b19b67a18258424fd8adee5021b282c9d7f6dad0bd25aa0160e76aecd8ed803d4eb25d911ef0a81cd713a5 +SHA512 (wayland-1.14.91.tar.xz) = e9a1f465188c46e82512efba1c7502fee1201f3ddfb7afe132c406c3fb728f0f5144580663bea4cdc2af38794f00b2c30369ca6e04fdcb691b9ed1889bc11344 diff --git a/wayland.spec b/wayland.spec index 6c77dbd..e20774d 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,16 +1,12 @@ Name: wayland -Version: 1.14.0 -Release: 3%{?dist} +Version: 1.14.91 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz -# https://lists.freedesktop.org/archives/wayland-devel/2017-November/035979.html -# Backported from upstream -Patch0: 0001-cursor-Fix-heap-overflows-when-parsing-malicious-fil.patch - BuildRequires: chrpath BuildRequires: docbook-style-xsl BuildRequires: doxygen @@ -131,6 +127,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Tue Feb 27 2018 Kalev Lember - 1.14.91-1 +- Update to 1.14.91 + * Fri Feb 09 2018 Fedora Release Engineering - 1.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 45b1cec8b49c045e680dda399f02008edf88f784 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 27 Feb 2018 09:44:58 +0100 Subject: [PATCH 10/64] Add new libwayland-egl subpackage and obsolete mesa-libwayland-egl --- wayland.spec | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/wayland.spec b/wayland.spec index e20774d..12d9392 100644 --- a/wayland.spec +++ b/wayland.spec @@ -17,6 +17,10 @@ BuildRequires: libxslt BuildRequires: pkgconfig(libffi) BuildRequires: xmlto +# For upgrade path from F27 +Provides: mesa-libwayland-egl = %{version}-%{release} +Obsoletes: mesa-libwayland-egl < 18.0.0-0.3 + %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 @@ -28,6 +32,7 @@ applications, X servers (rootless or fullscreen) or other display servers. 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} @@ -36,6 +41,10 @@ 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 +# For upgrade path from F27 +Provides: libwayland-egl-devel = %{version}-%{release} +Provides: mesa-libwayland-egl-devel = %{version}-%{release} +Obsoletes: mesa-libwayland-egl-devel < 18.0.0-0.3 %description devel The %{name}-devel package contains libraries and header files for @@ -59,6 +68,11 @@ Summary: Wayland cursor library %description -n libwayland-cursor Wayland cursor library +%package -n libwayland-egl +Summary: Wayland egl library +%description -n libwayland-egl +Wayland egl library + %package -n libwayland-server Summary: Wayland server library %description -n libwayland-server @@ -94,6 +108,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %post -n libwayland-cursor -p /sbin/ldconfig %postun -n libwayland-cursor -p /sbin/ldconfig +%post -n libwayland-egl -p /sbin/ldconfig +%postun -n libwayland-egl -p /sbin/ldconfig + %post -n libwayland-server -p /sbin/ldconfig %postun -n libwayland-server -p /sbin/ldconfig @@ -122,6 +139,10 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %license COPYING %{_libdir}/libwayland-cursor.so.0* +%files -n libwayland-egl +%license COPYING +%{_libdir}/libwayland-egl.so.1* + %files -n libwayland-server %license COPYING %{_libdir}/libwayland-server.so.0* @@ -129,6 +150,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %changelog * Tue Feb 27 2018 Kalev Lember - 1.14.91-1 - Update to 1.14.91 +- Add new libwayland-egl subpackage and obsolete mesa-libwayland-egl * Fri Feb 09 2018 Fedora Release Engineering - 1.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 40f41c6b669319c048fc5b411dd961adf031d90c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 27 Feb 2018 10:05:43 +0100 Subject: [PATCH 11/64] Remove ldconfig scriptlets --- wayland.spec | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/wayland.spec b/wayland.spec index 12d9392..55bf65f 100644 --- a/wayland.spec +++ b/wayland.spec @@ -102,19 +102,6 @@ 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-egl -p /sbin/ldconfig -%postun -n libwayland-egl -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 @@ -151,6 +138,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ * Tue Feb 27 2018 Kalev Lember - 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 - 1.14.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 46465439c75844ee080bba930f09e9791ba15099 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 3 Mar 2018 09:00:16 +0100 Subject: [PATCH 12/64] 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 --- wayland.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/wayland.spec b/wayland.spec index 55bf65f..446459a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.14.91 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -19,7 +19,8 @@ BuildRequires: xmlto # For upgrade path from F27 Provides: mesa-libwayland-egl = %{version}-%{release} -Obsoletes: mesa-libwayland-egl < 18.0.0-0.3 +Provides: mesa-libwayland-egl%{?_isa} = %{version}-%{release} +Obsoletes: mesa-libwayland-egl < 18.1.0 %description Wayland is a protocol for a compositor to talk to its clients as well as a C @@ -44,7 +45,8 @@ Obsoletes: libwayland-server-devel < 1.11.91 # For upgrade path from F27 Provides: libwayland-egl-devel = %{version}-%{release} Provides: mesa-libwayland-egl-devel = %{version}-%{release} -Obsoletes: mesa-libwayland-egl-devel < 18.0.0-0.3 +Provides: mesa-libwayland-egl-devel%{?_isa} = %{version}-%{release} +Obsoletes: mesa-libwayland-egl-devel < 18.1.0 %description devel The %{name}-devel package contains libraries and header files for @@ -135,6 +137,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Sat Mar 03 2018 Igor Gnatenko - 1.14.91-2 +- Improve Obsoletes + * Tue Feb 27 2018 Kalev Lember - 1.14.91-1 - Update to 1.14.91 - Add new libwayland-egl subpackage and obsolete mesa-libwayland-egl From b760b955603dde5c95382c709fe0d52067e63803 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Mar 2018 11:03:28 +0100 Subject: [PATCH 13/64] Update to 1.14.92 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9965377..2fda04f 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /wayland-1.13.93.tar.xz /wayland-1.14.0.tar.xz /wayland-1.14.91.tar.xz +/wayland-1.14.92.tar.xz diff --git a/sources b/sources index 6e8af13..868c670 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.14.91.tar.xz) = e9a1f465188c46e82512efba1c7502fee1201f3ddfb7afe132c406c3fb728f0f5144580663bea4cdc2af38794f00b2c30369ca6e04fdcb691b9ed1889bc11344 +SHA512 (wayland-1.14.92.tar.xz) = d0ba6838652165d65399bd11e7e5abdf13a6cf9cb2c54fe5534ac7d3056922844001b237064224c82bb7dcea2b92111c1c25e798c2d39e5637cc1615c318e618 diff --git a/wayland.spec b/wayland.spec index 446459a..64c08de 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.14.91 -Release: 2%{?dist} +Version: 1.14.92 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -137,6 +137,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Tue Mar 20 2018 Kalev Lember - 1.14.92-1 +- Update to 1.14.92 + * Sat Mar 03 2018 Igor Gnatenko - 1.14.91-2 - Improve Obsoletes From d537b5c0959bef30ef1630d57fb0c625784356ac Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Mar 2018 11:03:38 +0100 Subject: [PATCH 14/64] Remove F22 upgrade path obsoletes --- wayland.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/wayland.spec b/wayland.spec index 64c08de..ba25fb7 100644 --- a/wayland.spec +++ b/wayland.spec @@ -55,8 +55,6 @@ 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 @@ -139,6 +137,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %changelog * Tue Mar 20 2018 Kalev Lember - 1.14.92-1 - Update to 1.14.92 +- Remove F22 upgrade path obsoletes * Sat Mar 03 2018 Igor Gnatenko - 1.14.91-2 - Improve Obsoletes From cc3e55fda62e8ff3207140a4dbb826acc5bdadf5 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 20 Mar 2018 16:37:33 +0100 Subject: [PATCH 15/64] Fix the tests on arm --- ...ore-underscored-symbols-in-ABI-check.patch | 50 +++++++++++++++++++ wayland.spec | 3 ++ 2 files changed, 53 insertions(+) create mode 100644 0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch diff --git a/0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch b/0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch new file mode 100644 index 0000000..5a0d40e --- /dev/null +++ b/0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch @@ -0,0 +1,50 @@ +From 05fd07f4277414ae39a0336ac04c94a58ef2aa96 Mon Sep 17 00:00:00 2001 +From: Daniel Stone +Date: Tue, 20 Mar 2018 11:01:02 +0000 +Subject: [PATCH] wayland-egl: Ignore underscored symbols in ABI check + +Rather than a hard-coded list of platform symbols, just ignore anything +prefaced with an underscore. This fixes breakage on ARM, which declares +several slightly different platform symbols to x86. + +Signed-off-by: Daniel Stone +Fixes: 21b1f22eb056 ("wayland-egl: enhance the symbol test") +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105620 +Cc: Emil Velikov +Reviewed-by: Derek Foreman +--- + egl/wayland-egl-symbols-check | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) + +diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check +index 70fe1f4cfdb5..d04fd042f43a 100755 +--- a/egl/wayland-egl-symbols-check ++++ b/egl/wayland-egl-symbols-check +@@ -16,14 +16,6 @@ fi + + AVAIL_FUNCS="$($NM -D --format=bsd --defined-only $LIB | awk '{print $3}')" + +-# Platform specific symbols. +-PLAT_FUNCS="__bss_start +-_edata +-_end +-_fini +-_init +-" +- + # Official ABI, taken from the header. + REQ_FUNCS="wl_egl_window_resize + wl_egl_window_create +@@ -32,8 +24,8 @@ wl_egl_window_get_attached_size + " + + NEW_ABI=$(echo "$AVAIL_FUNCS" | while read func; do ++ echo "$func" | grep -q "^_" && continue + echo "$REQ_FUNCS" | grep -q "^$func$" && continue +- echo "$PLAT_FUNCS" | grep -q "^$func$" && continue + + echo $func + done) +-- +2.16.2 + diff --git a/wayland.spec b/wayland.spec index ba25fb7..8f8d75d 100644 --- a/wayland.spec +++ b/wayland.spec @@ -7,6 +7,9 @@ License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch + BuildRequires: chrpath BuildRequires: docbook-style-xsl BuildRequires: doxygen From ac0e0c98bfa78e42f39163240deb9019980841d8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 3 Apr 2018 10:44:00 +0200 Subject: [PATCH 16/64] Update to 1.14.93 --- .gitignore | 1 + ...ore-underscored-symbols-in-ABI-check.patch | 50 ------------------- sources | 2 +- wayland.spec | 8 +-- 4 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch diff --git a/.gitignore b/.gitignore index 2fda04f..7bdf26d 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /wayland-1.14.0.tar.xz /wayland-1.14.91.tar.xz /wayland-1.14.92.tar.xz +/wayland-1.14.93.tar.xz diff --git a/0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch b/0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch deleted file mode 100644 index 5a0d40e..0000000 --- a/0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 05fd07f4277414ae39a0336ac04c94a58ef2aa96 Mon Sep 17 00:00:00 2001 -From: Daniel Stone -Date: Tue, 20 Mar 2018 11:01:02 +0000 -Subject: [PATCH] wayland-egl: Ignore underscored symbols in ABI check - -Rather than a hard-coded list of platform symbols, just ignore anything -prefaced with an underscore. This fixes breakage on ARM, which declares -several slightly different platform symbols to x86. - -Signed-off-by: Daniel Stone -Fixes: 21b1f22eb056 ("wayland-egl: enhance the symbol test") -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105620 -Cc: Emil Velikov -Reviewed-by: Derek Foreman ---- - egl/wayland-egl-symbols-check | 10 +--------- - 1 file changed, 1 insertion(+), 9 deletions(-) - -diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check -index 70fe1f4cfdb5..d04fd042f43a 100755 ---- a/egl/wayland-egl-symbols-check -+++ b/egl/wayland-egl-symbols-check -@@ -16,14 +16,6 @@ fi - - AVAIL_FUNCS="$($NM -D --format=bsd --defined-only $LIB | awk '{print $3}')" - --# Platform specific symbols. --PLAT_FUNCS="__bss_start --_edata --_end --_fini --_init --" -- - # Official ABI, taken from the header. - REQ_FUNCS="wl_egl_window_resize - wl_egl_window_create -@@ -32,8 +24,8 @@ wl_egl_window_get_attached_size - " - - NEW_ABI=$(echo "$AVAIL_FUNCS" | while read func; do -+ echo "$func" | grep -q "^_" && continue - echo "$REQ_FUNCS" | grep -q "^$func$" && continue -- echo "$PLAT_FUNCS" | grep -q "^$func$" && continue - - echo $func - done) --- -2.16.2 - diff --git a/sources b/sources index 868c670..bf7e05b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.14.92.tar.xz) = d0ba6838652165d65399bd11e7e5abdf13a6cf9cb2c54fe5534ac7d3056922844001b237064224c82bb7dcea2b92111c1c25e798c2d39e5637cc1615c318e618 +SHA512 (wayland-1.14.93.tar.xz) = 6d617b2025505e599c25c8a42062e7f78fe5bcbab58a96fcbc6afb54cf4b92e44a3f5a096c8d55e58539530f98a549f1cd20615c378cc591d50abdefa56b7656 diff --git a/wayland.spec b/wayland.spec index 8f8d75d..1fb7af2 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.14.92 +Version: 1.14.93 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -7,9 +7,6 @@ License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz -# Backported from upstream -Patch0: 0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch - BuildRequires: chrpath BuildRequires: docbook-style-xsl BuildRequires: doxygen @@ -138,6 +135,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Tue Apr 03 2018 Kalev Lember - 1.14.93-1 +- Update to 1.14.93 + * Tue Mar 20 2018 Kalev Lember - 1.14.92-1 - Update to 1.14.92 - Remove F22 upgrade path obsoletes From df7203a1448307cfa196512590726ae9c68f4cd3 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 4 Apr 2018 22:57:33 +0200 Subject: [PATCH 17/64] Make mesa-libwayland-egl obsoleting actually work This moves the obsoletes from a nonexistant package (wayland) to the correct subpackage (libwayland-egl). --- wayland.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/wayland.spec b/wayland.spec index 1fb7af2..8e35d09 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.14.93 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -17,11 +17,6 @@ BuildRequires: libxslt BuildRequires: pkgconfig(libffi) BuildRequires: xmlto -# For upgrade path from F27 -Provides: mesa-libwayland-egl = %{version}-%{release} -Provides: mesa-libwayland-egl%{?_isa} = %{version}-%{release} -Obsoletes: mesa-libwayland-egl < 18.1.0 - %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 @@ -60,6 +55,11 @@ Wayland development documentation %package -n libwayland-client Summary: Wayland client library +# For upgrade path from F27 +Provides: mesa-libwayland-egl = %{version}-%{release} +Provides: mesa-libwayland-egl%{?_isa} = %{version}-%{release} +Obsoletes: mesa-libwayland-egl < 18.1.0 + %description -n libwayland-client Wayland client library @@ -135,6 +135,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Apr 04 2018 Kalev Lember - 1.14.93-2 +- Make mesa-libwayland-egl obsoleting actually work + * Tue Apr 03 2018 Kalev Lember - 1.14.93-1 - Update to 1.14.93 From df748a2dff3b82a11a240fb07669af2acfe1831f Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 4 Apr 2018 22:58:49 +0200 Subject: [PATCH 18/64] Whitespace fixes --- wayland.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/wayland.spec b/wayland.spec index 8e35d09..75e3b8f 100644 --- a/wayland.spec +++ b/wayland.spec @@ -78,16 +78,13 @@ Summary: Wayland server library %description -n libwayland-server Wayland server library - %prep %autosetup -p1 - %build %configure --disable-static --enable-documentation make %{?_smp_mflags} - %install %make_install @@ -101,7 +98,6 @@ mkdir -m 700 tests/run XDG_RUNTIME_DIR=$PWD/tests/run make check || \ { rc=$?; cat test-suite.log; exit $rc; } - %files devel %{_bindir}/wayland-scanner %{_includedir}/wayland-*.h From 7564eb8eb88f4d999439612ff0b2f844b895ef43 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 4 Apr 2018 23:00:16 +0200 Subject: [PATCH 19/64] Really move obsoletes to the correct subpackage Commit df7203a moved the obsoletes to -client, not -egl. --- wayland.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wayland.spec b/wayland.spec index 75e3b8f..4572701 100644 --- a/wayland.spec +++ b/wayland.spec @@ -55,11 +55,6 @@ Wayland development documentation %package -n libwayland-client Summary: Wayland client library -# For upgrade path from F27 -Provides: mesa-libwayland-egl = %{version}-%{release} -Provides: mesa-libwayland-egl%{?_isa} = %{version}-%{release} -Obsoletes: mesa-libwayland-egl < 18.1.0 - %description -n libwayland-client Wayland client library @@ -70,6 +65,11 @@ Wayland cursor library %package -n libwayland-egl Summary: Wayland egl library +# For upgrade path from F27 +Provides: mesa-libwayland-egl = %{version}-%{release} +Provides: mesa-libwayland-egl%{?_isa} = %{version}-%{release} +Obsoletes: mesa-libwayland-egl < 18.1.0 + %description -n libwayland-egl Wayland egl library From 7e624d644b24d977fd15953ec846a619a89289f2 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 10 Apr 2018 01:03:07 +0200 Subject: [PATCH 20/64] Update to 1.15.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7bdf26d..a598c39 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /wayland-1.14.91.tar.xz /wayland-1.14.92.tar.xz /wayland-1.14.93.tar.xz +/wayland-1.15.0.tar.xz diff --git a/sources b/sources index bf7e05b..c15c2ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.14.93.tar.xz) = 6d617b2025505e599c25c8a42062e7f78fe5bcbab58a96fcbc6afb54cf4b92e44a3f5a096c8d55e58539530f98a549f1cd20615c378cc591d50abdefa56b7656 +SHA512 (wayland-1.15.0.tar.xz) = f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8 diff --git a/wayland.spec b/wayland.spec index 4572701..c44d856 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.14.93 -Release: 2%{?dist} +Version: 1.15.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -131,6 +131,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Mon Apr 09 2018 Kalev Lember - 1.15.0-1 +- Update to 1.15.0 + * Wed Apr 04 2018 Kalev Lember - 1.14.93-2 - Make mesa-libwayland-egl obsoleting actually work From 4507b34585094f8112d29c30c4f94d8014261ecd Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:53 +0200 Subject: [PATCH 21/64] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- wayland.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wayland.spec b/wayland.spec index c44d856..e624122 100644 --- a/wayland.spec +++ b/wayland.spec @@ -7,6 +7,7 @@ License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +BuildRequires: gcc BuildRequires: chrpath BuildRequires: docbook-style-xsl BuildRequires: doxygen From d3132eba7082b8574304e60c9dc868f7c96c591e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:44:11 +0000 Subject: [PATCH 22/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index e624122..03ccb2a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Apr 09 2018 Kalev Lember - 1.15.0-1 - Update to 1.15.0 From 3dd477f1974db5c82f3a454939a50c7af9f6afda Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 29 Jul 2018 06:23:56 +0200 Subject: [PATCH 23/64] Update to 1.15.92 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index a598c39..defa193 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /wayland-1.14.92.tar.xz /wayland-1.14.93.tar.xz /wayland-1.15.0.tar.xz +/wayland-1.15.92.tar.xz diff --git a/sources b/sources index c15c2ea..347c288 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.15.0.tar.xz) = f908917f1b575d2dc4d9770d3303e2637e8744fcb5c81feb2af2fe82cc51f54e22beaddfbe775fcf9623584169b7a062c75076132abeb888717180bfab53b3a8 +SHA512 (wayland-1.15.92.tar.xz) = c3c16f4c9c699f9b3f81a3391388319a3332623b7e5ff37ebe2a0670a1481250677287b0dbfba5a9028b89b7eca3d5a547df90e1ab50b76867d0fb3d3b0e6c65 diff --git a/wayland.spec b/wayland.spec index 03ccb2a..75e872d 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.15.0 -Release: 2%{?dist} +Version: 1.15.92 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Sun Jul 29 2018 Kalev Lember - 1.15.92-1 +- Update to 1.15.92 + * Sat Jul 14 2018 Fedora Release Engineering - 1.15.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 685f2d3caf3df18bc619eae26766855c8398865a Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 31 Jul 2018 13:09:15 +0200 Subject: [PATCH 24/64] Rebuild with fixed binutils --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 75e872d..5178daf 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.15.92 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Tue Jul 31 2018 Florian Weimer - 1.15.92-2 +- Rebuild with fixed binutils + * Sun Jul 29 2018 Kalev Lember - 1.15.92-1 - Update to 1.15.92 From f37cb0647a6031e3f2a29b7133cf3115e8df96d7 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 13 Aug 2018 12:35:40 +0200 Subject: [PATCH 25/64] Update to 1.15.93 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index defa193..6c9f753 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /wayland-1.14.93.tar.xz /wayland-1.15.0.tar.xz /wayland-1.15.92.tar.xz +/wayland-1.15.93.tar.xz diff --git a/sources b/sources index 347c288..b0c7e58 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.15.92.tar.xz) = c3c16f4c9c699f9b3f81a3391388319a3332623b7e5ff37ebe2a0670a1481250677287b0dbfba5a9028b89b7eca3d5a547df90e1ab50b76867d0fb3d3b0e6c65 +SHA512 (wayland-1.15.93.tar.xz) = 723cb7fe01692fa24e3b689882f0b5075af4119ae1bbb1664f846c4fdc6cca242173cfbe17331aaffec33a5b091f309dac5318799b4db4206b6145eb5da694c1 diff --git a/wayland.spec b/wayland.spec index 5178daf..10b8ee8 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.15.92 -Release: 2%{?dist} +Version: 1.15.93 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Mon Aug 13 2018 Kalev Lember - 1.15.93-1 +- Update to 1.15.93 + * Tue Jul 31 2018 Florian Weimer - 1.15.92-2 - Rebuild with fixed binutils From 5e38b304fc93d67296e05240c7fe180dafebe989 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 11 Sep 2018 14:00:37 +0200 Subject: [PATCH 26/64] Update to 1.16.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 6c9f753..5f68eab 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /wayland-1.15.0.tar.xz /wayland-1.15.92.tar.xz /wayland-1.15.93.tar.xz +/wayland-1.16.0.tar.xz diff --git a/sources b/sources index b0c7e58..5f270db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.15.93.tar.xz) = 723cb7fe01692fa24e3b689882f0b5075af4119ae1bbb1664f846c4fdc6cca242173cfbe17331aaffec33a5b091f309dac5318799b4db4206b6145eb5da694c1 +SHA512 (wayland-1.16.0.tar.xz) = 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c diff --git a/wayland.spec b/wayland.spec index 10b8ee8..7095e5a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.15.93 +Version: 1.16.0 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Tue Sep 11 2018 Kalev Lember - 1.16.0-1 +- Update to 1.16.0 + * Mon Aug 13 2018 Kalev Lember - 1.15.93-1 - Update to 1.15.93 From 1a916fc9a28092613e1c66e2c6ca862f44c058ee Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:33:53 +0000 Subject: [PATCH 27/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 7095e5a..be47030 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.16.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Sep 11 2018 Kalev Lember - 1.16.0-1 - Update to 1.16.0 From d89f898d40f54e6b620a101869f3c7f59a969f00 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Feb 2019 21:30:32 +0100 Subject: [PATCH 28/64] Update to 1.16.91 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5f68eab..dd62654 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /wayland-1.15.92.tar.xz /wayland-1.15.93.tar.xz /wayland-1.16.0.tar.xz +/wayland-1.16.91.tar.xz diff --git a/sources b/sources index 5f270db..b7cc6a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.16.0.tar.xz) = 64eca2b1c0bc7913508a5499dae87e2723c712d8024acbb4c77c3c4a6c20de78c10704ae9827fd034116ca540a547aeec28c5a1e3bd382b23f85231424b0f49c +SHA512 (wayland-1.16.91.tar.xz) = 5c1a96cbe31d36386f66b9d02fce4f5eb96e93b3a602124a57966f06f1103d8fd7035a8084816c4b51f21adea4dde73f5d293295fbd7227b270ca95efa19b56f diff --git a/wayland.spec b/wayland.spec index be47030..391f341 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.16.0 -Release: 2%{?dist} +Version: 1.16.91 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Thu Feb 28 2019 Kalev Lember - 1.16.91-1 +- Update to 1.16.91 + * Sun Feb 03 2019 Fedora Release Engineering - 1.16.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From e89a19213cdc452842e317614b817184eeb48d1b Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 7 Mar 2019 11:16:42 +0100 Subject: [PATCH 29/64] Update to 1.16.92 --- .gitignore | 1 + sources | 2 +- wayland.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dd62654..3e87547 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /wayland-1.15.93.tar.xz /wayland-1.16.0.tar.xz /wayland-1.16.91.tar.xz +/wayland-1.16.92.tar.xz diff --git a/sources b/sources index b7cc6a6..1d674e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.16.91.tar.xz) = 5c1a96cbe31d36386f66b9d02fce4f5eb96e93b3a602124a57966f06f1103d8fd7035a8084816c4b51f21adea4dde73f5d293295fbd7227b270ca95efa19b56f +SHA512 (wayland-1.16.92.tar.xz) = d28eba0b9f4162378df08e59efe0aa099603942732735b09b5811700b5d5e130314833b5bd0604d4be5c1b89bb2b6a1e86dc14520703f73fd4c3a5cc7fab3ea2 diff --git a/wayland.spec b/wayland.spec index 391f341..c057a1e 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.16.91 +Version: 1.16.92 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Thu Mar 07 2019 Kalev Lember - 1.16.92-1 +- Update to 1.16.92 + * Thu Feb 28 2019 Kalev Lember - 1.16.91-1 - Update to 1.16.91 From bbb6c8fc2d2e7166a2c272249c44e18ee634f3e4 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 21 Mar 2019 21:25:25 +0000 Subject: [PATCH 30/64] Update to 1.17.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3e87547..930c195 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /wayland-1.16.0.tar.xz /wayland-1.16.91.tar.xz /wayland-1.16.92.tar.xz +/wayland-1.17.0.tar.xz diff --git a/sources b/sources index 1d674e3..67c39c6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.16.92.tar.xz) = d28eba0b9f4162378df08e59efe0aa099603942732735b09b5811700b5d5e130314833b5bd0604d4be5c1b89bb2b6a1e86dc14520703f73fd4c3a5cc7fab3ea2 +SHA512 (wayland-1.17.0.tar.xz) = c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 diff --git a/wayland.spec b/wayland.spec index c057a1e..ec7c87f 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.16.92 +Version: 1.17.0 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Thu Mar 21 2019 Kalev Lember - 1.17.0-1 +- Update to 1.17.0 + * Thu Mar 07 2019 Kalev Lember - 1.16.92-1 - Update to 1.16.92 From c9e12fc7b082309206ec3a22bf98df0aeddde2ca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:18:43 +0000 Subject: [PATCH 31/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index ec7c87f..627e840 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.17.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.17.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Mar 21 2019 Kalev Lember - 1.17.0-1 - Update to 1.17.0 From 2252ff05ff23b34ecadbcc2726b8e58dfbaf9c20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 03:31:19 +0000 Subject: [PATCH 32/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 627e840..a9b9d66 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.17.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.17.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e6b36b125380e931d20591c5a4ed4ae1a0116ca8 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 12 Feb 2020 12:03:14 +0100 Subject: [PATCH 33/64] Update to 1.18.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 930c195..912d29c 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /wayland-1.16.91.tar.xz /wayland-1.16.92.tar.xz /wayland-1.17.0.tar.xz +/wayland-1.18.0.tar.xz diff --git a/sources b/sources index 67c39c6..e803fb3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.17.0.tar.xz) = c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946 +SHA512 (wayland-1.18.0.tar.xz) = e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc diff --git a/wayland.spec b/wayland.spec index a9b9d66..a4d9c1d 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.17.0 -Release: 3%{?dist} +Version: 1.18.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -132,6 +132,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Feb 12 2020 Kalev Lember - 1.18.0-1 +- Update to 1.18.0 + * Fri Jan 31 2020 Fedora Release Engineering - 1.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e60298f3796f96f12b046d030d0124c002b2e219 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 12 Feb 2020 12:25:03 +0100 Subject: [PATCH 34/64] Drop no longer needed obsoletes/provides --- wayland.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/wayland.spec b/wayland.spec index a4d9c1d..eb3c001 100644 --- a/wayland.spec +++ b/wayland.spec @@ -33,16 +33,10 @@ 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 # For upgrade path from F27 Provides: libwayland-egl-devel = %{version}-%{release} -Provides: mesa-libwayland-egl-devel = %{version}-%{release} -Provides: mesa-libwayland-egl-devel%{?_isa} = %{version}-%{release} -Obsoletes: mesa-libwayland-egl-devel < 18.1.0 %description devel The %{name}-devel package contains libraries and header files for @@ -66,11 +60,6 @@ Wayland cursor library %package -n libwayland-egl Summary: Wayland egl library -# For upgrade path from F27 -Provides: mesa-libwayland-egl = %{version}-%{release} -Provides: mesa-libwayland-egl%{?_isa} = %{version}-%{release} -Obsoletes: mesa-libwayland-egl < 18.1.0 - %description -n libwayland-egl Wayland egl library @@ -134,6 +123,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %changelog * Wed Feb 12 2020 Kalev Lember - 1.18.0-1 - Update to 1.18.0 +- Drop no longer needed obsoletes/provides * Fri Jan 31 2020 Fedora Release Engineering - 1.17.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 41dc52f2d1f924cbe38de2b860875717ea4708d6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:59:50 +0000 Subject: [PATCH 35/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index eb3c001..100d83b 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.18.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -121,6 +121,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.18.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Feb 12 2020 Kalev Lember - 1.18.0-1 - Update to 1.18.0 - Drop no longer needed obsoletes/provides From 966a007c54d457e63ec6eb9be49e1c9d1869a3b8 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:50:34 +0000 Subject: [PATCH 36/64] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- wayland.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/wayland.spec b/wayland.spec index 100d83b..bc94cf8 100644 --- a/wayland.spec +++ b/wayland.spec @@ -7,6 +7,7 @@ License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +BuildRequires: make BuildRequires: gcc BuildRequires: chrpath BuildRequires: docbook-style-xsl From 9c0728725272e9a164a0f0511db0f624a1bc7f77 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:21:06 +0000 Subject: [PATCH 37/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index bc94cf8..ee86cbf 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.18.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -122,6 +122,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.18.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.18.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cc82a4d7c8884ec43e97e2fefd72091b9b3d247c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Jan 2021 08:13:15 +0100 Subject: [PATCH 38/64] Update to 1.19.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 912d29c..5a29306 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /wayland-1.16.92.tar.xz /wayland-1.17.0.tar.xz /wayland-1.18.0.tar.xz +/wayland-1.19.0.tar.xz diff --git a/sources b/sources index e803fb3..7bbe46b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.18.0.tar.xz) = e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc +SHA512 (wayland-1.19.0.tar.xz) = d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef diff --git a/wayland.spec b/wayland.spec index ee86cbf..42e6997 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.18.0 -Release: 3%{?dist} +Version: 1.19.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -122,6 +122,9 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_libdir}/libwayland-server.so.0* %changelog +* Thu Jan 28 2021 Kalev Lember - 1.19.0-1 +- Update to 1.19.0 + * Wed Jan 27 2021 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dcd5dbe649013b15beee85bbe4e012c7e888c43a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Jan 2021 08:17:30 +0100 Subject: [PATCH 39/64] Switch to meson build system --- wayland.spec | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/wayland.spec b/wayland.spec index 42e6997..71944f0 100644 --- a/wayland.spec +++ b/wayland.spec @@ -7,15 +7,15 @@ License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz -BuildRequires: make BuildRequires: gcc -BuildRequires: chrpath +BuildRequires: gcc-c++ BuildRequires: docbook-style-xsl BuildRequires: doxygen BuildRequires: expat-devel BuildRequires: graphviz BuildRequires: libxml2-devel BuildRequires: libxslt +BuildRequires: meson BuildRequires: pkgconfig(libffi) BuildRequires: xmlto @@ -73,21 +73,14 @@ Wayland server library %autosetup -p1 %build -%configure --disable-static --enable-documentation -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install - -find $RPM_BUILD_ROOT -name \*.la | xargs rm -f - -# Remove lib64 rpaths -chrpath -d $RPM_BUILD_ROOT%{_libdir}/libwayland-cursor.so +%meson_install %check -mkdir -m 700 tests/run -XDG_RUNTIME_DIR=$PWD/tests/run make check || \ -{ rc=$?; cat test-suite.log; exit $rc; } +%meson_test %files devel %{_bindir}/wayland-scanner @@ -102,7 +95,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %{_mandir}/man3/*.3* %files doc -%doc README TODO +%doc README %{_datadir}/doc/wayland/ %files -n libwayland-client @@ -124,6 +117,7 @@ XDG_RUNTIME_DIR=$PWD/tests/run make check || \ %changelog * Thu Jan 28 2021 Kalev Lember - 1.19.0-1 - Update to 1.19.0 +- Switch to meson build system * Wed Jan 27 2021 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dea79e9dc68622a2f797edcd83b987199bbca24c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 28 Jan 2021 08:31:47 +0100 Subject: [PATCH 40/64] Drop old provides Nothing in Fedora relies on them any more. --- wayland.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/wayland.spec b/wayland.spec index 71944f0..9cac2e3 100644 --- a/wayland.spec +++ b/wayland.spec @@ -32,12 +32,6 @@ 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} -Provides: libwayland-cursor-devel = %{version}-%{release} -Provides: libwayland-server-devel = %{version}-%{release} -# For upgrade path from F27 -Provides: libwayland-egl-devel = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -118,6 +112,7 @@ Wayland server library * Thu Jan 28 2021 Kalev Lember - 1.19.0-1 - Update to 1.19.0 - Switch to meson build system +- Drop old provides * Wed Jan 27 2021 Fedora Release Engineering - 1.18.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 82362c4c91b67a2add5aba7394f12678e2bb9821 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:47:26 +0000 Subject: [PATCH 41/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 9cac2e3..2cfa4e5 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -109,6 +109,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Jan 28 2021 Kalev Lember - 1.19.0-1 - Update to 1.19.0 - Switch to meson build system From e65c2b997b538d7f1d91fb9e219c8bd20adab109 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 16 Dec 2021 21:53:21 +0100 Subject: [PATCH 42/64] Update to 1.20.0 --- .gitignore | 1 + sources | 2 +- wayland.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5a29306..1cffeb4 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /wayland-1.17.0.tar.xz /wayland-1.18.0.tar.xz /wayland-1.19.0.tar.xz +/wayland-1.20.0.tar.xz diff --git a/sources b/sources index 7bbe46b..fb44ab1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wayland-1.19.0.tar.xz) = d8a86f5e23e4a88e7c84b82fdb51eb350419086afe462ecb2f4d5c3ba9290ede310cbbcffd60215219ddccf5bad4adec21a5ebfbef6577200f66ac7a1b64a5ef +SHA512 (wayland-1.20.0.tar.xz) = e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215 diff --git a/wayland.spec b/wayland.spec index 2cfa4e5..ffbd341 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.19.0 -Release: 2%{?dist} +Version: 1.20.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -109,6 +109,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Thu Dec 16 2021 Kalev Lember - 1.20.0-1 +- Update to 1.20.0 + * Fri Jul 23 2021 Fedora Release Engineering - 1.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 53022cd52a7b17e16f6d16eb66bf180236ac52ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Sat, 8 Jan 2022 11:12:53 +0100 Subject: [PATCH 43/64] Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index ffbd341..83c8d45 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.20.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -109,6 +109,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jan 08 2022 Miro Hrončok - 1.20.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 + * Thu Dec 16 2021 Kalev Lember - 1.20.0-1 - Update to 1.20.0 From 4af4e7014aaedeafa4de48bab37ff4c12d04ee20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:18:15 +0000 Subject: [PATCH 44/64] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 83c8d45..36249ec 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.20.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -109,6 +109,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sat Jan 08 2022 Miro Hrončok - 1.20.0-2 - Rebuilt for https://fedoraproject.org/wiki/Changes/LIBFFI34 From 29979b007dcb8fa36ec26fc1d16533774143182a Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Mon, 21 Mar 2022 10:03:01 +0100 Subject: [PATCH 45/64] Close file descriptors not needed Patch from upstream: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/203 Resolves: #2062030 --- ...hm-Close-file-descriptors-not-needed.patch | 74 +++++++++++++++++++ wayland.spec | 9 ++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 0001-shm-Close-file-descriptors-not-needed.patch diff --git a/0001-shm-Close-file-descriptors-not-needed.patch b/0001-shm-Close-file-descriptors-not-needed.patch new file mode 100644 index 0000000..6731d34 --- /dev/null +++ b/0001-shm-Close-file-descriptors-not-needed.patch @@ -0,0 +1,74 @@ +From 5c0a466e1757fc74dba32fdb1a9ad90eda8b4cdb Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan +Date: Mon, 10 Jan 2022 15:10:07 +0100 +Subject: [PATCH] shm: Close file descriptors not needed + +Commit 5a981ee8 implemented a fallback path for platforms which do not +support mremap() such as FreeBSD. + +To do so, the file descriptor for the mmap() is not closed immediately +but instead kept as long as the pool exists. + +That induces more file descriptors kept open for longer, which in turn +may cause problems as wl_shm may be using a lot of file descriptors, +especially with Xwayland which can create a lot of pixmaps on behalf of +its X11 clients. + +For platforms where mremap() is available, keeping those file +descriptors opened is a bit of a waste and may cause exhaustion of file +descriptors sooner that before commit 5a981ee8. + +Only keep the mmap() file descriptor open on platforms which do not +implement mremap() and close it immediately as before on others. + +Signed-off-by: Olivier Fourdan +Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1283 +--- + src/wayland-shm.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/wayland-shm.c b/src/wayland-shm.c +index 28c550d..c4cd390 100644 +--- a/src/wayland-shm.c ++++ b/src/wayland-shm.c +@@ -65,10 +65,12 @@ struct wl_shm_pool { + char *data; + ssize_t size; + ssize_t new_size; ++#ifndef MREMAP_MAYMOVE + /* The following three fields are needed for mremap() emulation. */ + int mmap_fd; + int mmap_flags; + int mmap_prot; ++#endif + bool sigbus_is_impossible; + }; + +@@ -153,7 +155,9 @@ shm_pool_unref(struct wl_shm_pool *pool, bool external) + return; + + munmap(pool->data, pool->size); ++#ifndef MREMAP_MAYMOVE + close(pool->mmap_fd); ++#endif + free(pool); + } + +@@ -344,10 +348,14 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource, + strerror(errno)); + goto err_free; + } ++#ifndef MREMAP_MAYMOVE + /* We may need to keep the fd, prot and flags to emulate mremap(). */ + pool->mmap_fd = fd; + pool->mmap_prot = prot; + pool->mmap_flags = flags; ++#else ++ close(fd); ++#endif + pool->resource = + wl_resource_create(client, &wl_shm_pool_interface, 1, id); + if (!pool->resource) { +-- +2.35.1 + diff --git a/wayland.spec b/wayland.spec index 36249ec..61d0cac 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,12 +1,15 @@ Name: wayland Version: 1.20.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Wayland Compositor Infrastructure License: MIT URL: http://wayland.freedesktop.org/ Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz +# https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/203 +Patch0: 0001-shm-Close-file-descriptors-not-needed.patch + BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: docbook-style-xsl @@ -109,6 +112,10 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Mon Mar 21 2022 Olivier Fourdan - 1.20.0-4 +- Close file descriptors not needed + rhbz#2062030 + * Sat Jan 22 2022 Fedora Release Engineering - 1.20.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 65647ec64e74184595adac5d644c95636c52b352 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:14:32 +0000 Subject: [PATCH 46/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 61d0cac..d63d2f5 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.20.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -112,6 +112,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.20.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Mar 21 2022 Olivier Fourdan - 1.20.0-4 - Close file descriptors not needed rhbz#2062030 From b775661bbf7ee733eac8a4f9c669f7125c2a5b7b Mon Sep 17 00:00:00 2001 From: Mike Rochefort Date: Fri, 1 Jul 2022 10:18:57 -0400 Subject: [PATCH 47/64] Update to 1.21.0 * Add GPG verification --- .gitignore | 2 + ...hm-Close-file-descriptors-not-needed.patch | 74 ------------------ emersion-gpg-key.asc | Bin 0 -> 7501 bytes sources | 3 +- wayland.spec | 18 +++-- 5 files changed, 16 insertions(+), 81 deletions(-) delete mode 100644 0001-shm-Close-file-descriptors-not-needed.patch create mode 100644 emersion-gpg-key.asc diff --git a/.gitignore b/.gitignore index 1cffeb4..a020ecb 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,5 @@ /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 diff --git a/0001-shm-Close-file-descriptors-not-needed.patch b/0001-shm-Close-file-descriptors-not-needed.patch deleted file mode 100644 index 6731d34..0000000 --- a/0001-shm-Close-file-descriptors-not-needed.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 5c0a466e1757fc74dba32fdb1a9ad90eda8b4cdb Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Mon, 10 Jan 2022 15:10:07 +0100 -Subject: [PATCH] shm: Close file descriptors not needed - -Commit 5a981ee8 implemented a fallback path for platforms which do not -support mremap() such as FreeBSD. - -To do so, the file descriptor for the mmap() is not closed immediately -but instead kept as long as the pool exists. - -That induces more file descriptors kept open for longer, which in turn -may cause problems as wl_shm may be using a lot of file descriptors, -especially with Xwayland which can create a lot of pixmaps on behalf of -its X11 clients. - -For platforms where mremap() is available, keeping those file -descriptors opened is a bit of a waste and may cause exhaustion of file -descriptors sooner that before commit 5a981ee8. - -Only keep the mmap() file descriptor open on platforms which do not -implement mremap() and close it immediately as before on others. - -Signed-off-by: Olivier Fourdan -Closes: https://gitlab.freedesktop.org/xorg/xserver/-/issues/1283 ---- - src/wayland-shm.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/wayland-shm.c b/src/wayland-shm.c -index 28c550d..c4cd390 100644 ---- a/src/wayland-shm.c -+++ b/src/wayland-shm.c -@@ -65,10 +65,12 @@ struct wl_shm_pool { - char *data; - ssize_t size; - ssize_t new_size; -+#ifndef MREMAP_MAYMOVE - /* The following three fields are needed for mremap() emulation. */ - int mmap_fd; - int mmap_flags; - int mmap_prot; -+#endif - bool sigbus_is_impossible; - }; - -@@ -153,7 +155,9 @@ shm_pool_unref(struct wl_shm_pool *pool, bool external) - return; - - munmap(pool->data, pool->size); -+#ifndef MREMAP_MAYMOVE - close(pool->mmap_fd); -+#endif - free(pool); - } - -@@ -344,10 +348,14 @@ shm_create_pool(struct wl_client *client, struct wl_resource *resource, - strerror(errno)); - goto err_free; - } -+#ifndef MREMAP_MAYMOVE - /* We may need to keep the fd, prot and flags to emulate mremap(). */ - pool->mmap_fd = fd; - pool->mmap_prot = prot; - pool->mmap_flags = flags; -+#else -+ close(fd); -+#endif - pool->resource = - wl_resource_create(client, &wl_shm_pool_interface, 1, id); - if (!pool->resource) { --- -2.35.1 - diff --git a/emersion-gpg-key.asc b/emersion-gpg-key.asc new file mode 100644 index 0000000000000000000000000000000000000000..cc3b6a06af86e73144a2da89ca2f6616fcdd9dcb GIT binary patch literal 7501 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 Z;uv?E-3OC)q~end*?%>?UUAaK|1Y-2tr!3R literal 0 HcmV?d00001 diff --git a/sources b/sources index fb44ab1..f89e2e3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (wayland-1.20.0.tar.xz) = e8a1f410994b947f850799bdd0d95a2429d8467f853e62a0ab3915a4e9fe130f8aa977e03715114ab740c6ec546edea63d275ce7f927d4f3029ea126e6a7d215 +SHA512 (wayland-1.21.0.tar.xz) = 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3 +SHA512 (wayland-1.21.0.tar.xz.sig) = 489351948ad10d54049a76c12763532aa0e16bd56bb246d9810011a902a3c701b0de3cf0dae58d8c06882b457728e7321016e9ee527202b2ef2d5fd1f032b818 diff --git a/wayland.spec b/wayland.spec index d63d2f5..c2c7cb0 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,14 +1,13 @@ Name: wayland -Version: 1.20.0 -Release: 5%{?dist} +Version: 1.21.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT URL: http://wayland.freedesktop.org/ -Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz - -# https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/203 -Patch0: 0001-shm-Close-file-descriptors-not-needed.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: gcc BuildRequires: gcc-c++ @@ -22,6 +21,9 @@ 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 @@ -67,6 +69,7 @@ Summary: Wayland server library Wayland server library %prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' %autosetup -p1 %build @@ -112,6 +115,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Tue Jul 26 2022 Mike Rochefort - 1.21.0-1 +- Update to 1.21.0 + * Sat Jul 23 2022 Fedora Release Engineering - 1.20.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 8622ce5e5aee7bced54cb03db354aaf67b39bda9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:38:33 +0000 Subject: [PATCH 48/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index c2c7cb0..7d93067 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.21.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -115,6 +115,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.21.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Jul 26 2022 Mike Rochefort - 1.21.0-1 - Update to 1.21.0 From 88bd57ff85d0452c400a58b64acde4288dc95dca Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 4 Apr 2023 20:38:42 +0200 Subject: [PATCH 49/64] Update to 1.22.0 --- .gitignore | 2 ++ sources | 4 ++-- wayland.spec | 9 ++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a020ecb..0789546 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,5 @@ /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 diff --git a/sources b/sources index f89e2e3..9d1086b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wayland-1.21.0.tar.xz) = 5575216d30fdf5c63caa6bcad071e15f2a4f3acb12df776806073f65db37a50b5b5b3cc7957c5497636f4ac01893e2eaab26e453ded44b287acde01762f5fdc3 -SHA512 (wayland-1.21.0.tar.xz.sig) = 489351948ad10d54049a76c12763532aa0e16bd56bb246d9810011a902a3c701b0de3cf0dae58d8c06882b457728e7321016e9ee527202b2ef2d5fd1f032b818 +SHA512 (wayland-1.22.0.tar.xz) = fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12 +SHA512 (wayland-1.22.0.tar.xz.sig) = 38c905b2041f06ee707c82e7685c157bb01895847d2fbccc9f3f74dbf998ab667efbf4ea16464436e1028164e8234c318645cacdd9a3bd9a607488e8c5df4983 diff --git a/wayland.spec b/wayland.spec index 7d93067..329997d 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.21.0 -Release: 2%{?dist} +Version: 1.22.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -95,7 +95,7 @@ Wayland server library %{_mandir}/man3/*.3* %files doc -%doc README +%doc README.md %{_datadir}/doc/wayland/ %files -n libwayland-client @@ -115,6 +115,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Tue Apr 04 2023 Kalev Lember - 1.22.0-1 +- Update to 1.22.0 + * Sat Jan 21 2023 Fedora Release Engineering - 1.21.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d7a0b3e5f5bc85d17ebecc8163b480d39af177c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:00:45 +0000 Subject: [PATCH 50/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 329997d..279e09a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.22.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure License: MIT @@ -115,6 +115,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.22.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 04 2023 Kalev Lember - 1.22.0-1 - Update to 1.22.0 From e798a17125382893953b9a3aa657452ad7426c10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 7 Sep 2023 15:49:29 +0200 Subject: [PATCH 51/64] SPDX migration: license is already SPDX compatible --- wayland.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wayland.spec b/wayland.spec index 279e09a..730f728 100644 --- a/wayland.spec +++ b/wayland.spec @@ -3,6 +3,7 @@ Version: 1.22.0 Release: 2%{?dist} Summary: Wayland Compositor Infrastructure +# SPDX License: MIT URL: http://wayland.freedesktop.org/ Source0: https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz @@ -115,6 +116,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Thu Sep 07 2023 José Expósito +- SPDX migration: license is already SPDX compatible + * Sat Jul 22 2023 Fedora Release Engineering - 1.22.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 7df0dff27b774e2086b6df1a6b3b69199b94141c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:27:01 +0000 Subject: [PATCH 52/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 730f728..ac2c1df 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.22.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -116,6 +116,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.22.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Sep 07 2023 José Expósito - SPDX migration: license is already SPDX compatible From 8d2ca228806e7680045e92a8f9bc87202def10ff Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Fri, 28 Jun 2024 14:32:36 +0200 Subject: [PATCH 53/64] Update to 1.23.0 --- .gitignore | 2 ++ sources | 4 ++-- wayland.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0789546..6e0baef 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,5 @@ /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 diff --git a/sources b/sources index 9d1086b..5a7f014 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wayland-1.22.0.tar.xz) = fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12 -SHA512 (wayland-1.22.0.tar.xz.sig) = 38c905b2041f06ee707c82e7685c157bb01895847d2fbccc9f3f74dbf998ab667efbf4ea16464436e1028164e8234c318645cacdd9a3bd9a607488e8c5df4983 +SHA512 (wayland-1.23.0.tar.xz) = 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81 +SHA512 (wayland-1.23.0.tar.xz.sig) = 64dc56593d3e259025ea75438d7e81830dfcc5907919c0479d3e2748da1820e58070d0aed5f5d4e2974c6ce4c8b295cba6d886be15433d614af3b34baa7644c1 diff --git a/wayland.spec b/wayland.spec index ac2c1df..af6028a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.22.0 -Release: 3%{?dist} +Version: 1.23.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -56,6 +56,7 @@ Wayland client library %package -n libwayland-cursor Summary: Wayland cursor library +Requires: libwayland-client%{?_isa} = %{version}-%{release} %description -n libwayland-cursor Wayland cursor library @@ -116,6 +117,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Fri Jun 28 2024 Olivier Fourdan - 1.23.0-1 +- Update to 1.23.0 + * Sat Jan 27 2024 Fedora Release Engineering - 1.22.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d5241dfae403d1d2174575379de8b16479f89178 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:09:50 +0000 Subject: [PATCH 54/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index af6028a..05286fb 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.23.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -117,6 +117,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.23.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Fri Jun 28 2024 Olivier Fourdan - 1.23.0-1 - Update to 1.23.0 From c3f36e955b0871121d33bbb9aa863ca38456229c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:48:09 +0000 Subject: [PATCH 55/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 05286fb..8390303 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.23.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -117,6 +117,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.23.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.23.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 1403f25004fbb6cca3ec36b2cbe0e24b34a0b6ef Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Mon, 14 Apr 2025 15:03:19 +0200 Subject: [PATCH 56/64] Update to 1.23.1 --- .gitignore | 2 ++ sources | 4 ++-- wayland.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6e0baef..bcf641d 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,5 @@ /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 diff --git a/sources b/sources index 5a7f014..68d64f4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wayland-1.23.0.tar.xz) = 9c525231a7ea3e68d3178230d476285a960d23e38571ac96d885f86c0588c52ef01460bff6833db5adb9456ce8db7b996613611187aac972736748ba91b8fd81 -SHA512 (wayland-1.23.0.tar.xz.sig) = 64dc56593d3e259025ea75438d7e81830dfcc5907919c0479d3e2748da1820e58070d0aed5f5d4e2974c6ce4c8b295cba6d886be15433d614af3b34baa7644c1 +SHA512 (wayland-1.23.1.tar.xz) = 818eda003e3f7aa15690eedb1ff227a6056b2ce54bf23d45ffe573dc40a914623c5a1358218b59444dcdc483db0503324f0d27091d0ea954412a8b290de5f50a +SHA512 (wayland-1.23.1.tar.xz.sig) = eb304256ac487f73a2ee14fcec6444b9797c0528730c20a81c255f4163df0a1647ec4b47effb8a6e9ffc389319509ba8d69a053d4f4f0b24ea3271551af6e197 diff --git a/wayland.spec b/wayland.spec index 8390303..1a6f905 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.23.0 -Release: 3%{?dist} +Version: 1.23.1 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -117,6 +117,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Mon Apr 14 2025 Olivier Fourdan - 1.23.1-1 +- Update to 1.23.1 + * Sun Jan 19 2025 Fedora Release Engineering - 1.23.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 56d5271474cbf4e6bddf615af31f4915bf559e51 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:18:44 +0000 Subject: [PATCH 57/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 1a6f905..7e3668e 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.23.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -117,6 +117,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.23.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon Apr 14 2025 Olivier Fourdan - 1.23.1-1 - Update to 1.23.1 From 3106b90b365526a7201703134438f09520d1d052 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 5 Aug 2025 12:16:41 -0400 Subject: [PATCH 58/64] Update to 1.24.0 --- .gitignore | 2 ++ sources | 4 ++-- wayland.spec | 7 +++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index bcf641d..2f1df9b 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,5 @@ /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 diff --git a/sources b/sources index 68d64f4..c8fad35 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wayland-1.23.1.tar.xz) = 818eda003e3f7aa15690eedb1ff227a6056b2ce54bf23d45ffe573dc40a914623c5a1358218b59444dcdc483db0503324f0d27091d0ea954412a8b290de5f50a -SHA512 (wayland-1.23.1.tar.xz.sig) = eb304256ac487f73a2ee14fcec6444b9797c0528730c20a81c255f4163df0a1647ec4b47effb8a6e9ffc389319509ba8d69a053d4f4f0b24ea3271551af6e197 +SHA512 (wayland-1.24.0.tar.xz) = 60216602cffd1473ae15381f9e9a6f3829e742cac83843ca65360ba78bcff8d9442f15eb6a6d5d29c8f74dd920762ca1605f51658d22a1d3c18e338505b9f974 +SHA512 (wayland-1.24.0.tar.xz.sig) = 7a237c1b4b4a5b10c8b1fbe5d4c2ba92452a2a1c9ba1a5c5077d320a30e7026dcf7e1956476d43dcd0465f8a95c812addf33667ebb75da150354f2b4fd8ac1fd diff --git a/wayland.spec b/wayland.spec index 7e3668e..88586b0 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.23.1 -Release: 2%{?dist} +Version: 1.24.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -117,6 +117,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Tue Aug 05 2025 Neal Gompa - 1.24.0-1 +- Update to 1.24.0 + * Fri Jul 25 2025 Fedora Release Engineering - 1.23.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8972bb67c3215bf73f168f53db4473d821bc7d76 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Mon, 13 Oct 2025 11:09:49 +0200 Subject: [PATCH 59/64] Add dependency on libffi for the devel package Resolves: rhbz#2403323 --- wayland.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index 88586b0..a238e9d 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.24.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -38,6 +38,7 @@ Requires: libwayland-client%{?_isa} = %{version}-%{release} Requires: libwayland-cursor%{?_isa} = %{version}-%{release} Requires: libwayland-egl%{?_isa} = %{version}-%{release} Requires: libwayland-server%{?_isa} = %{version}-%{release} +Requires: pkgconfig(libffi) %description devel The %{name}-devel package contains libraries and header files for @@ -117,6 +118,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Mon Oct 13 2025 Olivier Fourdan - 1.24.0-2 +- Add dependency on libffi for the devel package (#2403323) + * Tue Aug 05 2025 Neal Gompa - 1.24.0-1 - Update to 1.24.0 From edd1358dd695cf01bf7741583dc95c514c6b0491 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:08:20 +0000 Subject: [PATCH 60/64] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wayland.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wayland.spec b/wayland.spec index a238e9d..8a109f4 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland Version: 1.24.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -118,6 +118,9 @@ Wayland server library %{_libdir}/libwayland-server.so.0* %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.24.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Oct 13 2025 Olivier Fourdan - 1.24.0-2 - Add dependency on libffi for the devel package (#2403323) From bd520c4a9428d06dc580a81d33a4abe15430d4be Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 7 Jun 2026 15:38:14 -0400 Subject: [PATCH 61/64] Update to 1.25.0 - Modernize spec --- .gitignore | 2 + sources | 4 +- wayland.spec | 111 +++++++++++++++++++++++++++++++-------------------- 3 files changed, 72 insertions(+), 45 deletions(-) diff --git a/.gitignore b/.gitignore index 2f1df9b..371ff61 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ /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 diff --git a/sources b/sources index c8fad35..df5e00c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wayland-1.24.0.tar.xz) = 60216602cffd1473ae15381f9e9a6f3829e742cac83843ca65360ba78bcff8d9442f15eb6a6d5d29c8f74dd920762ca1605f51658d22a1d3c18e338505b9f974 -SHA512 (wayland-1.24.0.tar.xz.sig) = 7a237c1b4b4a5b10c8b1fbe5d4c2ba92452a2a1c9ba1a5c5077d320a30e7026dcf7e1956476d43dcd0465f8a95c812addf33667ebb75da150354f2b4fd8ac1fd +SHA512 (wayland-1.25.0.tar.xz) = 20ae71ecc8b6d61b3e111171260911469cc7c3470048629db28eb4115415124e5a9392e1d9be84adb324cf1a29e557ae8e033e17c51fbab2fc80d9c6b9aad82c +SHA512 (wayland-1.25.0.tar.xz.sig) = 60c44ece374220a04a1780f909f9ddb8075272b83492078770e82ef89eb65e0e512ce7cbe1458bf1ef22b4ef6729084ca1bd03ea590cda0e337c8fcd4de5ff6b diff --git a/wayland.spec b/wayland.spec index 8a109f4..e678f3a 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,6 @@ Name: wayland -Version: 1.24.0 -Release: 3%{?dist} +Version: 1.25.0 +Release: 1%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -32,6 +32,8 @@ 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} @@ -44,47 +46,6 @@ Requires: pkgconfig(libffi) The %{name}-devel package contains libraries and header files for developing applications that use %{name}. -%package doc -Summary: Wayland development documentation -BuildArch: noarch -%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 -Requires: libwayland-client%{?_isa} = %{version}-%{release} -%description -n libwayland-cursor -Wayland cursor library - -%package -n libwayland-egl -Summary: Wayland egl library -%description -n libwayland-egl -Wayland egl library - -%package -n libwayland-server -Summary: Wayland server library -%description -n libwayland-server -Wayland server library - -%prep -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 - -%build -%meson -%meson_build - -%install -%meson_install - -%check -%meson_test - %files devel %{_bindir}/wayland-scanner %{_includedir}/wayland-*.h @@ -97,27 +58,91 @@ Wayland server library %{_datadir}/wayland/wayland.dtd %{_mandir}/man3/*.3* +%dnl ------------------------------------------------------------------------ + +%package doc +Summary: Wayland development documentation +BuildArch: noarch + +%description doc +Wayland development documentation + %files doc %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 + +%build +%meson_build + +%install +%meson_install + +%check +%meson_test + %changelog +* Sun Jun 07 2026 Neal Gompa - 1.25.0-1 +- Update to 1.25.0 +- Modernize spec + * Sat Jan 17 2026 Fedora Release Engineering - 1.24.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From be4e52d0c3eb347abb0e2cb71503fe0fc3fb357a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 7 Jul 2026 12:18:42 -0400 Subject: [PATCH 62/64] Fixup to use with mdbook --- wayland.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wayland.spec b/wayland.spec index e678f3a..9b314ce 100644 --- a/wayland.spec +++ b/wayland.spec @@ -18,6 +18,7 @@ BuildRequires: expat-devel BuildRequires: graphviz BuildRequires: libxml2-devel BuildRequires: libxslt +BuildRequires: mdbook BuildRequires: meson BuildRequires: pkgconfig(libffi) BuildRequires: xmlto @@ -63,6 +64,9 @@ developing applications that use %{name}. %package doc Summary: Wayland development documentation BuildArch: noarch +# Required for mdbook generated docs +Requires: adobe-source-code-pro-fonts +Requires: open-sans-fonts %description doc Wayland development documentation From 7c0e7207fbdf485c14f951ff1125ea73928226f3 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 16 Jul 2026 14:50:22 -0400 Subject: [PATCH 63/64] Update to 1.26.0 --- .gitignore | 2 ++ sources | 4 ++-- wayland.spec | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 371ff61..738b2b8 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,5 @@ /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 diff --git a/sources b/sources index df5e00c..e621965 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (wayland-1.25.0.tar.xz) = 20ae71ecc8b6d61b3e111171260911469cc7c3470048629db28eb4115415124e5a9392e1d9be84adb324cf1a29e557ae8e033e17c51fbab2fc80d9c6b9aad82c -SHA512 (wayland-1.25.0.tar.xz.sig) = 60c44ece374220a04a1780f909f9ddb8075272b83492078770e82ef89eb65e0e512ce7cbe1458bf1ef22b4ef6729084ca1bd03ea590cda0e337c8fcd4de5ff6b +SHA512 (wayland-1.26.0.tar.xz) = 50861b0c40cedec5f31b49ff1e99fc135a299fa4a8e2ff50ff4bac3f42e2f3f7be38271929fd2f6e58d83d5df516f643946ceba7937cc199581487c082c7ec31 +SHA512 (wayland-1.26.0.tar.xz.sig) = 051de7c3c80c8cef9cf713d7346467a2ce10c10ed7a39f49f3567d0ed08f409179c56e10ce8657e9eed8c544eafb2e254e251d147b13e472e60becf46100d56a diff --git a/wayland.spec b/wayland.spec index 9b314ce..0c6b35e 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,5 +1,5 @@ Name: wayland -Version: 1.25.0 +Version: 1.26.0 Release: 1%{?dist} Summary: Wayland Compositor Infrastructure @@ -143,6 +143,9 @@ Wayland server library %meson_test %changelog +* Thu Jul 16 2026 Neal Gompa - 1.26.0-1 +- Update to 1.26.0 + * Sun Jun 07 2026 Neal Gompa - 1.25.0-1 - Update to 1.25.0 - Modernize spec From 74f80e5c3a0f82758e58cb393eb5ff3ae17baf1b Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 17 Jul 2026 12:25:08 -0400 Subject: [PATCH 64/64] Conditionalize book documentation Documentation which requires unwanted dependencies is generally disabled. https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/548 --- ...doc-add-option-to-not-build-the-book.patch | 53 +++++++++++++++++++ wayland.spec | 16 +++++- 2 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 0001-doc-add-option-to-not-build-the-book.patch diff --git a/0001-doc-add-option-to-not-build-the-book.patch b/0001-doc-add-option-to-not-build-the-book.patch new file mode 100644 index 0000000..f0556a5 --- /dev/null +++ b/0001-doc-add-option-to-not-build-the-book.patch @@ -0,0 +1,53 @@ +From f1798e0601aff530f1f9025067ff46d2867a1009 Mon Sep 17 00:00:00 2001 +From: Yaakov Selkowitz +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 +--- + 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 + diff --git a/wayland.spec b/wayland.spec index 0c6b35e..a7e2b78 100644 --- a/wayland.spec +++ b/wayland.spec @@ -1,6 +1,8 @@ +%bcond book %{undefined rhel} + Name: wayland Version: 1.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Wayland Compositor Infrastructure # SPDX @@ -10,6 +12,9 @@ Source0: https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{vers Source1: https://gitlab.freedesktop.org/%{name}/%{name}/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz.sig Source2: emersion-gpg-key.asc +# 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 @@ -18,7 +23,9 @@ BuildRequires: expat-devel BuildRequires: graphviz BuildRequires: libxml2-devel BuildRequires: libxslt +%if %{with book} BuildRequires: mdbook +%endif BuildRequires: meson BuildRequires: pkgconfig(libffi) BuildRequires: xmlto @@ -64,9 +71,11 @@ developing applications that use %{name}. %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 @@ -131,7 +140,7 @@ Wayland server library %autosetup -p1 %conf -%meson +%meson %{!?with_book:-Dbook=false} %build %meson_build @@ -143,6 +152,9 @@ Wayland server library %meson_test %changelog +* Fri Jul 17 2026 Yaakov Selkowitz - 1.26.0-2 +- Conditionalize book documentation + * Thu Jul 16 2026 Neal Gompa - 1.26.0-1 - Update to 1.26.0