diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 92b9e4d3bf89ec1980de5b9f851078fb8746252c..cf233270cf4e2387ce5dc0ec85f7014a306e18aa 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -26,8 +26,8 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.5.0 -Release: 2 +Version: 6.5.1 +Release: 1 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -393,7 +393,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.5.0 +Version: 6.5.1 EOF # rpm macros @@ -457,6 +457,9 @@ rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake # Use better location for some new scripts in qtbase-6.0.1 mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake +# FIXME why is this being installed? +rm %{buildroot}/%{_qt6_libdir}/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o + %check # verify Qt6.pc export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig @@ -547,7 +550,6 @@ make check -k ||: %dir %{_qt6_libdir}/cmake/Qt6Gui %dir %{_qt6_libdir}/cmake/Qt6GuiTools %dir %{_qt6_libdir}/cmake/Qt6HostInfo -%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6Network %dir %{_qt6_libdir}/cmake/Qt6OpenGL @@ -604,6 +606,7 @@ make check -k ||: %{_qt6_headerdir}/QtCore/ %{_qt6_headerdir}/QtDBus/ %{_qt6_headerdir}/QtInputSupport +%{_qt6_headerdir}/QtExampleIcons %{_qt6_headerdir}/QtGui/ %{_qt6_headerdir}/QtNetwork/ %{_qt6_headerdir}/QtOpenGL/ @@ -680,6 +683,7 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Gui/*.cmake %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake @@ -691,7 +695,6 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake %{_qt6_libdir}/cmake/Qt6PrintSupport/*.cmake %{_qt6_libdir}/cmake/Qt6Sql/*.cmake -%{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake %{_qt6_libdir}/cmake/Qt6Test/*.cmake %{_qt6_libdir}/cmake/Qt6Widgets/*.cmake %{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake @@ -713,6 +716,8 @@ make check -k ||: %{_qt6_headerdir}/QtDeviceDiscoverySupport %{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl +%{_qt6_libdir}/libQt6ExampleIcons.a +%{_qt6_libdir}/libQt6ExampleIcons.prl %{_qt6_headerdir}/QtFbSupport %{_qt6_libdir}/libQt6FbSupport.*a %{_qt6_libdir}/libQt6FbSupport.prl @@ -801,6 +806,9 @@ make check -k ||: %changelog +* Wed Jul 5 2023 EastDong - 6.5.1-1 +- update package + * Fri May 19 2023 peijiankang - 6.5.0-2 - Enable zstd support diff --git a/qtbase-everywhere-src-6.5.0.tar.xz b/qtbase-everywhere-src-6.5.1.tar.xz similarity index 80% rename from qtbase-everywhere-src-6.5.0.tar.xz rename to qtbase-everywhere-src-6.5.1.tar.xz index b80b8756a2be96bbd199f30ba4dfec3be9d9c818..087a63997494a1537d8867c7bd3c321a207f674c 100644 Binary files a/qtbase-everywhere-src-6.5.0.tar.xz and b/qtbase-everywhere-src-6.5.1.tar.xz differ diff --git a/qtbase-firebird.patch b/qtbase-firebird.patch index c794304440cc010da5283fd626ae91f9ddd9fe91..19aafa7054abdff0026bd55cea2f2a7f43ce1dce 100644 --- a/qtbase-firebird.patch +++ b/qtbase-firebird.patch @@ -1,22 +1,23 @@ diff --git a/cmake/FindInterbase.cmake b/cmake/FindInterbase.cmake index 22f866d8..4ef16e75 100644 ---- a/cmake/FindInterbase.cmake -+++ b/cmake/FindInterbase.cmake -@@ -19,12 +19,12 @@ +--- a/cmake/FindInterbase.cmake 2023-07-05 16:30:56.785853277 +0800 ++++ b/cmake/FindInterbase.cmake 2023-07-05 16:35:17.421388535 +0800 +@@ -22,13 +22,13 @@ # The Interbase client library - + find_path(Interbase_INCLUDE_DIR - NAMES ibase.h + NAMES firebird/ibase.h HINTS ${Interbase_INCLUDEDIR} + PATH_SUFFIXES firebird ) - + find_library(Interbase_LIBRARY - NAMES firebase_ms fbclient gds + NAMES firebase_ms fbclient gds fbclient HINTS ${Interbase_LIBDIR} ) - + diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h index 9109c2b4..7477d5ee 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h