Accepting request 1119213 from X11:Wayland
OBS-URL: https://build.opensuse.org/request/show/1119213 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/wayland-protocols?expand=0&rev=35
This commit is contained in:
commit
d43deb1dc2
@ -1,27 +0,0 @@
|
|||||||
diff --git a/tests/meson.build b/tests/meson.build
|
|
||||||
index 5439239..cbb147c 100644
|
|
||||||
--- a/tests/meson.build
|
|
||||||
+++ b/tests/meson.build
|
|
||||||
@@ -7,6 +7,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)
|
|
||||||
@@ -113,7 +115,12 @@ foreach protocol_file : protocol_files
|
|
||||||
'-Werror' ],
|
|
||||||
install: false,
|
|
||||||
)
|
|
||||||
- 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')
|
|
@ -1,3 +1,11 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 19 13:58:01 UTC 2023 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
- Use gcc11 in SLE15 in order to fix a ppc64le test that was
|
||||||
|
failing when built with gcc7 (boo#1216320)
|
||||||
|
- Remove patch that doesn't seem to be needed anymore:
|
||||||
|
* wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jul 3 10:17:43 UTC 2023 - llyyr <llyyr.public@gmail.com>
|
Mon Jul 3 10:17:43 UTC 2023 - llyyr <llyyr.public@gmail.com>
|
||||||
|
|
||||||
|
@ -27,10 +27,13 @@ URL: https://wayland.freedesktop.org
|
|||||||
Source: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
|
Source: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz
|
||||||
Source2: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz.sig
|
Source2: https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/%{version}/downloads/%{name}-%{version}.tar.xz.sig
|
||||||
Source3: %{name}.keyring
|
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
|
%if 0%{?suse_version} > 1500
|
||||||
Patch0: wayland-protocols-disable-pedantic-test-unstable-xdg-decoration-on-ppc64.patch
|
|
||||||
BuildRequires: c++_compiler
|
BuildRequires: c++_compiler
|
||||||
BuildRequires: c_compiler
|
BuildRequires: c_compiler
|
||||||
|
%else
|
||||||
|
BuildRequires: gcc11
|
||||||
|
BuildRequires: gcc11-c++
|
||||||
|
%endif
|
||||||
BuildRequires: meson >= 0.55.0
|
BuildRequires: meson >= 0.55.0
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python3-base
|
BuildRequires: python3-base
|
||||||
@ -59,10 +62,18 @@ wayland-protocols.
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
%if 0%{?suse_version} <= 1500
|
||||||
|
export CC=gcc-11
|
||||||
|
export CXX=gcc-11
|
||||||
|
%endif
|
||||||
%meson
|
%meson
|
||||||
%meson_build
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
%if 0%{?suse_version} <= 1500
|
||||||
|
export CC=gcc-11
|
||||||
|
export CXX=gcc-11
|
||||||
|
%endif
|
||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
Loading…
Reference in New Issue
Block a user