The package rpms/wlroots0.12.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/wlroots0.12.git/commit/?id=8efc294eb....
Change: +%ifarch s390x
Thanks.
Full change: ============
commit a4afe56137a83c776305ba0267094ba66001cf0a Author: Aleksei Bavshin alebastr89@gmail.com Date: Mon Apr 19 10:24:53 2021 +0000
Add patch relaxing initial size check of layer surface
diff --git a/Revert-layer-shell-error-on-0-dimension-without-anchors.patch b/Revert-layer-shell-error-on-0-dimension-without-anchors.patch new file mode 100644 index 0000000..6ae134d --- /dev/null +++ b/Revert-layer-shell-error-on-0-dimension-without-anchors.patch @@ -0,0 +1,44 @@ +From 09d8f96a608111529077e70b00875fa0ca4c493d Mon Sep 17 00:00:00 2001 +From: Aleksei Bavshin alebastr89@gmail.com +Date: Mon, 19 Apr 2021 03:08:19 -0700 +Subject: [PATCH] Revert "layer-shell: error on 0 dimension without anchors" + +This reverts commit 8dec751a6d84335fb04288b8efab6dd5c90288d3. +--- + types/wlr_layer_shell_v1.c | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c +index bc681117..d83b22b8 100644 +--- a/types/wlr_layer_shell_v1.c ++++ b/types/wlr_layer_shell_v1.c +@@ -307,26 +307,6 @@ static void layer_surface_role_commit(struct wlr_surface *wlr_surface) { + return; + } + +- const uint32_t horiz = ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT | +- ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT; +- if (surface->client_pending.desired_width == 0 && +- (surface->client_pending.anchor & horiz) != horiz) { +- wl_resource_post_error(surface->resource, +- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE, +- "width 0 requested without setting left and right anchors"); +- return; +- } +- +- const uint32_t vert = ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | +- ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM; +- if (surface->client_pending.desired_height == 0 && +- (surface->client_pending.anchor & vert) != vert) { +- wl_resource_post_error(surface->resource, +- ZWLR_LAYER_SURFACE_V1_ERROR_INVALID_SIZE, +- "height 0 requested without setting top and bottom anchors"); +- return; +- } +- + if (surface->closed) { + // Ignore commits after the compositor has closed it + return; +-- +2.31.1 + diff --git a/wlroots0.12.spec b/wlroots0.12.spec index bf450ed..3ae9125 100644 --- a/wlroots0.12.spec +++ b/wlroots0.12.spec @@ -23,6 +23,11 @@ Source1: %{url}/releases/download/%{version}/%{compat_name}-%{version}.ta # 0FDE7BE0E88F5E48: emersion contact@emersion.fr Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rkjfnghbjxug6b...
+# Revert initial size check of layer surface +# Requested by Mobility SIG to work around phosh compatibility issue +# https://source.puri.sm/Librem5/phosh/-/issues/422 +Patch0: Revert-layer-shell-error-on-0-dimension-without-anchors.patch + BuildRequires: gcc BuildRequires: gnupg2 BuildRequires: meson >= 0.54.0 @@ -107,3 +112,4 @@ MESON_OPTIONS=( %changelog * Mon Apr 12 2021 Aleksei Bavshin alebastr@fedoraproject.org - 0.12.0-1 - Initialize compat wlroots0.12 package +- Add patch relaxing initial size check of layer surface
commit 8efc294ebec0b732930c991dd493aab942e2e083 Author: Aleksei Bavshin alebastr89@gmail.com Date: Mon Apr 19 10:20:27 2021 +0000
Initialize compat wlroots0.12 package from wlroots@b71becc
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d9f0c39 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/wlroots-*.tar.gz +/wlroots-*.tar.gz.sig diff --git a/gpgkey-0FDE7BE0E88F5E48.gpg b/gpgkey-0FDE7BE0E88F5E48.gpg new file mode 100644 index 0000000..c8c4240 Binary files /dev/null and b/gpgkey-0FDE7BE0E88F5E48.gpg differ diff --git a/sources b/sources new file mode 100644 index 0000000..76a4dd1 --- /dev/null +++ b/sources @@ -0,0 +1,2 @@ +SHA512 (wlroots-0.12.0.tar.gz) = 560eae30932b777c1f07fb44592d5601c5d10ef74b31b6b9e4166a14caadab2bfa88d39282f159785d4c7f22f78d204f9bb7fab65d58afaf14b72a8486f9b415 +SHA512 (wlroots-0.12.0.tar.gz.sig) = 04ce4cbb014938b19b8dd1f5923d373db2add78765be15bfb3d8889efeed1a2f1ac93581f75262f0ade754a894e755aef6172e7daf8528ba72a0dda450b3967c diff --git a/wlroots0.12.spec b/wlroots0.12.spec new file mode 100644 index 0000000..bf450ed --- /dev/null +++ b/wlroots0.12.spec @@ -0,0 +1,109 @@ +# Version of the .so library +%global abi_ver 7 +%global compat_ver 0.12 +%global compat_name wlroots + +Name: %{compat_name}%{compat_ver} +Version: %{compat_ver}.0 +Release: 1%{?dist} +Summary: A modular Wayland compositor library + +# Source files/overall project licensed as MIT, but +# - LGPLv2.1+ +# * protocol/idle.xml +# * protocol/server-decoration.xml +# Those files are processed to C-compilable files by the +# `wayland-scanner` binary during build and don't alter +# the main license of the binaries linking with them by +# the underlying licenses. +License: MIT +URL: https://github.com/swaywm/%%7Bcompat_name%7D +Source0: %{url}/releases/download/%{version}/%{compat_name}-%{version}.tar.gz +Source1: %{url}/releases/download/%{version}/%{compat_name}-%{version}.tar.gz.sig +# 0FDE7BE0E88F5E48: emersion contact@emersion.fr +Source2: https://emersion.fr/.well-known/openpgpkey/hu/dj3498u4hyyarh35rkjfnghbjxug6b... + +BuildRequires: gcc +BuildRequires: gnupg2 +BuildRequires: meson >= 0.54.0 +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(gbm) >= 17.1.0 +BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(libdrm) >= 2.4.95 +BuildRequires: pkgconfig(libinput) >= 1.9.0 +BuildRequires: pkgconfig(libsystemd) >= 237 +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(pixman-1) +BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-egl) +BuildRequires: pkgconfig(wayland-protocols) >= 1.17 +BuildRequires: pkgconfig(wayland-scanner) +BuildRequires: pkgconfig(wayland-server) >= 1.18 +BuildRequires: pkgconfig(x11-xcb) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-icccm) +BuildRequires: pkgconfig(xkbcommon) + +%description +%{summary}. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} == %{version}-%{release} +# not required per se, so not picked up automatically by RPM +Recommends: pkgconfig(xcb-icccm) +# Conflicts with other wlroots-devel packages +Conflicts: pkgconfig(wlroots) + +%description devel +Development files for %{name}. + + +%prep +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%autosetup -p1 -n %{compat_name}-%{version} + + +%build +MESON_OPTIONS=( + # Disable options requiring extra/unpackaged dependencies + -Dexamples=false + -Dxcb-errors=disabled + -Dlibseat=disabled + # select systemd logind provider + -Dlogind-provider=systemd + +%ifarch s390x + # Disable -Werror on s390x: https://github.com/swaywm/wlroots/issues/2018 + -Dwerror=false +%endif +) + +%{meson} "${MESON_OPTIONS[@]}" +%{meson_build} + + +%install +%{meson_install} + + +%check +%{meson_test} + + +%files +%license LICENSE +%doc README.md +%{_libdir}/lib%{compat_name}.so.%{abi_ver}* + + +%files devel +%{_includedir}/wlr +%{_libdir}/lib%{compat_name}.so +%{_libdir}/pkgconfig/%{compat_name}.pc + + +%changelog +* Mon Apr 12 2021 Aleksei Bavshin alebastr@fedoraproject.org - 0.12.0-1 +- Initialize compat wlroots0.12 package