开源软件构建与测试

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 2

_service:tar_scm:qt5-qttools.spec Changed

@@ -1,11 +1,13 @@
+%global qt_module qttools
+
 Name:          qt5-qttools
-Version:       5.15.2
-Release:       4
+Version:       5.15.10
+Release:       2
 Summary:       Qt5 QtTool module
-License:       LGPLv3 or LGPLv2
+License:       LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
 Url:           http://www.qt.io
 %global majmin %(echo %{version} | cut -d. -f1-2)
-Source0:       https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/qttools-everywhere-src-%{version}.tar.xz
+Source0:       https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz
 Source1:       assistant.desktop
 Source2:       designer.desktop
 Source3:       linguist.desktop
@@ -15,21 +17,27 @@
 Patch1:        qttools-opensource-src-5.7-add-libatomic.patch
 Patch2:        0001-Link-against-libclang-cpp.so-instead-of-the-clang-co.patch
 Patch3:        0001-modify-lupdate-qt5-run-error.patch
+Patch4:        0001-update-Qt5LinguistToolsMacros.cmake.patch
 
 BuildRequires: make
 BuildRequires: cmake desktop-file-utils /usr/bin/file qt5-rpm-macros >= %{version}
 BuildRequires: qt5-qtbase-private-devel qt5-qtbase-devel >= %{version} qt5-qtbase-static >= %{version}
-BuildRequires: clang-devel llvm-devel qt5-qtdeclarative-devel >= %{version} pkgconfig(Qt5Qml)
+BuildRequires: clang-devel llvm-devel qt5-qtdeclarative-devel >= %{version} pkgconfig(Qt5Qml) qt5-qtdeclarative-static >= %{version}
 %{?_qt5:Requires: %{_qt5} = %{_qt5_version}}
 
-Provides:      %{name}-common = %{version}-%{release} %{name}-libs-designer = %{version}-%{release}
-Obsoletes:     %{name}-common < %{version}-%{release} %{name}-libs-designer < %{version}-%{release}
-Provides:      %{name}-libs-designercomponents = %{version}-%{release} %{name}-libs-help = %{version}-%{release}
-Obsoletes:     %{name}-libs-designercomponents < %{version}-%{release} %{name}-libs-help < %{version}-%{release}
-Obsoletes:     qt5-qttools-libs-clucene < 5.9.0 qt5-designer-plugin-webkit < 5.9.0
-Conflicts:     qt5-tools < 5.4.0-0.2
+Requires:      %{name}-common = %{version}-%{release}
 %description
-This package contains Qt5 QtTool module core files.
+%{summary}.
+
+%package common
+Summary: Common files for %{name}
+BuildArch:     noarch
+Obsoletes:     qt5-qttools-libs-clucene < 5.9.0
+%if ! 0%{?webkit}
+Obsoletes:     qt5-designer-plugin-webkit < 5.9.0
+%endif
+%description common
+%{summary}.
 
 %package devel
 Summary:       %{name} development files
@@ -37,56 +45,106 @@
 Requires:      %{name}-libs-designercomponents = %{version}-%{release} %{name}-libs-help = %{version}-%{release}
 Requires:      qt5-doctools = %{version}-%{release} qt5-designer = %{version}-%{release}
 Requires:      qt5-linguist = %{version}-%{release} qt5-qtbase-devel
-Provides:      qt5-qttools-static = %{version}-%{release} qt5-qttools-examples = %{version}-%{release}
-Obsoletes:     qt5-qttools-static < %{version}-%{release} qt5-qttools-examples < %{version}-%{release}
 %description devel
-The devel package contains libraries and header files for developing applications that use %{name}.
+%{summary}.
+
+%package static
+Summary:      Static library files for %{name}
+Requires:     %{name}-devel%{?_isa} = %{version}-%{release}
+%description static
+%{summary}.
+
+%package libs-designer
+Summary:      Qt5 Designer runtime library
+Requires:     %{name}-common = %{version}-%{release}
+%description libs-designer
+%{summary}.
+
+%package libs-designercomponents
+Summary:      Qt5 Designer Components runtime library
+Requires:     %{name}-common = %{version}-%{release}
+%description libs-designercomponents
+%{summary}.
+
+%package libs-help
+Summary:      Qt5 Help runtime library
+Requires:     %{name}-common = %{version}-%{release}
+# when split happened
+Conflicts:    qt5-tools < 5.4.0-0.2
+%description libs-help
+%{summary}.
 
 %package -n qt5-assistant
