fix build with glibc 2.41
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kwayland?expand=0&rev=295
This commit is contained in:
Christophe Marin
Git OBS Bridge
commit
5d546e7a6d
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
29
frameworks.keyring
Normal file
29
frameworks.keyring
Normal file
@ -0,0 +1,29 @@
|
||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
||||
|
||||
mQENBFfNUR8BCADDjPXScwObp7mWwUnrjqrM0gGg+pId6vqe0a5A4xr+Rgj26quK
|
||||
2qJLym0mmul/uh2M8z486qDTQYQaTEppFCosH3WqFonTN2LWpHcujeVABXkAe9qo
|
||||
DHBZZRMw8CXtiEwvJ/xV/MXTR7G0QCqT4HF045SAyyBjusBiiGly32JEDD4FdjHj
|
||||
KKUrAJyyoc6frake7ZMO0SO3tQNwmi4T5KLSoxhi3Zgez2k9GPZEj4/W7l5Ne0zQ
|
||||
7C8Tgo8wraqj/8pzjfP6+Dc2LHOTtu8DGDQkXEFa9VvuAotOtI8Kjff+bOd36WTL
|
||||
L2dk69Bb7WbhRLkkavHZCdKOpfyBtVn+hGWRABEBAAG0G0RhdmlkIEZhdXJlIDxm
|
||||
YXVyZUBrZGUub3JnPokBPQQTAQgAJwUCV81RHwIbAwUJCWYBgAULCQgHAgYVCAkK
|
||||
CwIEFgIDAQIeAQIXgAAKCRBY0O5kikizu/01B/46hG+MaTFW1CVevZrGyPacmDRj
|
||||
pQhx/ODadBkVXXaJyr7aNKT3EvAedyT82SGT/ch+aqXjZK1kEwK6zITqoOZZUt2I
|
||||
CjBN4+UfLrWwlKldZShbhJ6NMHJIeYQ5EDlMw7TWVn0OPkRuDvLEasgOhxR9ZjWW
|
||||
c5wlcZXXy8N+wGSR0bThzl0pdFcIy9Z3g411ZOvjUdDuWqtKUH9iy1VdVyba7FXI
|
||||
x/BqAXIVsAaIFNsJBZZ7C7j1a1IlTykRLiDjh3mpyBfX4xfMTo4z6pjfQsoPebJl
|
||||
TlCnwAkIxeyatGXm4OCqEA9zPVd1Ju7+XuEr6+15ENYJ4oYsZjfyScHHJdWMuQEN
|
||||
BFfNUR8BCADe5wRc/QFL92npVAgzPQ9mJKopscRcxs0f2DM7EBPzUFvWGRIGRdB8
|
||||
obXfzBp4Pfyzqky7C1X/j7ENzx+Kol1AJ93wjUEfLoZ/zsvoj9ZT3GdjeVQeReKY
|
||||
d4th7Jqo4qxvi33Pud0jZsENezzgdd4npiNN9bFX0mjNKNHL9o1n5nTm9pfDI/AS
|
||||
PZz2RoRO7oUJb+aX6hKxTBaKoAiZHybAXQVchtwJx0O4wLbZ3E4ytJdcATlPDNXS
|
||||
jw2Lmns8aGa6DBGyqiG6g1PlCnOI2Q/cQK1zbkSisfoCbpEq1MgIzuZSoJ00NIEp
|
||||
eiACoR82565G68yAb+uKHkcFrYkfDT41ABEBAAGJASUEGAEIAA8FAlfNUR8CGwwF
|
||||
CQlmAYAACgkQWNDuZIpIs7vWkgf9GNUZmD0UgbQmj0nwkEHum1g7LD+MZL0+P2kg
|
||||
HyEL3Cm01ot9d+X5ed/gAJ6hDR55KYxHi+/wwwkCNDLoQoP+7VZq2fMiGD0/bDar
|
||||
oWQqbckqDZU4l69u9NbYvVWHUerfwKfi0ZKN5sJqLwIkr57wEX0I/TBGoMuFB27q
|
||||
2qyloS5m1Q2pke2mmZjKSqE0jxZJ7iFGJO/Buyjgd1B2kr0DaGaCrh0wjfVjAWpt
|
||||
klK95Phry1jQc7W0Z4ZdWpB79S1yW670eutSC4fMjvsNxROGkPx4dDkyG5nToeau
|
||||
zhEh/pXho2Eo/aFEqqY42GMSlN9rf7ekaTNo7OxsE7vvCB0fug==
|
||||
=4o3u
|
||||
-----END PGP PUBLIC KEY BLOCK-----
|
||||
36
kwayland-5.116.0-no-server.patch
Normal file
36
kwayland-5.116.0-no-server.patch
Normal file
@ -0,0 +1,36 @@
|
||||
From fa0425714656919449a53e41c80ac9ad06d89193 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Sat, 1 Feb 2025 19:23:24 +0100
|
||||
Subject: Only require Wayland Server component if needed
|
||||
|
||||
It is only required if building the server API, meaning
|
||||
EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.74.0
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a177d29..6a71381 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -51,10 +51,11 @@ if (QT_MAJOR_VERSION STREQUAL "5")
|
||||
pkg_check_modules(XKBCommon REQUIRED IMPORTED_TARGET xkbcommon)
|
||||
endif()
|
||||
|
||||
-find_package(Wayland 1.15 COMPONENTS Client Server)
|
||||
-set_package_properties(Wayland PROPERTIES
|
||||
- TYPE REQUIRED
|
||||
- )
|
||||
+find_package(Wayland 1.15 REQUIRED COMPONENTS Client)
|
||||
+
|
||||
+if(EXCLUDE_DEPRECATED_BEFORE_AND_AT VERSION_LESS 5.74.0)
|
||||
+ find_package(Wayland 1.15 REQUIRED COMPONENTS Server)
|
||||
+endif()
|
||||
|
||||
find_package(WaylandScanner)
|
||||
|
||||
--
|
||||
2.48.1
|
||||
|
||||
3
kwayland-5.116.0.tar.xz
Normal file
3
kwayland-5.116.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:88b5970c2d6f6d5f46e6ffac66233bf23f2fcf016dea39fffbd9f47b1fc0aed8
|
||||
size 337540
|
||||
11
kwayland-5.116.0.tar.xz.sig
Normal file
11
kwayland-5.116.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmY2RPsACgkQWNDuZIpI
|
||||
s7ussgf/ZN9xCpPZkqKrZM+rhplwKkwf2ZtG5mbcypvM96O0kvHpUV8w//TSkcoG
|
||||
TjEozUlKim+vgtTVrSpNjnxk8fQiTE+yEJ7fnadOTyFtg5ZCHhCOx7YY1kAs03Vy
|
||||
1djNBTJsZYmQyskpdTB3acvzsmrqs55gtvYNWGn+rZ6qAH+7dcQ7Y/3lLC+Q2eaL
|
||||
wn3hijpvgy7GdNOuZUgn+08eW3+6l/kf93MUE2cC1Pd4Hl0eyEhzHFnElKpXcheK
|
||||
O5LgXTxXWbyzmX2zctA3LppkVG1CtEtnYRqIXGF5TUkPxNEgybPhEr6KFJZk9YOS
|
||||
F5HTm6tH+XB8TQP5tnAueCPKi4xtVg==
|
||||
=TX/e
|
||||
-----END PGP SIGNATURE-----
|
||||
1566
kwayland.changes
Normal file
1566
kwayland.changes
Normal file
File diff suppressed because it is too large
Load Diff
94
kwayland.spec
Normal file
94
kwayland.spec
Normal file
@ -0,0 +1,94 @@
|
||||
#
|
||||
# spec file for package kwayland
|
||||
#
|
||||
# Copyright (c) 2021 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
# Full KF5 version (e.g. 5.33.0)
|
||||
%{!?_kf5_version: %global _kf5_version %{version}}
|
||||
# Last major and minor KF5 version (e.g. 5.33)
|
||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
%define qt5_version 5.15.2
|
||||
%bcond_without released
|
||||
Name: kwayland
|
||||
Version: 5.116.0
|
||||
Release: 0
|
||||
Summary: KDE Wayland library
|
||||
License: LGPL-2.1-or-later
|
||||
URL: https://www.kde.org
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
%if %{with released}
|
||||
Source1: %{name}-%{version}.tar.xz.sig
|
||||
Source2: frameworks.keyring
|
||||
%endif
|
||||
# PATCH-FIX-OPENSUSE
|
||||
Patch0: kwayland-5.116.0-no-server.patch
|
||||
BuildRequires: extra-cmake-modules >= %{_kf5_version}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: libQt5Gui-private-headers-devel >= %{qt5_version}
|
||||
BuildRequires: libqt5-qtwayland-private-headers-devel >= %{qt5_version}
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: cmake(PlasmaWaylandProtocols) >= 1.2.1
|
||||
BuildRequires: cmake(Qt5Concurrent) >= %{qt5_version}
|
||||
BuildRequires: cmake(Qt5Gui) >= %{qt5_version}
|
||||
BuildRequires: cmake(Qt5Test) >= %{qt5_version}
|
||||
BuildRequires: cmake(Qt5WaylandClient) >= %{qt5_version}
|
||||
BuildRequires: pkgconfig(egl)
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.15.0
|
||||
BuildRequires: pkgconfig(wayland-protocols)
|
||||
%requires_eq libQt5Gui5
|
||||
Provides: libKF5WaylandClient5 = %{version}
|
||||
Obsoletes: libKF5WaylandClient5 <= %{version}
|
||||
Provides: libKF5WaylandServer5 = %{version}
|
||||
Obsoletes: libKF5WaylandServer5 <= %{version}
|
||||
|
||||
%description
|
||||
KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.
|
||||
|
||||
%package devel
|
||||
Summary: KDE Wayland library: Build Environment
|
||||
Requires: %{name} = %{version}
|
||||
Requires: cmake(Qt5Gui) >= %{qt5_version}
|
||||
|
||||
%description devel
|
||||
KWayland provides a Qt-style Client and Server library wrapper for the Wayland libraries.
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DEXCLUDE_DEPRECATED_BEFORE_AND_AT:STRING=5.74.0
|
||||
|
||||
%cmake_build
|
||||
|
||||
%install
|
||||
%kf5_makeinstall -C build
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%files
|
||||
%license LICENSES/*
|
||||
%{_kf5_debugdir}/*.categories
|
||||
%{_kf5_debugdir}/*.renamecategories
|
||||
%{_kf5_libdir}/libKF5WaylandClient.so.*
|
||||
|
||||
%files devel
|
||||
%{_kf5_includedir}/
|
||||
%{_kf5_libdir}/cmake/KF5Wayland/
|
||||
%{_kf5_libdir}/libKF5WaylandClient.so
|
||||
%{_kf5_libdir}/pkgconfig/KF5WaylandClient.pc
|
||||
%{_kf5_mkspecsdir}/qt_KWaylandClient.pri
|
||||
|
||||
%changelog
|
||||
Loading…
x
Reference in New Issue
Block a user