!7 update to upstream version 5.24.0

From: @pei-jiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-03-08 08:19:35 +00:00 committed by Gitee
commit cd46a4fb44
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 180 additions and 44 deletions

Binary file not shown.

BIN
kwin-5.24.0.tar.xz Normal file

Binary file not shown.

222
kwin.spec
View File

@ -1,15 +1,13 @@
# uncomment to enable bootstrap mode
#global bootstrap 1
%if !0%{?bootstrap}
# avoid slow arm arch for now
%ifnarch %{arm}
%global tests 1
%endif
%endif
Name: kwin
Version: 5.15.4
Version: 5.24.0
Release: 1
Summary: KDE Window manager
@ -27,16 +25,106 @@ URL: https://userbase.kde.org/KWin
%global stable stable
%endif
Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{name}-%{version}.tar.xz
# Base
BuildRequires: extra-cmake-modules kf5-rpm-macros qt5-qtbase-devel qt5-qtbase-static qt5-qtbase-private-devel qt5-qtsensors-devel qt5-qtscript-devel qt5-qttools-devel qt5-qttools-static qt5-qtx11extras-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel libxkbcommon-devel libX11-devel libXi-devel libxcb-devel libICE-devel libSM-devel libXcursor-devel xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-cursor-devel libepoxy-devel libcap-devel kf5-kwayland-devel wayland-devel libxkbcommon-devel >= 0.4 pkgconfig(libinput) >= 0.10 pkgconfig(libudev) kf5-kcompletion-devel kf5-kconfig-devel kf5-kconfigwidgets-devel kf5-kcoreaddons-devel kf5-kcrash-devel kf5-kglobalaccel-devel kf5-ki18n-devel kf5-kinit-devel >= 5.10.0-3 kf5-kio-devel kf5-knotifications-devel kf5-kservice-devel kf5-plasma-devel kf5-kwidgetsaddons-devel kf5-kwindowsystem-devel kf5-kdoctools-devel kf5-kcmutils-devel kf5-knewstuff-devel kf5-kactivities-devel kf5-kdoctools-devel kf5-kdeclarative-devel kf5-kiconthemes-devel kf5-kidletime-devel kf5-ktextwidgets-devel kdecoration-devel >= %{majmin_ver} kscreenlocker-devel >= %{majmin_ver} plasma-breeze-devel >= %{majmin_ver}
BuildRequires: extra-cmake-modules
BuildRequires: kf5-rpm-macros
BuildRequires: systemd
# Qt
BuildRequires: qt5-qtbase-devel
BuildRequires: qt5-qtbase-static
# KWinQpaPlugin (and others?)
BuildRequires: qt5-qtbase-private-devel
BuildRequires: qt5-qtsensors-devel
BuildRequires: qt5-qtscript-devel
BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qttools-static
BuildRequires: qt5-qtx11extras-devel
BuildRequires: qt5-qtwayland-devel
# X11/OpenGL
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libEGL-devel
BuildRequires: mesa-libgbm-devel
BuildRequires: libxkbcommon-devel
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libxcb-devel
BuildRequires: libICE-devel
BuildRequires: libSM-devel
BuildRequires: libXcursor-devel
BuildRequires: xcb-util-wm-devel
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-keysyms-devel
BuildRequires: xcb-util-cursor-devel
BuildRequires: xcb-util-devel
BuildRequires: libepoxy-devel
BuildRequires: libcap-devel
BuildRequires: lcms2-devel
BuildRequires: glib2-devel
BuildRequires: pipewire-devel
# Wayland
BuildRequires: kf5-kwayland-devel
BuildRequires: wayland-devel
BuildRequires: wayland-protocols-devel
BuildRequires: libxkbcommon-devel >= 0.4
BuildRequires: pkgconfig(libinput) >= 0.10
BuildRequires: pkgconfig(libudev)
# KF5
BuildRequires: kf5-kcompletion-devel
BuildRequires: kf5-kconfig-devel
BuildRequires: kf5-kconfigwidgets-devel
BuildRequires: kf5-kcoreaddons-devel
BuildRequires: kf5-kcrash-devel
BuildRequires: kf5-kdbusaddons-devel
BuildRequires: kf5-kglobalaccel-devel
BuildRequires: kf5-ki18n-devel
BuildRequires: kf5-kinit-devel >= 5.10.0-3
BuildRequires: kf5-kio-devel
BuildRequires: kf5-knotifications-devel
BuildRequires: kf5-kservice-devel
BuildRequires: kf5-plasma-devel
BuildRequires: kf5-kwidgetsaddons-devel
BuildRequires: kf5-kwindowsystem-devel
BuildRequires: kf5-kdoctools-devel
BuildRequires: kf5-kcmutils-devel
BuildRequires: kf5-knewstuff-devel
BuildRequires: kf5-kactivities-devel
BuildRequires: kf5-kdoctools-devel
BuildRequires: kf5-kdeclarative-devel
BuildRequires: kf5-kiconthemes-devel
BuildRequires: kf5-kidletime-devel
BuildRequires: kf5-ktextwidgets-devel
BuildRequires: kf5-kirigami2-devel
BuildRequires: kf5-krunner-devel
BuildRequires: kdecoration-devel >= %{majmin_ver}
BuildRequires: kscreenlocker-devel >= %{majmin_ver}
BuildRequires: plasma-breeze-devel >= %{majmin_ver}
BuildRequires: plasma-wayland-protocols-devel
BuildRequires: kwayland-server-devel >= %{majmin_ver}
%if 0%{?tests}
BuildRequires: dbus-x11 openbox xorg-x11-server-Xvfb
BuildRequires: dbus-x11
BuildRequires: openbox
BuildRequires: xorg-x11-server-Xvfb
%endif
## Runtime deps
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: kdecoration%{?_isa} >= %{majmin_ver}
Requires: kscreenlocker%{?_isa} >= %{majmin_ver}
# Runtime-only dependencies
%if ! 0%{?bootstrap}
BuildRequires: qt5-qtmultimedia-devel qt5-qtvirtualkeyboard
BuildRequires: qt5-qtmultimedia-devel
BuildRequires: qt5-qtvirtualkeyboard
%endif
Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{name}-common%{?_isa} = %{version}-%{release} kdecoration%{?_isa} >= %{majmin_ver} kscreenlocker%{?_isa} >= %{majmin_ver} qt5-qtmultimedia%{?_isa}
Requires: qt5-qtmultimedia%{?_isa}
Recommends: qt5-qtvirtualkeyboard%{?_isa}
# libkdeinit5_kwin*
%{?kf5_kinit_requires}
@ -48,32 +136,60 @@ Obsoletes: kwin-gles < 5
Obsoletes: kwin-gles-libs < 5
# http://bugzilla.redhat.com/605675
Provides: firstboot(windowmanager) = kwin_x11
# and kwin too (#1197135), until initial-setup fixed
# until initial-setup is fixed... (#1197135)
Provides: firstboot(windowmanager) = kwin
Recommends: %{name}-wayland = %{version}-%{release}
Requires: %{name}-x11 = %{version}-%{release}
%description
%{summary}.
%package wayland
Summary: KDE Window Manager with experimental Wayland support
Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{name}-common%{?_isa} = %{version}-%{release} kwayland-integration%{?_isa} >= %{majmin_ver} xorg-x11-server-Xwayland
Summary: KDE Window Manager with Wayland support
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: kwayland-integration%{?_isa} >= %{majmin_ver}
Requires: kwayland-server%{?_isa} >= %{majmin_ver}
%if ! 0%{?bootstrap}
BuildRequires: xorg-x11-server-Xwayland
%endif
Requires: xorg-x11-server-Xwayland
# http://bugzilla.redhat.com/605675
Provides: firstboot(windowmanager) = kwin_wayland
# KWinQpaPlugin (and others?)
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
# libkdeinit5_kwin*
%{?kf5_kinit_requires}
# Obsolete kwin-wayland-nvidia package as this is now done automatically
# by kwin-wayland
Obsoletes: %{name}-wayland-nvidia < 5.20.2-2
Provides: %{name}-wayland-nvidia = %{version}-%{release}
%description wayland
%{summary}.
%package x11
Summary: KDE Window Manager with X11 support
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-common%{?_isa} = %{version}-%{release}
%if ! 0%{?bootstrap}
BuildRequires: xorg-x11-server-Xorg
%endif
Requires: xorg-x11-server-Xorg
# http://bugzilla.redhat.com/605675
Provides: firstboot(windowmanager) = kwin_x11
# KWinX11Platform (and others?)
%{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
# libkdeinit5_kwin*
%{?kf5_kinit_requires}
%description x11
%{summary}.
%package common
Summary: Common files for KWin X11 and KWin Wayland
Requires: %{name}-libs%{?_isa} = %{version}-%{release} kf5-kwayland%{?_isa}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: kf5-kwayland%{?_isa} >= %{_kf5_version}
# Split of X11 variant into subpackage
Obsoletes: %{name}-common < 5.19.5-3
%description common
%{summary}.
@ -81,30 +197,31 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} kf5-kwayland%
Summary: KWin runtime libraries
# Before kwin-libs was split out from kde-workspace into a subpackage
Conflicts: kde-workspace-libs%{?_isa} < 4.11.14-2
%description libs
%{summary}.
%package devel
Summary: Development files for %{name}
Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{name}-common%{?_isa} = %{version}-%{release} kf5-kconfig-devel kf5-kservice-devel kf5-kwindowsystem-devel
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-common%{?_isa} = %{version}-%{release}
Requires: kf5-kconfig-devel
Requires: kf5-kservice-devel
Requires: kf5-kwindowsystem-devel
Conflicts: kde-workspace-devel < 5.0.0-1
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
%package help
%package doc
Summary: User manual for %{name}
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description help
%description doc
%{summary}.
%prep
%autosetup -n %{name}-%{version} -p1
%autosetup -p1
sed -i \
-e 's|^find_package(Breeze ${PROJECT_VERSION} CONFIG)|find_package(Breeze 5.9 CONFIG)|' \
@ -143,74 +260,93 @@ make test ARGS="--output-on-failure --timeout 10" -C %{_target_platform} ||:
%files
%{_bindir}/kwin
%{_bindir}/kwin_x11
%{_kf5_libdir}/libkdeinit5_kwin_x11.so
%files common -f kwin5.lang
%{_kf5_libdir}/libkdeinit5_kwin_rules_dialog.so
%{_datadir}/kwin
%{_kf5_qtplugindir}/*.so
%{_kf5_qtplugindir}/kwin/
%{_kf5_qtplugindir}/kcms/
%{_kf5_qtplugindir}/kpackage/packagestructure/
%{_kf5_qtplugindir}/org.kde.kdecoration2/*.so
%{_kf5_qtplugindir}/org.kde.kwin.platforms/
%{_kf5_qtplugindir}/kpackage/packagestructure/kwin_packagestructure*.so
%{_kf5_qtplugindir}/org.kde.kwin.scenes/*.so
%dir %{_kf5_qtplugindir}/org.kde.kwin.platforms
%{_qt5_qmldir}/org/kde/kwin
%{_kf5_libdir}/kconf_update_bin/kwin5_update_default_rules
%{_libexecdir}/kwin_killer_helper
%{_libexecdir}/kwin_rules_dialog
%{_libexecdir}/org_kde_kwin_xclipboard_syncer
%{_datadir}/kwincompositing
%{_libexecdir}/kwin-applywindowdecoration
%{_datadir}/kconf_update/kwin.upd
%{_datadir}/kconf_update/kwin-5.16-auto-bordersize.sh
%{_datadir}/kconf_update/kwin-5.18-move-animspeed.py
%{_datadir}/kconf_update/kwin-5.21-desktop-grid-click-behavior.py
%{_datadir}/kconf_update/kwin-5.21-no-swap-encourage.py
%{_datadir}/kconf_update/kwin-5.23-disable-translucency-effect.sh
%{_datadir}/kconf_update/kwin-5.23-remove-cover-switch.py
%{_datadir}/kconf_update/kwin-5.23-remove-cubeslide.py
%{_datadir}/kconf_update/kwin-5.23-remove-flip-switch.py
%{_datadir}/kconf_update/kwin-5.23-remove-xrender-backend.py
%{_datadir}/kconf_update/kwinrules-5.23-virtual-desktop-ids.py
%{_kf5_datadir}/kservices5/*.desktop
%{_kf5_datadir}/kservices5/kwin
%{_kf5_datadir}/kservicetypes5/*.desktop
%{_kf5_datadir}/kpackage/kcms/kcm_kwin_virtualdesktops/*
%{_kf5_datadir}/kpackage/kcms/kcm_*
%{_kf5_datadir}/knotifications5/kwin.notifyrc
%{_kf5_datadir}/config.kcfg/kwin.kcfg
%{_kf5_datadir}/config.kcfg/kwindecorationsettings.kcfg
%{_kf5_datadir}/config.kcfg/virtualdesktopssettings.kcfg
%{_kf5_datadir}/config.kcfg/kwin_colorcorrect.kcfg
%{_kf5_datadir}/kconf_update/kwinrules-5.19-placement.pl
%{_kf5_datadir}/kconf_update/kwinrules.upd
%{_datadir}/icons/hicolor/*/apps/kwin.*
# note: these are for reference (to express config defaults), they are
# not config files themselves (so don't use %%config tag)
%{_sysconfdir}/xdg/*.knsrc
%{_datadir}/knsrcfiles/*.knsrc
%{_datadir}/krunner/dbusplugins/kwin-runner-windows.desktop
%{_datadir}/applications/org.kde.kwin_rules_dialog.desktop
%files wayland
%{_bindir}/kwin_wayland_wrapper
%{_kf5_bindir}/kwin_wayland
%{_kf5_qtplugindir}/platforms/KWinQpaPlugin.so
%{_kf5_qtplugindir}/org.kde.kglobalaccel5.platforms/KF5GlobalAccelPrivateKWin.so
%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandDrmBackend.so
%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandFbdevBackend.so
%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandWaylandBackend.so
%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandX11Backend.so
%{_kf5_qtplugindir}/org.kde.kwin.waylandbackends/KWinWaylandVirtualBackend.so
%{_kf5_plugindir}/org.kde.kidletime.platforms/KF5IdleTimeKWinWaylandPrivatePlugin.so
%{_userunitdir}/plasma-kwin_wayland.service
%files x11
%{_kf5_bindir}/kwin_x11
%{_kf5_qtplugindir}/org.kde.kwin.platforms/KWinX11Platform.so
%{_userunitdir}/plasma-kwin_x11.service
%ldconfig_scriptlets libs
%files libs
%{_sysconfdir}/xdg/org_kde_kwin.categories
%{_kf5_datadir}/qlogging-categories5/org_kde_kwin.categories
%{_libdir}/libkwin.so.*
%{_libdir}/libkwinxrenderutils.so.*
%{_libdir}/libkwineffects.so.*
%{_libdir}/libkwinglutils.so.*
%{_libdir}/libkwin4_effect_builtins.so.*
%{_libdir}/libkcmkwincommon.so.*
%{_qt5_plugindir}/kcms/kcm_kwin_virtualdesktops.so
%files devel
%{_datadir}/dbus-1/interfaces/*.xml
%{_libdir}/cmake/KWinDBusInterface
%{_libdir}/cmake/KWinEffects
%{_libdir}/libkwinxrenderutils.so
%{_libdir}/libkwineffects.so
%{_libdir}/libkwinglutils.so
%{_libdir}/libkwin4_effect_builtins.so
%{_includedir}/kwin*.h
%files help -f %{name}-doc.lang
%license COPYING*
%files doc -f %{name}-doc.lang
%license LICENSES/*.txt
%changelog
* Mon Feb 14 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.24.0-1
- update to upstream version 5.24.0
* Fri Feb 11 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.23.3-1
- update to upstream version 5.23.3
* Fri Aug 7 2020 weidong <weidong@uniontech.com> - 5.15.4-1
- Initial release for OpenEuler

View File

@ -1,4 +1,4 @@
version_control: github
src_repo: KDE/kwin
tag_prefix: "^v"
seperator: "."
separator: "."