diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 2aa2c195208580f5b70bc3b64cf1c26e514ede55..77e08589f8c36ff5604c90faf359531fa6c46f0d 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -27,7 +27,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components Version: 6.5.2 -Release: 4 +Release: 5 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -156,8 +156,7 @@ BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libpcre2-16) >= 10.20 %global pcre 1 BuildRequires: pkgconfig(xcb-xkb) -BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) -#BuildRequires: xcb-util-cursor-devel +BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) pkgconfig(xcb-cursor) BuildRequires: pkgconfig(zlib) BuildRequires: perl BuildRequires: perl-generators @@ -359,10 +358,10 @@ export MAKEFLAGS="%{?_smp_mflags}" # FIXME # -DQT_FEATURE_directfb=ON \ -cmake --build . %{?_smp_mflags} --verbose +%cmake_build %install -DESTDIR="%{buildroot}" cmake --install . +%cmake_install install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt6_datadir}/qtlogging.ini @@ -471,8 +470,6 @@ time \ make check -k ||: %endif -%ldconfig_scriptlets - %files %license LICENSES/GPL* %license LICENSES/LGPL* @@ -635,6 +632,8 @@ make check -k ||: %{_qt6_libdir}/libQt6Test.so %{_qt6_libdir}/libQt6Widgets.prl %{_qt6_libdir}/libQt6Widgets.so +%{_qt6_libdir}/libQt6XcbQpa.prl +%{_qt6_libdir}/libQt6XcbQpa.so %{_qt6_libdir}/libQt6Xml.prl %{_qt6_libdir}/libQt6Xml.so %{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl @@ -691,6 +690,7 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6Test/*.cmake %{_qt6_libdir}/cmake/Qt6Widgets/*.cmake %{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake +%{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Xml/*.cmake %{_qt6_libdir}/qt6/metatypes/*.json %{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o @@ -743,8 +743,6 @@ make check -k ||: %{_qt6_plugindir}/sqldrivers/libqsqlpsql.so %{_qt6_libdir}/cmake/Qt6Sql/Qt6QPSQLDriverPlugin*.cmake -%ldconfig_scriptlets gui - %files gui %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d/ @@ -754,6 +752,7 @@ make check -k ||: %{_qt6_libdir}/libQt6OpenGLWidgets.so.6* %{_qt6_libdir}/libQt6PrintSupport.so.6* %{_qt6_libdir}/libQt6Widgets.so.6* +%{_qt6_libdir}/libQt6XcbQpa.so.6* # Generic %{_qt6_plugindir}/generic/libqevdevkeyboardplugin.so %{_qt6_plugindir}/generic/libqevdevmouseplugin.so @@ -781,13 +780,16 @@ make check -k ||: %{_qt6_plugindir}/egldeviceintegrations/libqeglfs-x11-integration.so %{_qt6_plugindir}/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so %{_qt6_plugindir}/egldeviceintegrations/libqeglfs-emu-integration.so +%{_qt6_plugindir}/xcbglintegrations/libqxcb-egl-integration.so %endif # Platforms %{_qt6_plugindir}/platforms/libqlinuxfb.so %{_qt6_plugindir}/platforms/libqminimal.so %{_qt6_plugindir}/platforms/libqoffscreen.so +%{_qt6_plugindir}/platforms/libqxcb.so %{_qt6_plugindir}/platforms/libqvnc.so %{_qt6_plugindir}/platforms/libqvkkhrdisplay.so +%{_qt6_plugindir}/xcbglintegrations/libqxcb-glx-integration.so # Platformthemes %{_qt6_plugindir}/platformthemes/libqxdgdesktopportal.so %{_qt6_plugindir}/platformthemes/libqgtk3.so @@ -795,6 +797,10 @@ make check -k ||: %changelog +* Wed Nov 06 2024 Funda Wang - 6.5.2-5 +- adopt to new cmake macro +- add missing xcb plugin + * Mon May 20 2024 Wenlong Zhang - 6.5.2-4 - fix build error for loongarch64