diff --git a/qt6-qtwayland.spec b/qt6-qtwayland.spec index 97fd6ec..dbd5ea8 100644 --- a/qt6-qtwayland.spec +++ b/qt6-qtwayland.spec @@ -7,13 +7,19 @@ Summary: Qt6 - Wayland platform support and QtCompositor module Name: qt6-%{qt_module} -Version: 6.5.1 +Version: 6.5.2 Release: 1 License: LGPLv3 Url: http://www.qt.io Source0: https://download.qt.io/official_releases/qt/%{short_version}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz +# Upstream patches + +# Upstreamable patches + +Patch0: qtwayland-use-adwaita-decorations-by-default.patch + # filter qml provides %global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ @@ -127,7 +133,7 @@ popd %{_qt6_libdir}/libQt6WaylandEglCompositorHwIntegration.prl %{_qt6_libdir}/libQt6WlShellIntegration.prl %{_qt6_libdir}/cmake/Qt6WaylandCompositor/Qt6WaylandCompositorConfig*.cmake -%{_qt6_mkspecsdir}/modules/*.pri +%{_qt6_archdatadir}/mkspecs/modules/*.pri %{_qt6_libdir}/cmake/Qt6/*.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWaylandTestsConfig.cmake %{_qt6_libdir}/cmake/Qt6Gui/*.cmake @@ -146,8 +152,8 @@ popd %{_qt6_libdir}/cmake/Qt6WlShellIntegrationPrivate/ %dir %{_qt6_libdir}/cmake/Qt6WaylandGlobalPrivate/ %{_qt6_libdir}/cmake/Qt6WaylandGlobalPrivate/ -%{_qt6_archdatadir}/metatypes/qt6*_metatypes.json -%{_qt6_archdatadir}/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json %{_qt6_libdir}/pkgconfig/*.pc @@ -157,6 +163,9 @@ popd %endif %changelog +* Thu Nov 30 2023 peijiankang - 6.5.2-1 +- update version to 6.5.2 + * Thu Jul 27 2023 EastDong - 6.5.1-1 - update package @@ -164,4 +173,4 @@ popd - update package * Wed Nov 30 2022 Jingwiw - 6.4.0 -- init package \ No newline at end of file +- init package diff --git a/qtwayland-everywhere-src-6.5.1.tar.xz b/qtwayland-everywhere-src-6.5.1.tar.xz deleted file mode 100644 index f7cbe33..0000000 Binary files a/qtwayland-everywhere-src-6.5.1.tar.xz and /dev/null differ diff --git a/qtwayland-everywhere-src-6.5.2.tar.xz b/qtwayland-everywhere-src-6.5.2.tar.xz new file mode 100644 index 0000000..db30bc1 Binary files /dev/null and b/qtwayland-everywhere-src-6.5.2.tar.xz differ diff --git a/qtwayland-use-adwaita-decorations-by-default.patch b/qtwayland-use-adwaita-decorations-by-default.patch new file mode 100644 index 0000000..3fab6f2 --- /dev/null +++ b/qtwayland-use-adwaita-decorations-by-default.patch @@ -0,0 +1,14 @@ +diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp +index 06a1aec..bb387f1 100644 +--- a/src/client/qwaylandintegration.cpp ++++ b/src/client/qwaylandintegration.cpp +@@ -87,6 +87,9 @@ QWaylandIntegration::QWaylandIntegration() + QWaylandWindow::fixedToplevelPositions = + !qEnvironmentVariableIsSet("QT_WAYLAND_DISABLE_FIXED_POSITIONS"); + ++ if (!qEnvironmentVariableIsSet("QT_WAYLAND_DECORATION")) ++ qputenv("QT_WAYLAND_DECORATION", "adwaita"); ++ + sInstance = this; + } +