diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..d87f5613ec4234f82f8eaeebc563711f587fdf88 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.xz filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..bc70a4f634475e2b8ca799450719ea3bebfa3040 --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/qt6-qttools diff --git a/qt6-qttools.spec b/qt6-qttools.spec index f65bd30b0f493c229c714211d6d9b019c2f974e3..597771b77b56967fbdb1608fd53cbb346a258666 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -4,11 +4,11 @@ Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.5.2 -Release: 2 +Version: 6.8.2 +Release: 1 License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -Url: http://www.qt.io +Url: https://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz @@ -38,8 +38,8 @@ BuildRequires: qt6-qtbase-static >= %{version} BuildRequires: qt6-qtdeclarative-static >= %{version} BuildRequires: qt6-qtdeclarative >= %{version} %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} -#BuildRequires: clang-devel llvm-devel - +BuildRequires: clang-devel llvm-devel clang clang-tools-extra +BuildRequires: libzstd-devel Requires: %{name}-common = %{version}-%{release} @@ -103,15 +103,6 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} %description -n qt6-designer %{summary}. -%if 0%{?webkit} -%package -n qt6-designer-plugin-webkit -Summary: Qt6 designer plugin for WebKit -BuildRequires: pkgconfig(Qt6WebKitWidgets) -Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} -%description -n qt6-designer-plugin-webkit -%{summary}. -%endif - %package -n qt6-linguist Summary: Qt6 Linguist Tools Requires: %{name}-common = %{version}-%{release} @@ -141,14 +132,16 @@ Requires: %{name}-common = %{version}-%{release} %prep %setup -q -n %{qt_module}-everywhere-src-%{version} - %patch -P1 -p1 -b .run-qttools-with-qt6-suffix %ifarch %{mips32} %patch -P2 -p1 -b .libatomic %endif %build -%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} + %cmake_build @@ -220,6 +213,7 @@ popd %files +%{_qt6_archdatadir}/sbom/%{qt_module}-%{version}.spdx %{_bindir}/qdbus-qt6 %{_qt6_bindir}/qdbus %{_qt6_bindir}/qdbus-qt6 @@ -245,10 +239,9 @@ popd %{_datadir}/applications/*assistant.desktop %{_datadir}/icons/hicolor/*/apps/assistant*.* - %files -n qt6-doctools -#%{_bindir}/qdoc* -#%{_qt6_bindir}/qdoc* +%{_bindir}/qdoc* +%{_qt6_bindir}/qdoc* %{_bindir}/qdistancefieldgenerator* %{_qt6_bindir}/qdistancefieldgenerator* %{_qt6_libexecdir}/qhelpgenerator* @@ -260,13 +253,6 @@ popd %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* -%if 0%{?webkit} -%files -n qt6-designer-plugin-webkit -%{_qt6_plugindir}/designer/libqwebview.so -%{_qt6_libdir}/cmake/Qt6Designer/Qt6Designer_QWebViewPlugin.cmake -%endif - - %files -n qt6-linguist %{_bindir}/linguist* %{_qt6_bindir}/linguist* @@ -298,6 +284,9 @@ popd %{_qt6_bindir}/pixeltool* %{_qt6_bindir}/qtdiag* %{_qt6_bindir}/qtplugininfo* +%{_qt6_headerdir}/QtQDocCatch/ +%{_qt6_headerdir}/QtQDocCatchConversions/ +%{_qt6_headerdir}/QtQDocCatchGenerators/ %{_qt6_headerdir}/QtDesigner/ %{_qt6_headerdir}/QtDesignerComponents/ %{_qt6_headerdir}/QtHelp/ @@ -309,8 +298,16 @@ popd %{_qt6_libdir}/libQt6UiTools.so %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6Designer %{_qt6_libdir}/cmake/Qt6Designer/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate %{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QDocCatchPrivate +%{_qt6_libdir}/cmake/Qt6QDocCatchPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QDocCatchConversionsPrivate +%{_qt6_libdir}/cmake/Qt6QDocCatchConversionsPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QDocCatchGeneratorsPrivate +%{_qt6_libdir}/cmake/Qt6QDocCatchGeneratorsPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6Help/ %{_qt6_libdir}/cmake/Qt6Help/*.cmake %dir %{_qt6_libdir}/cmake/Qt6Linguist @@ -324,17 +321,19 @@ popd %dir %{_qt6_libdir}/cmake/Qt6ToolsTools/ %{_qt6_libdir}/cmake/Qt6ToolsTools/*.cmake %{_qt6_libdir}/cmake/Qt6UiTools/ -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_help.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_help_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_tools_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_qdoccatch_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_qdoccatchconversions_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_qdoccatchgenerators_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_designer.pri +%{_qt6_mkspecsdir}/modules/qt_lib_designer_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_designercomponents_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_help.pri +%{_qt6_mkspecsdir}/modules/qt_lib_help_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_linguist.pri +%{_qt6_mkspecsdir}/modules/qt_lib_tools_private.pri +%{_qt6_mkspecsdir}/modules/qt_lib_uiplugin.pri +%{_qt6_mkspecsdir}/modules/qt_lib_uitools.pri +%{_qt6_mkspecsdir}/modules/qt_lib_uitools_private.pri %{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json %{_qt6_libdir}/qt6/modules/*.json %{_qt6_libdir}/pkgconfig/*.pc @@ -347,11 +346,12 @@ popd %if 0%{?examples} %files examples %{_qt6_examplesdir}/ -%dir %{_qt6_libdir}/cmake/Qt6Designer %endif - %changelog +* Sat Feb 01 2025 Funda Wang - 6.8.2-1 +- update to 6.8.2 + * Wed Nov 20 2024 Funda Wang - 6.5.2-2 - adopt to new cmake macro @@ -366,4 +366,3 @@ popd * Tue May 30 2023 peijiankang - 6.5.0-1 - Init Package 6.5.0 - diff --git a/qttools-everywhere-src-6.5.2.tar.xz b/qttools-everywhere-src-6.5.2.tar.xz deleted file mode 100644 index c135369f52a3a44894970498767aa0266f011f3c..0000000000000000000000000000000000000000 Binary files a/qttools-everywhere-src-6.5.2.tar.xz and /dev/null differ diff --git a/qttools-everywhere-src-6.8.2.tar.xz b/qttools-everywhere-src-6.8.2.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..b1641b97a94ec803b904bede537238c687b2f3cd --- /dev/null +++ b/qttools-everywhere-src-6.8.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:326381b7d43f07913612f291abc298ae79bd95382e2233abce982cff2b53d2c0 +size 10297596