From a81e16b0b1c1a669cfd66b5d40dea18ab887c520 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 2 Aug 2017 20:05:23 +0200 Subject: [PATCH] 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)