-Summary:       Qt5 Documentation browser
-Requires:      %{name} = %{version}-%{release}
+Summary:       Documentation browser for Qt5
+Requires:     %{name}-common = %{version}-%{release}
 %description -n qt5-assistant
-This package contains Qt5 Documentation browser files.
+%{summary}.
 
 %package -n qt5-designer
-Summary:       Qt5 Design GUI
-Requires:      %{name} = %{version}-%{release}
+Summary:       Design GUIs for Qt5 applications
+Requires:      %{name}-libs-designer%{?_isa} = %{version}-%{release}
+Requires:      %{name}-libs-designercomponents%{?_isa} = %{version}-%{release}
 %description -n qt5-designer
-This package contains Qt5 Design GUI files.
+%{summary}.
+
+%if 0%{?webkit}
+%package -n qt5-designer-plugin-webkit
+Summary:       Qt5 designer plugin for WebKit
+BuildRequires: pkgconfig(Qt5WebKitWidgets)
+Requires:      %{name}-libs-designer%{?_isa} = %{version}-%{release}
+%description -n qt5-designer-plugin-webkit
+%{summary}.
+%endif
 
 %package -n qt5-linguist
-Summary:       Tools for Qt5 Linguist
-Requires:      %{name} = %{version}-%{release}
+Summary:      Qt5 Linguist Tools
+Requires:     %{name}-common = %{version}-%{release}
 %description -n qt5-linguist
-This package contains tools to add translations to Qt5 applications.
+Tools to add translations to Qt5 applications.
 
 %package -n qt5-qdbusviewer
-Summary:       Qt5 D-Bus debugger and viewer
-Requires:      %{name} = %{version}-%{release}
-%{?_qt5:Requires: %{_qt5} >= %{_qt5_version}}
+Summary:      D-Bus debugger and viewer
+Requires:     %{name}-common = %{version}-%{release}
+%{?_qt5:Requires: %{_qt5}%{?_isa} >= %{_qt5_version}}
 %description -n qt5-qdbusviewer
-This package is created for debugging D-Bus objects.
+QDbusviewer can be used to inspect D-Bus objects of running programs
+and invoke methods on those objects.
 
 %package -n qt5-doctools
-Summary:       Tools for Qt5 doc
-Provides:      qt5-qdoc = %{version} qt5-qhelpgenerator = %{version} qt5-qtattributionsscanner = %{version}
-Obsoletes:     qt5-qdoc < 5.8.0 qt5-qhelpgenerator < 5.8.0 qt5-qtattributionsscanner < 5.8.0
-Requires:      qt5-qtattributionsscanner = %{version}
+Summary: Qt5 doc tools package
+Provides: qt5-qdoc = %{version}
+Obsoletes: qt5-qdoc < 5.8.0
+Provides: qt5-qhelpgenerator = %{version}
+Obsoletes: qt5-qhelpgenerator < 5.8.0
+Provides: qt5-qtattributionsscanner = %{version}
+Obsoletes: qt5-qtattributionsscanner < 5.8.0
+Requires: qt5-qtattributionsscanner = %{version}
 
 %description -n qt5-doctools
-This package contains tools for Qt5 doc.
+%{summary}.
+
+%package examples
+Summary: Programming examples for %{name}
+Requires: %{name}-common = %{version}-%{release}
+%description examples
+%{summary}.
+
 
 %prep
-%setup -q -n qttools-everywhere-src-%{version}
+%setup -q -n %{qt_module}-everywhere-src-%{version}
+
 %patch0 -p1 -b ..runqttools-with-qt5-suffix.patch
 %ifarch %{mips32}
 %patch1 -p1 -b .libatomic
 %endif
 %patch2 -p1 -b .libclang-cpp
 %patch3 -p1
