pool/wayland-protocols
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 929135 from home:yfjiang:branches:GNOME:STABLE:41

Browse Source 
- Add wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch:
  Temporarily disable the unstable xdg-decoration pedantic test on
  ppc64 until the upstream issue is more clearly diagnosed:
  https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48

OBS-URL: https://build.opensuse.org/request/show/929135
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/wayland-protocols?expand=0&rev=53
This commit is contained in:
Bjørn Lie 2021-11-09 15:29:27 +00:00 committed by Git OBS Bridge
parent 44e602fd45
commit 286058becb
3 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch Normal file
View File

@ -0,0 +1,27 @@
Index: wayland-protocols-1.23/tests/meson.build
===================================================================
--- wayland-protocols-1.23.orig/tests/meson.build
+++ wayland-protocols-1.23/tests/meson.build
@@ -6,6 +6,8 @@ libwayland = [
dependency('wayland-server'),
]
+message('Build Machine CPU:' + build_machine.cpu_family())
+
# Check that each protocol passes through the scanner
foreach protocol_file : protocol_files
protocol_path = join_paths(wayland_protocols_srcdir, protocol_file)
@@ -111,7 +113,12 @@ foreach protocol_file : protocol_files
install: false,
native: true,
)
- test(test_name, pedantic_test_executable)
+
+ if test_name == 'test-build-pedantic-unstable_xdg_decoration_xdg_decoration_unstable_v1_xml' and build_machine.cpu_family() == 'ppc64'
+ message('Skip test-build-pedantic-unstable_xdg_decoration_xdg_decoration_unstable_v1_xml on ppc64/ppc64le')
+ else
+ test(test_name, pedantic_test_executable)
+ endif
# Check that the header
if not protocol_file.contains('xdg-foreign-unstable-v1')

9
wayland-protocols.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Nov 4 07:19:04 UTC 2021 - Yifan Jiang <yfjiang@suse.com>
- Add wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch:
Temporarily disable the unstable xdg-decoration pedantic test on
ppc64 until the upstream issue is more clearly diagnosed:
https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
-------------------------------------------------------------------
Wed Oct 13 08:04:58 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

6
wayland-protocols.spec
View File

@ -27,9 +27,11 @@ URL: https://wayland.freedesktop.org/
Source: https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
Source2: https://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz.sig
Source3: %{name}.keyring
# PATCH-FIX-OPENSUSE wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch bsc#1192209 glfd#wayland/wayland-protocols#48 yfjiang@suse.com -- Temporarily disable the unstable xdg-decoration pedantic test on ppc64 until the upstream issue is more clearly diagnosed
Patch0: wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch
BuildRequires: c_compiler
BuildRequires: c++_compiler
BuildRequires: c_compiler
BuildRequires: meson >= 0.54.0
BuildRequires: pkgconfig
BuildRequires: pkgconfig(wayland-scanner)
@ -54,7 +56,7 @@ protocol either in Wayland core, or some other protocol in
wayland-protocols.
%prep
%autosetup
%autosetup -p1
%build
%meson