From 8ddcce84df295979ad8e4772986dc19da403c5b1 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 25 Aug 2025 18:29:38 +0800 Subject: [PATCH] 5.15.17 --- macros.qt5 | 3 ++ qt5.spec | 129 ++++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 115 insertions(+), 17 deletions(-) diff --git a/macros.qt5 b/macros.qt5 index 4b1aa81..fd1dd74 100644 --- a/macros.qt5 +++ b/macros.qt5 @@ -28,6 +28,9 @@ %_qt5_optflags %{optflags} @@QT5_RPM_OPT_FLAGS@@ %_qt5_qmake_flags \\\ + QMAKE_CC=%{__cc} \\\ + QMAKE_CXX=%{__cxx} \\\ + QMAKE_LINK=%{__cxx} \\\ QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt5_optflags} %{?_qt5_cflags}}" \\\ QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt5_optflags} %{?_qt5_cflags}}" \\\ QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt5_optflags} %{?_qt5_cxxflags}}" \\\ diff --git a/qt5.spec b/qt5.spec index abb609a..8dfcb01 100644 --- a/qt5.spec +++ b/qt5.spec @@ -1,6 +1,6 @@ Name: qt5 -Version: 5.15.16 -Release: 2 +Version: 5.15.17 +Release: 1 Summary: Qt5 meta package License: GPLv3 URL: https://www.qt.io @@ -8,13 +8,40 @@ Source0: macros.qt5 Source1: macros.qt5-srpm Source2: qmake-qt5.sh BuildArch: noarch - -Requires: qt5-qdbusviewer qt5-qt3d qt5-qtbase qt5-qtbase-gui qt5-qtbase-mysql -Requires: qt5-qtbase-postgresql qt5-qtconnectivity qt5-qtdeclarative qt5-qtdoc -Requires: qt5-qtgraphicaleffects qt5-qtimageformats qt5-qtlocation qt5-qtmultimedia -Requires: qt5-qtquickcontrols qt5-qtquickcontrols2 qt5-qtscript qt5-qtsensors -Requires: qt5-qtserialport qt5-qtsvg qt5-qttools qt5-qtwayland qt5-qtwebchannel -Requires: qt5-qtwebsockets qt5-qtx11extras qt5-qtxmlpatterns +Requires: qt5-qdbusviewer +Requires: qt5-qt3d +Requires: qt5-qtbase +Requires: qt5-qtbase-gui +Requires: qt5-qtbase-mysql +Requires: qt5-qtbase-postgresql +Requires: qt5-qtcharts +Requires: qt5-qtconnectivity +Requires: qt5-qtdeclarative +Requires: qt5-qtgamepad +Requires: qt5-qtgraphicaleffects +Requires: qt5-qtimageformats +Requires: qt5-qtlocation +Requires: qt5-qtmultimedia +Requires: qt5-qtnetworkauth +Requires: qt5-qtquickcontrols +Requires: qt5-qtquickcontrols2 +Requires: qt5-qtscript +Requires: qt5-qtscxml +Requires: qt5-qtsensors +Requires: qt5-qtserialbus +Requires: qt5-qtserialport +Requires: qt5-qtspeech +Requires: qt5-qtsvg +Requires: qt5-qttools +Requires: qt5-qttranslations +Requires: qt5-qtvirtualkeyboard +Requires: qt5-qtwayland +Requires: qt5-qtwebchannel +Requires: qt5-qtwebengine +Requires: qt5-qtwebsockets +Requires: qt5-qtwebview +Requires: qt5-qtx11extras +Requires: qt5-qtxmlpatterns %description Qt is a full development framework with tools designed to streamline the creation of applications @@ -22,14 +49,36 @@ and user interfaces for desktop, embedded, and mobile platforms. %package devel Summary: Qt5 meta devel package -Requires: qt5-rpm-macros qt5-qttools-static qt5-qtdeclarative-static qt5-qtbase-static -Requires: qt5-designer qt5-qdoc qt5-qhelpgenerator qt5-linguist qt5-qt3d-devel qt5-qtbase-devel -Requires: qt5-qtconnectivity-devel qt5-qtdeclarative-devel qt5-qtlocation-devel -Requires: qt5-qtmultimedia-devel qt5-qtscript-devel qt5-qtsensors-devel qt5-qtserialport-devel -Requires: qt5-qtsvg-devel qt5-qttools-devel qt5-qtwayland-devel qt5-qtwebchannel-devel -#Requires: qt5-qtwebengine-devel -Requires: qt5-qtwebsockets-devel qt5-qtx11extras-devel qt5-qtxmlpatterns-devel -#Requires: qt5-qtwebkit-devel qt5-qtenginio-devel qt5-qt3d-devel +Requires: qt5-rpm-macros +Requires: qt5-qttools-static qt5-qtdeclarative-static qt5-qtbase-static +Requires: qt5-designer qt5-qdoc qt5-qhelpgenerator qt5-linguist +Requires: qt5-qt3d-devel +Requires: qt5-qtbase-devel +Requires: qt5-qtcharts-devel +Requires: qt5-qtconnectivity-devel +Requires: qt5-qtdeclarative-devel +Requires: qt5-qtgamepad-devel +Requires: qt5-qtlocation-devel +Requires: qt5-qtmultimedia-devel +Requires: qt5-qtnetworkauth-devel +Requires: qt5-qtquickcontrols2-devel +Requires: qt5-qtscript-devel +Requires: qt5-qtscxml-devel +Requires: qt5-qtsensors-devel +Requires: qt5-qtserialbus-devel +Requires: qt5-qtserialport-devel +Requires: qt5-qtspeech-devel +Requires: qt5-qtsvg-devel +Requires: qt5-qttools-devel +Requires: qt5-qtvirtualkeyboard-devel +Requires: qt5-qtwayland-devel +Requires: qt5-qtwebchannel-devel +Requires: qt5-qtwebengine-devel +Requires: qt5-qtwebsockets-devel +Requires: qt5-qtwebview-devel +Requires: qt5-qtx11extras-devel +Requires: qt5-qtxmlpatterns-devel + %description devel Development files for %{name} @@ -47,6 +96,45 @@ Summary: RPM macros for source Qt5 packages %description srpm-macros RPM RPM provides a rich set of macros for source Qt5 packages +%package doc +Summary: QT5 application interface (API) documentation +License: GFDL-1.3-only +Requires: qt5-qtbase-doc +Requires: qt5-qt3d-doc +Requires: qt5-qtcharts-doc +Requires: qt5-qtconnectivity-doc +Requires: qt5-qtdatavis3d-doc +Requires: qt5-qtdeclarative-doc +Requires: qt5-qtdoc +Requires: qt5-qtgamepad-doc +Requires: qt5-qtgraphicaleffects-doc +Requires: qt5-qtimageformats-doc +Requires: qt5-qtlocation-doc +Requires: qt5-qtmultimedia-doc +Requires: qt5-qtnetworkauth-doc +Requires: qt5-qtquickcontrols-doc +Requires: qt5-qtquickcontrols2-doc +Requires: qt5-qtscript-doc +Requires: qt5-qtscxml-doc +Requires: qt5-qtsensors-doc +Requires: qt5-qtserialbus-doc +Requires: qt5-qtserialport-doc +Requires: qt5-qtsvg-doc +Requires: qt5-qtspeech-doc +Requires: qt5-qtremoteobjects-doc +Requires: qt5-qttools-doc +Requires: qt5-qtvirtualkeyboard-doc +Requires: qt5-qtwayland-doc +Requires: qt5-qtwebchannel-doc +Requires: qt5-qtwebengine-doc +Requires: qt5-qtwebsockets-doc +Requires: qt5-qtx11extras-doc +Requires: qt5-qtwebview-doc +Requires: qt5-qtxmlpatterns-doc + +%description doc +This package contains all qt5 application interface documents. + %install install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5 install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt5-srpm @@ -88,7 +176,14 @@ echo "- Qt5 devel meta package" > %{buildroot}%{_docdir}/qt5-devel/README %files srpm-macros %{_rpmconfigdir}/macros.d/macros.qt5-srpm +%files doc + %changelog +* Sat May 24 2025 Funda Wang - 5.15.17-1 +- update to 5.15.17 +- deal with clang build +- merge qt5-doc package + * Wed Apr 23 2025 mahailiang - 5.15.16-2 - add sw_64 in macros qt5_qtwebengine_arches -- Gitee