+%patch4 -p1
 
 %build
-%{qmake_qt5}
+%{qmake_qt5} \
+  %{?no_examples}
+
 %make_build
 
 
@@ -136,7 +194,7 @@
 
 
 %check
-export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig
+export PKG_CONFIG_PATH=%{buildroot}%{_libdir}/pkgconfig:$PKG_CONFIG_PATH
 pkg-config --print-requires --print-requires-private Qt5Designer
 export CMAKE_PREFIX_PATH=%{buildroot}%{_qt5_prefix}:%{buildroot}%{_prefix}
 export PATH=%{buildroot}%{_qt5_bindir}:%{_qt5_bindir}:$PATH
@@ -168,12 +226,25 @@
 %{_qt5_bindir}/qdbus
 %{_qt5_bindir}/qdbus-qt5
 %{_qt5_bindir}/qtpaths
+
+%files common
+%license LICENSE.LGPL*

_service:tar_scm:0001-update-Qt5LinguistToolsMacros.cmake.patch Added

@@ -0,0 +1,118 @@
+From 57fd5853a7b56818fa137afe931feec18cf0942d Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Wed, 30 Aug 2023 11:09:46 +0800
+Subject: PATCH update Qt5LinguistToolsMacros.cmake
+
+---
+ src/linguist/Qt5LinguistToolsMacros.cmake | 46 ++++-------------------
+ 1 file changed, 7 insertions(+), 39 deletions(-)
+
+diff --git a/src/linguist/Qt5LinguistToolsMacros.cmake b/src/linguist/Qt5LinguistToolsMacros.cmake
+index 6a45e57..09f5845 100644
+--- a/src/linguist/Qt5LinguistToolsMacros.cmake
++++ b/src/linguist/Qt5LinguistToolsMacros.cmake
+@@ -42,17 +42,6 @@ function(QT5_CREATE_TRANSLATION _qm_files)
+     set(_lupdate_files ${_LUPDATE_UNPARSED_ARGUMENTS})
+     set(_lupdate_options ${_LUPDATE_OPTIONS})
+ 
+-    list(FIND _lupdate_options "-extensions" _extensions_index)
+-    if(_extensions_index GREATER -1)
+-        math(EXPR _extensions_index "${_extensions_index} + 1")
+-        list(GET _lupdate_options ${_extensions_index} _extensions_list)
+-        string(REPLACE "," ";" _extensions_list "${_extensions_list}")
+-        list(TRANSFORM _extensions_list STRIP)
+-        list(TRANSFORM _extensions_list REPLACE "^\\." "")
+-        list(TRANSFORM _extensions_list PREPEND "*.")
+-    else()
+-        set(_extensions_list "*.java;*.jui;*.ui;*.c;*.c++;*.cc;*.cpp;*.cxx;*.ch;*.h;*.h++;*.hh;*.hpp;*.hxx;*.js;*.qs;*.qml;*.qrc")
+-    endif()
+     set(_my_sources)
+     set(_my_tsfiles)
+     foreach(_file ${_lupdate_files})
+@@ -64,27 +53,15 @@ function(QT5_CREATE_TRANSLATION _qm_files)
+             list(APPEND _my_sources ${_abs_FILE})
+         endif()
+     endforeach()
+-    set(stamp_file_dir "${CMAKE_CURRENT_BINARY_DIR}/.lupdate")
+-    if(NOT EXISTS "${stamp_file_dir}")
+-        file(MAKE_DIRECTORY "${stamp_file_dir}")
+-    endif()
+     foreach(_ts_file ${_my_tsfiles})
+-        get_filename_component(_ts_name ${_ts_file} NAME)
+         if(_my_sources)
+           # make a list file to call lupdate on, so we don't make our commands too
+           # long for some systems
++          get_filename_component(_ts_name ${_ts_file} NAME)
+           set(_ts_lst_file "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${_ts_name}_lst_file")
+           set(_lst_file_srcs)
+-          set(_dependencies)
+           foreach(_lst_file_src ${_my_sources})
+               set(_lst_file_srcs "${_lst_file_src}\n${_lst_file_srcs}")
+-              if(IS_DIRECTORY ${_lst_file_src})
+-                  list(TRANSFORM _extensions_list PREPEND "${_lst_file_src}/" OUTPUT_VARIABLE _directory_glob)
+-                  file(GLOB_RECURSE _directory_contents CONFIGURE_DEPENDS ${_directory_glob})
+-                  list(APPEND _dependencies ${_directory_contents})
+-              else()
+-                  list(APPEND _dependencies "${_lst_file_src}")
+-              endif()
+           endforeach()
+ 
+           get_directory_property(_inc_DIRS INCLUDE_DIRECTORIES)
+@@ -95,15 +72,13 @@ function(QT5_CREATE_TRANSLATION _qm_files)
+ 
+           file(WRITE ${_ts_lst_file} "${_lst_file_srcs}")
+         endif()
+-        set(stamp_file "${stamp_file_dir}/${_ts_name}.stamp")
+-        add_custom_command(OUTPUT ${stamp_file}
++        add_custom_command(OUTPUT ${_ts_file}
+             COMMAND ${Qt5_LUPDATE_EXECUTABLE}
+             ARGS ${_lupdate_options} "@${_ts_lst_file}" -ts ${_ts_file}
+-            COMMAND ${CMAKE_COMMAND} -E touch "${stamp_file}"
+-            DEPENDS ${_dependencies}
+-            VERBATIM)
++            DEPENDS ${_my_sources}
++            BYPRODUCTS ${_ts_lst_file} VERBATIM)
+     endforeach()
+-    qt5_add_translation(${_qm_files} __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE ${_my_tsfiles})
++    qt5_add_translation(${_qm_files} ${_my_tsfiles})
+     set(${_qm_files} ${${_qm_files}} PARENT_SCOPE)
+ endfunction()
+ 
+@@ -120,7 +95,7 @@ endif()
+ 
+ 
+ function(QT5_ADD_TRANSLATION _qm_files)
+-    set(options __QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
++    set(options)
+     set(oneValueArgs)
+     set(multiValueArgs OPTIONS)
+ 
+@@ -130,7 +105,6 @@ function(QT5_ADD_TRANSLATION _qm_files)
+     foreach(_current_FILE ${_lrelease_files})
+         get_filename_component(_abs_FILE ${_current_FILE} ABSOLUTE)
+         get_filename_component(qm ${_abs_FILE} NAME)
+-        set(ts_stamp_file "${CMAKE_CURRENT_BINARY_DIR}/.lupdate/${qm}.stamp")
+         # everything before the last dot has to be considered the file name (including other dots)
+         string(REGEX REPLACE "\\.^.*$" "" FILE_NAME ${qm})
+         get_source_file_property(output_location ${_abs_FILE} OUTPUT_LOCATION)
+@@ -141,16 +115,10 @@ function(QT5_ADD_TRANSLATION _qm_files)
+             set(qm "${CMAKE_CURRENT_BINARY_DIR}/${FILE_NAME}.qm")
+         endif()
+ 
+-        if(_LRELEASE___QT_INTERNAL_DEPEND_ON_TIMESTAMP_FILE)
+-            set(qm_dep "${ts_stamp_file}")
+-        else()
+-            set(qm_dep "${_abs_FILE}")
+-        endif()
+-
+         add_custom_command(OUTPUT ${qm}
+             COMMAND ${Qt5_LRELEASE_EXECUTABLE}
+             ARGS ${_LRELEASE_OPTIONS} ${_abs_FILE} -qm ${qm}
+-            DEPENDS ${qm_dep} VERBATIM
++            DEPENDS ${_abs_FILE} VERBATIM
+         )
+         list(APPEND ${_qm_files} ${qm})
+     endforeach()
+-- 
+2.33.0
+

_service:tar_scm:qttools-everywhere-opensource-src-5.15.10.tar.xz Added

_service:tar_scm:qttools-everywhere-src-5.15.2.tar.xz Deleted