Skip to content

fix(qt6-qtwayland): relocate Wayland client CMake files to Qt6Gui in %files #18111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
reubeno wants to merge 1 commit into
base: 4.0
Choose a base branch
from
+37 −6
Draft

fix(qt6-qtwayland): relocate Wayland client CMake files to Qt6Gui in %files #18111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion base/comps/components.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4479,7 +4479,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
[components.qt6-qttools]
[components.qt6-qttranslations]
[components.qt6-qtvirtualkeyboard]
[components.qt6-qtwayland]
[components.qt6-qtwebchannel]
[components.qt6-qtwebsockets]
[components.qtwebkit]
Expand Down
31 changes: 31 additions & 0 deletions base/comps/qt6-qtwayland/qt6-qtwayland.comp.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[components.qt6-qtwayland]

# Qt 6.10 moved the Wayland client plugin CMake files from
# cmake/Qt6WaylandClient/ to cmake/Qt6Gui/, but the locked 6.10.2 %files still
# lists the old paths, so packaging fails with "File not found". Mirrors Fedora
# f43 "Fix %files section":
# https://src.fedoraproject.org/rpms/qt6-qtwayland/c/e96dca235e83bc256548884b980c999c26bc5101
[[components.qt6-qtwayland.overlays]]
description = "Relocate the Wayland client plugin CMake glob to its Qt6Gui shell-integration files (Qt 6.10 moved them out of Qt6WaylandClient)"
type = "spec-search-replace"
section = "%files"
package = "devel"
regex = '^%\{_qt6_libdir\}/cmake/Qt6WaylandClient/\*\.cmake$'
replacement = '''%{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandIviShellIntegration*.cmake
%{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandQtShellIntegration*.cmake'''

[[components.qt6-qtwayland.overlays]]
description = "Update the adwaita-decoration %exclude path to Qt6Gui (Qt 6.10 relocation)"
type = "spec-search-replace"
section = "%files"
package = "devel"
regex = '^%exclude %\{_qt6_libdir\}/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecoration\*\.cmake$'
replacement = '%exclude %{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandAdwaitaDecoration*.cmake'

[[components.qt6-qtwayland.overlays]]
description = "Update the adwaita-decoration subpackage CMake path to Qt6Gui (Qt 6.10 relocation)"
type = "spec-search-replace"
section = "%files"
package = "adwaita-decoration"
regex = '^%\{_qt6_libdir\}/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecoration\*\.cmake$'
replacement = '%{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandAdwaitaDecoration*.cmake'
2 changes: 1 addition & 1 deletion locks/qt6-qtwayland.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = 'd812d661be0ab0fb3bf2e9a5616c89614a206ff1'
upstream-commit = 'd812d661be0ab0fb3bf2e9a5616c89614a206ff1'
input-fingerprint = 'sha256:dff887c3c1eef174e32579c1f8d35910455671f65077352e05c50dda3a179399'
input-fingerprint = 'sha256:f0c4441881d8a9f88748ca63ef0314bae1f761a0e20fb436424afce3830d2ff5'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
9 changes: 5 additions & 4 deletions specs/q/qt6-qtwayland/qt6-qtwayland.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
Summary: Qt6 - Wayland platform support and QtCompositor module
Name: qt6-%{qt_module}
Version: 6.10.2
Release: 2%{?dist}
Release: 3%{?dist}

License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Url: http://www.qt.io
Expand Down Expand Up @@ -171,7 +171,8 @@ popd
%{_qt6_libdir}/cmake/Qt6/*.cmake
%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWaylandTestsConfig.cmake
%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake
%{_qt6_libdir}/cmake/Qt6WaylandClient/*.cmake
%{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandIviShellIntegration*.cmake
%{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandQtShellIntegration*.cmake
%{_qt6_libdir}/cmake/Qt6WaylandClientFeaturesPrivate/*.cmake
%{_qt6_libdir}/cmake/Qt6WaylandCompositor/
%{_qt6_libdir}/cmake/Qt6WaylandCompositorIviapplication/
Expand All @@ -187,11 +188,11 @@ popd
%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json
%{_qt6_libdir}/qt6/modules/*.json
%{_qt6_libdir}/pkgconfig/*.pc
%exclude %{_qt6_libdir}/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecoration*.cmake
%exclude %{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandAdwaitaDecoration*.cmake

%files adwaita-decoration
%{_qt6_plugindir}/wayland-decoration-client/libadwaita.so
%{_qt6_libdir}/cmake/Qt6WaylandClient/Qt6QWaylandAdwaitaDecoration*.cmake
%{_qt6_libdir}/cmake/Qt6Gui/Qt6QWaylandAdwaitaDecoration*.cmake

%if 0%{?examples}
%files examples
Expand Down
Loading