From e765153e84b4237673995a97f234f36d3a5366af Mon Sep 17 00:00:00 2001 From: Raven Date: Wed, 29 May 2024 16:17:07 +0600 Subject: [PATCH] qt6: update to 6.7.1 --- .../python-pyqt6-webengine.spec | 5 +- base/qt6/python-pyqt6/python-pyqt6.spec | 8 +- base/qt6/qcoro/qcoro.spec | 5 +- base/qt6/qt6-doc/generate-qt6-doc.sh | 4 +- base/qt6/qt6-doc/qt6-doc.spec | 90 ++++- base/qt6/qt6-qt3d/qt6-qt3d.spec | 9 +- base/qt6/qt6-qt5compat/qt6-qt5compat.spec | 13 +- base/qt6/qt6-qtbase/qt6-qtbase.spec | 41 +-- ...-support-for-xdp-to-get-color-scheme.patch | 310 ++++++++++++++++++ ...ase-tell-the-truth-about-private-API.patch | 13 - ...e-ifdefs-instead-if-for-cpp-lib-span.patch | 31 -- ...only-major-minor-for-private-api-tag.patch | 13 + base/qt6/qt6-qtcharts/qt6-qtcharts.spec | 14 +- base/qt6/qt6-qtcoap/qt6-qtcoap.spec | 18 +- .../qt6-qtconnectivity.spec | 12 +- ...iangle-fix-crash-when-target-is-null.patch | 23 -- ...qquickaccessibleattached-for-nullptr.patch | 35 -- .../qt6-qtdeclarative/qt6-qtdeclarative.spec | 17 +- base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec | 5 +- .../qt6-qthttpserver/qt6-qthttpserver.spec | 10 +- .../qt6-qtimageformats.spec | 14 +- .../qt6-qtlanguageserver.spec | 5 +- base/qt6/qt6-qtlocation/qt6-qtlocation.spec | 13 +- base/qt6/qt6-qtlottie/qt6-qtlottie.spec | 12 +- base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec | 9 +- .../qt6-qtmultimedia/qt6-qtmultimedia.spec | 21 +- .../qt6-qtnetworkauth/qt6-qtnetworkauth.spec | 13 +- base/qt6/qt6-qtopcua/.cmake.conf | 7 + base/qt6/qt6-qtopcua/.tag | 1 + base/qt6/qt6-qtopcua/qt6-qtopcua.spec | 20 +- .../qt6-qtpositioning/qt6-qtpositioning.spec | 12 +- base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec | 5 +- .../qt6-qtquicktimeline.spec | 5 +- .../qt6-qtremoteobjects.spec | 13 +- base/qt6/qt6-qtscxml/qt6-qtscxml.spec | 12 +- base/qt6/qt6-qtsensors/qt6-qtsensors.spec | 13 +- base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec | 13 +- .../qt6-qtserialport/qt6-qtserialport.spec | 7 +- .../qt6-qtshadertools/qt6-qtshadertools.spec | 13 +- base/qt6/qt6-qtspeech/qt6-qtspeech.spec | 5 +- base/qt6/qt6-qtsvg/qt6-qtsvg.spec | 12 +- base/qt6/qt6-qttools/qt6-qttools.spec | 17 +- .../qt6-qttranslations.spec | 8 +- .../qt6-qtvirtualkeyboard.spec | 11 +- base/qt6/qt6-qtwayland/qt6-qtwayland.spec | 24 +- .../qt6-qtwebchannel/qt6-qtwebchannel.spec | 13 +- .../qt6-qtwebengine/macros.qt6-qtwebengine | 2 - base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec | 28 +- .../qt6-qtwebsockets/qt6-qtwebsockets.spec | 12 +- base/qt6/qt6-qtwebview/qt6-qtwebview.spec | 13 +- base/qt6/qt6/qt6.spec | 7 +- 51 files changed, 673 insertions(+), 363 deletions(-) create mode 100644 base/qt6/qt6-qtbase/qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch delete mode 100644 base/qt6/qt6-qtbase/qtbase-tell-the-truth-about-private-API.patch delete mode 100644 base/qt6/qt6-qtbase/qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch create mode 100644 base/qt6/qt6-qtbase/qtbase-use-only-major-minor-for-private-api-tag.patch delete mode 100644 base/qt6/qt6-qtdeclarative/qquickselectiontriangle-fix-crash-when-target-is-null.patch delete mode 100644 base/qt6/qt6-qtdeclarative/qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch create mode 100644 base/qt6/qt6-qtopcua/.cmake.conf create mode 100644 base/qt6/qt6-qtopcua/.tag diff --git a/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec b/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec index 8fe36c9..dcebe34 100644 --- a/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec +++ b/base/qt6/python-pyqt6-webengine/python-pyqt6-webengine.spec @@ -11,7 +11,7 @@ %global pypi_name PyQt6_WebEngine Name: python-pyqt6-webengine -Version: 6.6.0 +Version: 6.7.0 Release: %autorelease Summary: Python bindings for Qt6WebEngine License: GPL-3.0-only @@ -97,6 +97,9 @@ done %changelog +* Mon May 27 2024 Raven - 6.7.0-1 +- Update to 6.7.0 + * Tue Dec 19 2023 Raven - 6.6.0-1 - Update to 6.6.0 diff --git a/base/qt6/python-pyqt6/python-pyqt6.spec b/base/qt6/python-pyqt6/python-pyqt6.spec index 41bb32b..4d9305c 100644 --- a/base/qt6/python-pyqt6/python-pyqt6.spec +++ b/base/qt6/python-pyqt6/python-pyqt6.spec @@ -7,7 +7,7 @@ Summary: PyQt6 is Python bindings for Qt6 Name: python-pyqt6 Version: 6.7.0 -Release: 1%{?snap:^%{snap}}%{?dist} +Release: 2%{?snap:^%{snap}}%{?dist} License: gpl-3.0-only Url: http://www.riverbankcomputing.com/software/pyqt/ @@ -120,7 +120,6 @@ BuildArch: noarch %enable_devtoolset13 PATH=%{_qt6_bindir}:$PATH ; export PATH -%global _rxlibdir /opt/rx/%{_lib} # Python 3 build: sip-build \ @@ -134,7 +133,7 @@ sip-build \ --pep484-pyi \ --qmake-setting 'QMAKE_CFLAGS_RELEASE="%{build_cflags}"' \ --qmake-setting 'QMAKE_CXXFLAGS_RELEASE="%{build_cxxflags} `pkg-config --cflags dbus-python` -DQT_NO_INT128"' \ - --qmake-setting 'QMAKE_LFLAGS_RELEASE="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} %{build_ldflags}"' + --qmake-setting 'QMAKE_LFLAGS_RELEASE="%{build_ldflags}"' %make_build -C build @@ -243,6 +242,9 @@ sed -i \ %changelog +* Mon May 27 2024 Raven - 6.7.0-2 +- rebuilt for qt 6.7.1 + * Fri Apr 26 2024 Jan Grulich - 6.7.0-1 - Update to 6.7.0 diff --git a/base/qt6/qcoro/qcoro.spec b/base/qt6/qcoro/qcoro.spec index cf96367..fc8a969 100644 --- a/base/qt6/qcoro/qcoro.spec +++ b/base/qt6/qcoro/qcoro.spec @@ -45,7 +45,7 @@ BuildRequires: cmake(Qt6Quick) BuildRequires: cmake(Qt6Test) BuildRequires: cmake(Qt6WebSockets) BuildRequires: cmake(Qt6Widgets) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: qt6-qtbase-private-devel %endif @@ -121,9 +121,6 @@ popd %if 0%{?use_qt6} mkdir %{qt6_build_dir} && pushd %{qt6_build_dir} -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake -G Ninja \ -S'..' \ -DCMAKE_BUILD_TYPE=Release \ diff --git a/base/qt6/qt6-doc/generate-qt6-doc.sh b/base/qt6/qt6-doc/generate-qt6-doc.sh index 3cbd506..9cc2400 100644 --- a/base/qt6/qt6-doc/generate-qt6-doc.sh +++ b/base/qt6/qt6-doc/generate-qt6-doc.sh @@ -1,7 +1,7 @@ #!/bin/bash -x -QT_BRANCH=6.6.1 -QT_VERSION=6.6.1 +QT_BRANCH=6.7.1 +QT_VERSION=6.7.1 # Install fedora deps for qt6-qtbase, qt6-qttools #sudo dnf builddep qt6-qtbase qt6-qttools qt6-qtwebengine -y diff --git a/base/qt6/qt6-doc/qt6-doc.spec b/base/qt6/qt6-doc/qt6-doc.spec index fed3092..5df9936 100644 --- a/base/qt6/qt6-doc/qt6-doc.spec +++ b/base/qt6/qt6-doc/qt6-doc.spec @@ -1,20 +1,56 @@ +#global prebuilt 1 + Name: qt6-doc Summary: Qt6 - Complete documentation -Version: 6.6.1 -Release: 2%{?dist} +Version: 6.7.1 +Release: 1%{?dist} BuildArch: noarch License: GFDL -# The tarball for this docs are self generated through provided script on SOURCES generate-qt-doc.sh Url: http://qt-project.org/ -Source0: qt-doc-opensource-src-%{version}.tar.xz + + +%if 0%{?prebuilt} +# The tarball for this docs are self generated through provided script on SOURCES generate-qt-doc.sh +Source0: qt-doc-opensource-%{version}.tar.xz Source1: generate-qt6-doc.sh +%else +Source0: http://download.qt-project.org/official_releases/qt/%(echo %{version}|cut -d. -f1-2)/%{version}/submodules/qtdoc-everywhere-src-%{version}.tar.xz +%endif + # optimize build, skip unecessary steps %global debug_package %{nil} %global __spec_install_post %{nil} BuildRequires: qt6-rpm-macros +%if !0%{?prebuilt} +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Network) +BuildRequires: cmake(Qt6Xml) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6Sql) +BuildRequires: cmake(Qt6Test) +BuildRequires: cmake(Qt6PrintSupport) +BuildRequires: cmake(Qt6OpenGL) +BuildRequires: cmake(Qt6OpenGLWidgets) +BuildRequires: cmake(Qt6DBus) +BuildRequires: cmake(Qt6QmlIntegration) +BuildRequires: cmake(Qt6QmlModels) +BuildRequires: cmake(Qt6QmlXmlListModel) +BuildRequires: cmake(Qt6Qml) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6QuickControls2) +BuildRequires: cmake(Qt6QuickTemplates2) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(vulkan) +BuildRequires: pkgconfig(openssl) >= 3.0 +%endif %description Documentation for Qt6 API in QCH format @@ -35,17 +71,52 @@ Summary: tags files for crosslinking to Qt QCH files %prep -# intentionally left blank -# though could be used to initially unpack (rex) - +%if !0%{?prebuilt} +%autosetup -p1 -n qtdoc-everywhere-src-%{version} +%endif %build -# intentionally left blank +%if !0%{?prebuilt} +%enable_devtoolset13 +%global _rxlibdir /opt/rx/%{_lib} +export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} +export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" +export LD_LIBRARY_PATH="$(pwd)/%{_vpath_builddir}/lib:${LD_LIBRARY_PATH}" + +# FIXME why are OpenGL lib paths autodetected incorrectly, preferring +# /usr/lib over /usr/lib64 even on 64-bit boxes? +%cmake_qt6 \ + -DBUILD_EXAMPLES:BOOL=ON \ + -DBUILD_SHARED_LIBS:BOOL=ON \ + -DFEATURE_cxx2a:BOOL=ON \ + -DFEATURE_dynamicgl:BOOL=ON \ + -DFEATURE_ftp:BOOL=ON \ + -DFEATURE_opengl_dynamic:BOOL=ON \ + -DFEATURE_xcb_native_painting:BOOL=ON \ + -DFEATURE_openssl:BOOL=ON \ + -DFEATURE_openssl_linked:BOOL=ON \ + -DFEATURE_system_sqlite:BOOL=ON \ + -DINPUT_sqlite=system \ + -DQT_WILL_INSTALL:BOOL=ON \ + -D_OPENGL_LIB_PATH=%{_libdir} \ + -DOPENGL_egl_LIBRARY=%{_libdir}/libEGL.so \ + -DOPENGL_glu_LIBRARY=%{_libdir}/libGLU.so \ + -DOPENGL_glx_LIBRARY=%{_libdir}/libGLX.so \ + -DOPENGL_opengl_LIBRARY=%{_libdir}/libOpenGL.so + + +%cmake_build +%endif %install +%if 0%{?prebuilt} mkdir -p %{buildroot} tar xf %{SOURCE0} -C %{buildroot} +%else +%cmake_install +%endif + %files %{_qt6_docdir}/*.qch @@ -58,6 +129,9 @@ tar xf %{SOURCE0} -C %{buildroot} %{_qt6_docdir}/*/*.tags %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/base/qt6/qt6-qt3d/qt6-qt3d.spec b/base/qt6/qt6-qt3d/qt6-qt3d.spec index f2b7b78..4377360 100644 --- a/base/qt6/qt6-qt3d/qt6-qt3d.spec +++ b/base/qt6/qt6-qt3d/qt6-qt3d.spec @@ -8,7 +8,7 @@ Summary: Qt6 - Qt3D QML bindings and C++ APIs Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} %global examples 1 @@ -213,11 +213,14 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Sat Dec 16 2023 Raven - 6.6.1-1 -- update to 6.6.1 +- 6.6.1 * Fri Jul 21 2023 Jan Grulich - 6.5.2-1 - 6.5.2 diff --git a/base/qt6/qt6-qt5compat/qt6-qt5compat.spec b/base/qt6/qt6-qt5compat/qt6-qt5compat.spec index c542ae0..afff734 100644 --- a/base/qt6/qt6-qt5compat/qt6-qt5compat.spec +++ b/base/qt6/qt6-qt5compat/qt6-qt5compat.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Qt 5 Compatibility Libraries Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -36,7 +36,7 @@ BuildRequires: qt6-qtbase-private-devel # qt6-qtdeclarative is required for QtGraphicalEffects BuildRequires: qt6-qtdeclarative-devel BuildRequires: qt6-qtshadertools-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: pkgconfig(icu-i18n) @@ -66,10 +66,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -121,8 +117,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtbase/qt6-qtbase.spec b/base/qt6/qt6-qtbase/qt6-qtbase.spec index 7d2fc0e..b799420 100644 --- a/base/qt6/qt6-qtbase/qt6-qtbase.spec +++ b/base/qt6/qt6-qtbase/qt6-qtbase.spec @@ -49,7 +49,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -77,8 +77,8 @@ Source6: 10-qt6-check-opengl2.sh # macros Source10: macros.qt6-qtbase -Patch1: qtbase-tell-the-truth-about-private-API.patch -Patch2: qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch +Patch1: qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch +Patch2: qtbase-use-only-major-minor-for-private-api-tag.patch # upstreamable patches # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) @@ -109,7 +109,7 @@ Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch %endif ## upstream patches -Patch200: qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch +Patch200: qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch ## upstream patches @@ -132,7 +132,11 @@ BuildRequires: ninja-build BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: findutils +%if 0%{?fedora} || 0%{?epel} BuildRequires: double-conversion-devel +%else +Provides: bundled(double-conversion) +%endif %if 0%{?fedora} || 0%{?epel} BuildRequires: libb2-devel %else @@ -165,11 +169,11 @@ BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(openssl) >= 3.0 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) -BuildRequires: pkgconfig(libinput) >= 1.22 +BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: pkgconfig(xcb-util) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 -BuildRequires: pkgconfig(xkbcommon-x11) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon-x11) BuildRequires: pkgconfig(xkeyboard-config) %global vulkan 1 BuildRequires: pkgconfig(vulkan) @@ -211,9 +215,6 @@ BuildRequires: xorg-x11-server-Xvfb Requires: %{name}-common = %{version}-%{release} -Requires: rx-libinput -Requires: rx-libxkbcommon - ## Sql drivers %if 0%{?fedora} || 0%{?epel} %global ibase 1 @@ -245,7 +246,7 @@ Requires: pkgconfig(gl) Requires: pkgconfig(vulkan) %endif # Optional dev dependency of Qt6::Gui -Requires: pkgconfig(xkbcommon) >= 1.3 +Requires: pkgconfig(xkbcommon) Requires: qt6-rpm-macros %if 0%{?use_clang} Requires: clang >= 3.7.0 @@ -279,8 +280,8 @@ Summary: Static library files for %{name} Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: pkgconfig(fontconfig) Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(libinput) >= 1.22 -Requires: pkgconfig(xkbcommon) >= 1.3 +Requires: pkgconfig(libinput) +Requires: pkgconfig(xkbcommon) Requires: pkgconfig(zlib) %description static @@ -377,11 +378,8 @@ export CXX=clang++ %else %enable_devtoolset13 %endif -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} $LDFLAGS $RPM_LD_FLAGS" export MAKEFLAGS="%{?_smp_mflags}" %cmake_qt6 \ @@ -410,6 +408,7 @@ export MAKEFLAGS="%{?_smp_mflags}" -DQT_FEATURE_sql_sqlite=ON \ -DQT_FEATURE_rpath=OFF \ -DQT_FEATURE_zstd=ON \ + -DQT_FEATURE_elf_private_full_version=ON \ %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \ %{?pcre:-DQT_FEATURE_system_pcre2=ON} \ %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \ @@ -653,6 +652,7 @@ make check -k ||: %{_qt6_libexecdir}/qt-cmake-private %{_qt6_libexecdir}/qt-cmake-standalone-test %{_qt6_libexecdir}/cmake_automoc_parser +%{_qt6_libexecdir}/qt-internal-configure-examples %{_qt6_libexecdir}/qt-internal-configure-tests %{_qt6_libexecdir}/sanitizer-testrunner.py %{_qt6_libexecdir}/syncqt @@ -771,7 +771,7 @@ make check -k ||: %{_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_init.cpp.o +%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.qt/rcc/qrc_example_icons_init.cpp.o %{_qt6_libdir}/pkgconfig/*.pc %if 0%{?egl} @@ -877,11 +877,14 @@ make check -k ||: %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Sat Dec 16 2023 Raven - 6.6.1-1 -- update to 6.6.1 +- 6.6.1 * Fri Aug 11 2023 Jan Grulich - 6.5.2-3 - Don't use QGnomePlatform by default on F39+ diff --git a/base/qt6/qt6-qtbase/qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch b/base/qt6/qt6-qtbase/qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch new file mode 100644 index 0000000..1011da7 --- /dev/null +++ b/base/qt6/qt6-qtbase/qtbase-qgtk3theme-add-support-for-xdp-to-get-color-scheme.patch @@ -0,0 +1,310 @@ +From d0b4e8a601bc2f81ddb23c124acc99defa26c02f Mon Sep 17 00:00:00 2001 +From: Jan Grulich +Date: Fri, 22 Mar 2024 12:12:51 +0100 +Subject: [PATCH] QGtk3Theme: Add support for xdg-desktop-portal to get color scheme + +Use xdg-desktop-portal to get color scheme used by GNOME. Recent GNOME +versions use this as primary way to switch between light and dark theme. +Make this a preferred way to get color scheme and fallback to previous +methods in case xdg-desktop-portal cannot be used. Also update app theme +on runtime when color scheme changes, not only when theme is changed. + +[ChangeLog][Platform Specific Changes][Linux] Add support for +xdg-desktop-portal to get color scheme in QGtk3Theme. + +Fixes: QTBUG-116197 +Change-Id: Ib3ffad405bc795ed6f4de4af411efc45721662b9 +Reviewed-by: Qt CI Bot +Reviewed-by: Axel Spoerl +Reviewed-by: Santhosh Kumar +--- + +diff --git a/src/plugins/platformthemes/gtk3/CMakeLists.txt b/src/plugins/platformthemes/gtk3/CMakeLists.txt +index becfccc..6d3c7bf 100644 +--- a/src/plugins/platformthemes/gtk3/CMakeLists.txt ++++ b/src/plugins/platformthemes/gtk3/CMakeLists.txt +@@ -35,6 +35,13 @@ + Qt::GuiPrivate + ) + ++qt_internal_extend_target(QGtk3ThemePlugin CONDITION QT_FEATURE_dbus ++ SOURCES ++ qgtk3portalinterface.cpp ++ LIBRARIES ++ Qt::DBus ++) ++ + qt_internal_extend_target(QGtk3ThemePlugin CONDITION QT_FEATURE_xlib + LIBRARIES + X11::X11 +diff --git a/src/plugins/platformthemes/gtk3/qgtk3portalinterface.cpp b/src/plugins/platformthemes/gtk3/qgtk3portalinterface.cpp +new file mode 100644 +index 0000000..1ffdda7 +--- /dev/null ++++ b/src/plugins/platformthemes/gtk3/qgtk3portalinterface.cpp +@@ -0,0 +1,123 @@ ++// Copyright (C) 2024 The Qt Company Ltd. ++// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists purely as an ++// implementation detail. This header file may change from version to ++// version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#include "qgtk3portalinterface_p.h" ++#include "qgtk3storage_p.h" ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++Q_LOGGING_CATEGORY(lcQGtk3PortalInterface, "qt.qpa.gtk"); ++ ++using namespace Qt::StringLiterals; ++ ++static constexpr QLatin1StringView appearanceInterface("org.freedesktop.appearance"); ++static constexpr QLatin1StringView colorSchemeKey("color-scheme"); ++ ++const QDBusArgument &operator>>(const QDBusArgument &argument, QMap &map) ++{ ++ argument.beginMap(); ++ map.clear(); ++ ++ while (!argument.atEnd()) { ++ QString key; ++ QVariantMap value; ++ argument.beginMapEntry(); ++ argument >> key >> value; ++ argument.endMapEntry(); ++ map.insert(key, value); ++ } ++ ++ argument.endMap(); ++ return argument; ++} ++ ++QGtk3PortalInterface::QGtk3PortalInterface(QGtk3Storage *s) ++ : m_storage(s) { ++ qRegisterMetaType(); ++ qDBusRegisterMetaType>(); ++ ++ queryColorScheme(); ++ ++ if (!s) { ++ qCDebug(lcQGtk3PortalInterface) << "QGtk3PortalInterface instantiated without QGtk3Storage." ++ << "No reaction to runtime theme changes."; ++ } ++} ++ ++Qt::ColorScheme QGtk3PortalInterface::colorScheme() const ++{ ++ return m_colorScheme; ++} ++ ++void QGtk3PortalInterface::queryColorScheme() { ++ QDBusConnection connection = QDBusConnection::sessionBus(); ++ QDBusMessage message = QDBusMessage::createMethodCall( ++ "org.freedesktop.portal.Desktop"_L1, ++ "/org/freedesktop/portal/desktop"_L1, ++ "org.freedesktop.portal.Settings"_L1, "ReadAll"_L1); ++ message << QStringList{ appearanceInterface }; ++ ++ QDBusPendingCall pendingCall = connection.asyncCall(message); ++ QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(pendingCall, this); ++ QObject::connect( ++ watcher, &QDBusPendingCallWatcher::finished, this, ++ [this](QDBusPendingCallWatcher *watcher) { ++ QDBusPendingReply> reply = *watcher; ++ if (reply.isValid()) { ++ QMap settings = reply.value(); ++ if (!settings.isEmpty()) { ++ settingChanged(appearanceInterface, colorSchemeKey, ++ QDBusVariant(settings.value(appearanceInterface).value(colorSchemeKey))); ++ } ++ } else { ++ qCDebug(lcQGtk3PortalInterface) << "Failed to query org.freedesktop.portal.Settings: " ++ << reply.error().message(); ++ } ++ watcher->deleteLater(); ++ }); ++ ++ QDBusConnection::sessionBus().connect( ++ "org.freedesktop.portal.Desktop"_L1, "/org/freedesktop/portal/desktop"_L1, ++ "org.freedesktop.portal.Settings"_L1, "SettingChanged"_L1, this, ++ SLOT(settingChanged(QString, QString, QDBusVariant))); ++} ++ ++void QGtk3PortalInterface::settingChanged(const QString &group, const QString &key, ++ const QDBusVariant &value) ++{ ++ if (group == appearanceInterface && key == colorSchemeKey) { ++ const uint colorScheme = value.variant().toUInt(); ++ // From org.freedesktop.portal.Settings.xml ++ // "1" - Prefer dark appearance ++ Qt::ColorScheme newColorScheme = colorScheme == 1 ? Qt::ColorScheme::Dark : Qt::ColorScheme::Light; ++ if (m_colorScheme != newColorScheme) { ++ m_colorScheme = newColorScheme; ++ if (m_storage) ++ m_storage->handleThemeChange(); ++ } ++ } ++} ++ ++QT_END_NAMESPACE ++ ++#include "moc_qgtk3portalinterface_p.cpp" +diff --git a/src/plugins/platformthemes/gtk3/qgtk3portalinterface_p.h b/src/plugins/platformthemes/gtk3/qgtk3portalinterface_p.h +new file mode 100644 +index 0000000..25a5f58 +--- /dev/null ++++ b/src/plugins/platformthemes/gtk3/qgtk3portalinterface_p.h +@@ -0,0 +1,49 @@ ++// Copyright (C) 2024 The Qt Company Ltd. ++// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only ++ ++#ifndef QGTK3PORTALINTERFACE_H ++#define QGTK3PORTALINTERFACE_H ++ ++// ++// W A R N I N G ++// ------------- ++// ++// This file is not part of the Qt API. It exists purely as an ++// implementation detail. This header file may change from version to ++// version without notice, or even be removed. ++// ++// We mean it. ++// ++ ++#include ++#include ++ ++QT_BEGIN_NAMESPACE ++ ++class QDBusVariant; ++class QGtk3Storage; ++ ++Q_DECLARE_LOGGING_CATEGORY(lcQGtk3PortalInterface); ++ ++class QGtk3PortalInterface : public QObject ++{ ++ Q_OBJECT ++public: ++ QGtk3PortalInterface(QGtk3Storage *s); ++ ~QGtk3PortalInterface() = default; ++ ++ Qt::ColorScheme colorScheme() const; ++ ++private Q_SLOTS: ++ void settingChanged(const QString &group, const QString &key, ++ const QDBusVariant &value); ++private: ++ void queryColorScheme(); ++ ++ Qt::ColorScheme m_colorScheme = Qt::ColorScheme::Unknown; ++ QGtk3Storage *m_storage = nullptr; ++}; ++ ++QT_END_NAMESPACE ++ ++#endif // QGTK3PORTALINTERFACE_H +diff --git a/src/plugins/platformthemes/gtk3/qgtk3storage.cpp b/src/plugins/platformthemes/gtk3/qgtk3storage.cpp +index 90c0282..2877b28 100644 +--- a/src/plugins/platformthemes/gtk3/qgtk3storage.cpp ++++ b/src/plugins/platformthemes/gtk3/qgtk3storage.cpp +@@ -21,6 +21,9 @@ + QGtk3Storage::QGtk3Storage() + { + m_interface.reset(new QGtk3Interface(this)); ++#if QT_CONFIG(dbus) ++ m_portalInterface.reset(new QGtk3PortalInterface(this)); ++#endif + populateMap(); + } + +@@ -273,7 +276,6 @@ + */ + void QGtk3Storage::handleThemeChange() + { +- clear(); + populateMap(); + QWindowSystemInterface::handleThemeChange(); + } +@@ -331,21 +333,32 @@ + static QString m_themeName; + + // Distiguish initialization, theme change or call without theme change ++ Qt::ColorScheme newColorScheme = Qt::ColorScheme::Unknown; + const QString newThemeName = themeName(); +- if (m_themeName == newThemeName) ++ ++#if QT_CONFIG(dbus) ++ // Prefer color scheme we get from xdg-desktop-portal as this is what GNOME ++ // relies on these days ++ newColorScheme = m_portalInterface->colorScheme(); ++#endif ++ ++ if (newColorScheme == Qt::ColorScheme::Unknown) { ++ // Derive color scheme from theme name ++ newColorScheme = newThemeName.contains("dark"_L1, Qt::CaseInsensitive) ++ ? Qt::ColorScheme::Dark : m_interface->colorSchemeByColors(); ++ } ++ ++ if (m_themeName == newThemeName && m_colorScheme == newColorScheme) + return; + + clear(); + +- // Derive color scheme from theme name +- m_colorScheme = newThemeName.contains("dark"_L1, Qt::CaseInsensitive) +- ? Qt::ColorScheme::Dark : m_interface->colorSchemeByColors(); +- + if (m_themeName.isEmpty()) { +- qCDebug(lcQGtk3Interface) << "GTK theme initialized:" << newThemeName << m_colorScheme; ++ qCDebug(lcQGtk3Interface) << "GTK theme initialized:" << newThemeName << newColorScheme; + } else { +- qCDebug(lcQGtk3Interface) << "GTK theme changed to:" << newThemeName << m_colorScheme; ++ qCDebug(lcQGtk3Interface) << "GTK theme changed to:" << newThemeName << newColorScheme; + } ++ m_colorScheme = newColorScheme; + m_themeName = newThemeName; + + // create standard mapping or load from Json file? +diff --git a/src/plugins/platformthemes/gtk3/qgtk3storage_p.h b/src/plugins/platformthemes/gtk3/qgtk3storage_p.h +index 37c5bf5..4519226 100644 +--- a/src/plugins/platformthemes/gtk3/qgtk3storage_p.h ++++ b/src/plugins/platformthemes/gtk3/qgtk3storage_p.h +@@ -16,6 +16,9 @@ + // + + #include "qgtk3interface_p.h" ++#if QT_CONFIG(dbus) ++#include "qgtk3portalinterface_p.h" ++#endif + + #include + #include +@@ -205,7 +208,9 @@ + PaletteMap m_palettes; + + std::unique_ptr m_interface; +- ++#if QT_CONFIG(dbus) ++ std::unique_ptr m_portalInterface; ++#endif + + Qt::ColorScheme m_colorScheme = Qt::ColorScheme::Unknown; + diff --git a/base/qt6/qt6-qtbase/qtbase-tell-the-truth-about-private-API.patch b/base/qt6/qt6-qtbase/qtbase-tell-the-truth-about-private-API.patch deleted file mode 100644 index 4fa1aaf..0000000 --- a/base/qt6/qt6-qtbase/qtbase-tell-the-truth-about-private-API.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake -index 28231cb5..018d697b 100644 ---- a/cmake/QtFlagHandlingHelpers.cmake -+++ b/cmake/QtFlagHandlingHelpers.cmake -@@ -69,7 +69,7 @@ function(qt_internal_add_linker_version_script target) - endforeach() - endforeach() - -- string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}_PRIVATE_API { qt_private_api_tag*;\n") -+ string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}_PRIVATE_API { qt_private_api_tag*;\n") - if(arg_PRIVATE_HEADERS) - foreach(ph ${arg_PRIVATE_HEADERS}) - string(APPEND contents " @FILE:${ph}@\n") diff --git a/base/qt6/qt6-qtbase/qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch b/base/qt6/qt6-qtbase/qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch deleted file mode 100644 index 113d48b..0000000 --- a/base/qt6/qt6-qtbase/qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6810220218cbbf2854ecdedb291f7e4a84b31e54 Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid -Date: Wed, 3 Apr 2024 00:47:01 +0200 -Subject: [PATCH] Use ifdef instead of if for __cpp_lib_span - -Like the other times it's used in this file - -This is causing compilation errors in projects that use -Werror=undef - -Fixes: QTBUG-123937 -Change-Id: I0cdd2910755dc9079890011dd8dbc27a6e64793e -Reviewed-by: Thiago Macieira -(cherry picked from commit 699ddcb15b5e981d32ea65d1c1a12f8fa0b06e0d) -Reviewed-by: Qt Cherry-pick Bot ---- - src/corelib/tools/qspan.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/tools/qspan.h b/src/corelib/tools/qspan.h -index c9de1005a77..d6ae2570ae3 100644 ---- a/src/corelib/tools/qspan.h -+++ b/src/corelib/tools/qspan.h -@@ -297,7 +297,7 @@ class QSpanBase : protected QSpanCommon - : QSpanBase(il.begin(), il.size()) - {} - --#if __cpp_lib_span -+#ifdef __cpp_lib_span - template = true> - Q_IMPLICIT constexpr QSpanBase(std::span other) noexcept - : QSpanBase(other.data(), other.size()) diff --git a/base/qt6/qt6-qtbase/qtbase-use-only-major-minor-for-private-api-tag.patch b/base/qt6/qt6-qtbase/qtbase-use-only-major-minor-for-private-api-tag.patch new file mode 100644 index 0000000..54e38a3 --- /dev/null +++ b/base/qt6/qt6-qtbase/qtbase-use-only-major-minor-for-private-api-tag.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake +index 6a62b85c..1fc1f88d 100644 +--- a/cmake/QtFlagHandlingHelpers.cmake ++++ b/cmake/QtFlagHandlingHelpers.cmake +@@ -71,7 +71,7 @@ function(qt_internal_add_linker_version_script target) + + string(APPEND contents "\n};\nQt_${PROJECT_VERSION_MAJOR}") + if(QT_FEATURE_elf_private_full_version) +- string(APPEND contents ".${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}") ++ string(APPEND contents ".${PROJECT_VERSION_MINOR}") + endif() + string(APPEND contents "_PRIVATE_API { qt_private_api_tag*;\n") + if(arg_PRIVATE_HEADERS) diff --git a/base/qt6/qt6-qtcharts/qt6-qtcharts.spec b/base/qt6/qt6-qtcharts/qt6-qtcharts.spec index 43d73c5..55ec88c 100644 --- a/base/qt6/qt6-qtcharts/qt6-qtcharts.spec +++ b/base/qt6/qt6-qtcharts/qt6-qtcharts.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Charts component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -32,9 +32,7 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{version} BuildRequires: qt6-qtmultimedia-devel >= %{version} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 - -Requires: rx-libxkbcommon +BuildRequires: pkgconfig(xkbcommon) %description Qt Charts module provides a set of easy to use chart components. It uses the Qt Graphics View Framework, therefore charts can be easily @@ -62,9 +60,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -106,8 +101,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtcoap/qt6-qtcoap.spec b/base/qt6/qt6-qtcoap/qt6-qtcoap.spec index 28e064c..eed3b88 100644 --- a/base/qt6/qt6-qtcoap/qt6-qtcoap.spec +++ b/base/qt6/qt6-qtcoap/qt6-qtcoap.spec @@ -1,15 +1,10 @@ %global qt_module qtcoap -#global unstable 1 -%if 0%{?unstable} -%global prerelease rc2 -%endif - %global examples 1 Summary: Qt6 - CoAP component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -17,11 +12,7 @@ Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) %global qt_version %(echo %{version} | cut -d~ -f1) -%if 0%{?unstable} -Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz -%else -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz -%endif +Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{version}/%{qt_module}-%{version}.tar.gz ## upstreamable patches @@ -54,7 +45,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %endif %prep -%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 +%autosetup -n %{qt_module}-%{qt_version} -p1 %build @@ -93,6 +84,9 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0 diff --git a/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec b/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec index fc3d7b5..2a33db2 100644 --- a/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec +++ b/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Connectivity components Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} # See LICENSE.GPL3, respectively, for exception details @@ -37,7 +37,7 @@ BuildRequires: qt6-qtbase-private-devel >= %{version} %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{version} BuildRequires: pkgconfig(bluez) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(openssl) %description @@ -64,9 +64,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -125,8 +122,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtdeclarative/qquickselectiontriangle-fix-crash-when-target-is-null.patch b/base/qt6/qt6-qtdeclarative/qquickselectiontriangle-fix-crash-when-target-is-null.patch deleted file mode 100644 index f92628b..0000000 --- a/base/qt6/qt6-qtdeclarative/qquickselectiontriangle-fix-crash-when-target-is-null.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ab88fcd990523070f2c018f4599b9bfa023d3b95 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Fri, 01 Mar 2024 22:44:05 +0100 -Subject: [PATCH] QQuickSelectionRectangle: Fix crash when target is null - -Pick-to: 6.7 6.6 -Change-Id: I9eb92583f2cfe1a0a6bee54e3e3f31528c3b6993 -Reviewed-by: Richard Moe Gustavsen ---- - -diff --git a/src/quicktemplates/qquickselectionrectangle.cpp b/src/quicktemplates/qquickselectionrectangle.cpp -index f4543f0..7ef9996 100644 ---- a/src/quicktemplates/qquickselectionrectangle.cpp -+++ b/src/quicktemplates/qquickselectionrectangle.cpp -@@ -491,7 +491,7 @@ - m_tapHandler->setEnabled(enabled); - - if (m_selectionMode == QQuickSelectionRectangle::Auto) { -- if (qobject_cast(m_target->parentItem())) { -+ if (m_target && qobject_cast(m_target->parentItem())) { - // ScrollView allows flicking with touch, but not with mouse. So we do - // the same here: you can drag to select with a mouse, but not with touch. - m_effectiveSelectionMode = QQuickSelectionRectangle::Drag; diff --git a/base/qt6/qt6-qtdeclarative/qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch b/base/qt6/qt6-qtdeclarative/qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch deleted file mode 100644 index a1944af..0000000 --- a/base/qt6/qt6-qtdeclarative/qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 121fcc597d7d756737613570ac05a09911cec265 Mon Sep 17 00:00:00 2001 -From: Ulf Hermann -Date: Tue, 26 Mar 2024 12:09:23 +0100 -Subject: [PATCH] QQuickTextEdit: Check QQuickAccessibleAttached for nullptr - -If the host object is in the process of being deleted, the attached -object will be null. We cannot rule this out here, and crashes have been -reported. - -Amends commmit 12517742fcbd40b2311b94abe840532eae3d8914 - -Pick-to: 6.7 -Change-Id: I31fcab2999c8ab8c20f3a2cd58060cbbefa7de40 ---- - -diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp -index 006d235..66615d9 100644 ---- a/src/quick/items/qquicktextedit.cpp -+++ b/src/quick/items/qquicktextedit.cpp -@@ -1015,10 +1015,11 @@ - return; - - Q_Q(QQuickTextEdit); -- QQuickAccessibleAttached *accessibleAttached = qobject_cast(qmlAttachedPropertiesObject(q, true)); -- Q_ASSERT(accessibleAttached); -- accessibleAttached->setRole(effectiveAccessibleRole()); -- accessibleAttached->set_readOnly(q->isReadOnly()); -+ if (QQuickAccessibleAttached *accessibleAttached = qobject_cast( -+ qmlAttachedPropertiesObject(q, true))) { -+ accessibleAttached->setRole(effectiveAccessibleRole()); -+ accessibleAttached->set_readOnly(q->isReadOnly()); -+ } - } - - QAccessible::Role QQuickTextEditPrivate::accessibleRole() const diff --git a/base/qt6/qt6-qtdeclarative/qt6-qtdeclarative.spec b/base/qt6/qt6-qtdeclarative/qt6-qtdeclarative.spec index 7089291..f6f769a 100644 --- a/base/qt6/qt6-qtdeclarative/qt6-qtdeclarative.spec +++ b/base/qt6/qt6-qtdeclarative/qt6-qtdeclarative.spec @@ -15,7 +15,7 @@ Summary: Qt6 - QtDeclarative component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -34,8 +34,6 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod Source5: qv4global_p-multilib.h ## upstream patches -Patch0: qquickselectiontriangle-fix-crash-when-target-is-null.patch -Patch1: qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch ## upstreamable patches @@ -57,7 +55,7 @@ BuildRequires: qt6-qtshadertools-devel >= %{version} BuildRequires: qt6-qtsvg-devel >= %{version} %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: python%{python3_pkgversion} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %if 0%{?tests} BuildRequires: dbus-x11 @@ -66,7 +64,6 @@ BuildRequires: time BuildRequires: xorg-x11-server-Xvfb %endif -Requires: rx-libxkbcommon Obsoletes: qt6-qtquickcontrols2 < 6.2.0~beta3-1 Provides: qt6-qtquickcontrols2 = %{version}-%{release} @@ -117,9 +114,6 @@ export CXX=clang++ %else %enable_devtoolset13 %endif -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} @@ -288,7 +282,7 @@ make check -k -C tests ||: %{_qt6_libdir}/libQt6Quick*.so %{_qt6_libdir}/libQt6QmlXmlListModel.so %{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json -%{_qt6_libdir}/qt6/objects-RelWithDebInfo/QmlTypeRegistrarPrivate_resources_1/.rcc/qrc_jsRootMetaTypes_init.cpp.o +%{_qt6_libdir}/qt6/objects-RelWithDebInfo/QmlTypeRegistrarPrivate_resources_1/.qt/rcc/qrc_jsRootMetaTypes_init.cpp.o %{_qt6_archdatadir}/mkspecs/modules/*.pri %{_qt6_archdatadir}/mkspecs/features/*.prf %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake @@ -387,8 +381,11 @@ make check -k -C tests ||: %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec b/base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec index c2eb88a..f701402 100644 --- a/base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec +++ b/base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec @@ -1,7 +1,7 @@ %global qt_module qtgraphs Name: qt6-qtgraphs -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} %global examples 1 @@ -103,6 +103,9 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0 diff --git a/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec b/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec index 78cac71..0cd82bd 100644 --- a/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec +++ b/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec @@ -4,7 +4,7 @@ %global examples 1 Name: qt6-qthttpserver -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} Summary: Library to facilitate the creation of an http server with Qt @@ -57,9 +57,6 @@ to the usage of %{name}. %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -95,8 +92,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec b/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec index 3234ad5..6b2c101 100644 --- a/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec +++ b/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec @@ -8,7 +8,7 @@ Summary: Qt6 - QtImageFormats component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -33,9 +33,8 @@ BuildRequires: qt6-qtbase-private-devel BuildRequires: libtiff-devel BuildRequires: jasper-devel BuildRequires: pkgconfig(libmng) -BuildRequires: pkgconfig(libwebp) >= 1.2 +BuildRequires: pkgconfig(libwebp) -Requires: rx-libwebp # filter plugin provides %global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$ @@ -63,10 +62,6 @@ rm -rv src/3rdparty %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 -DQT_FEATURE_mng=ON %cmake_build @@ -91,8 +86,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec b/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec index d2cc766..4938a6e 100644 --- a/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec +++ b/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec @@ -8,7 +8,7 @@ Summary: Qt6 - LanguageServer component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -81,6 +81,9 @@ Requires: qt6-qtbase-devel%{?_isa} %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0 diff --git a/base/qt6/qt6-qtlocation/qt6-qtlocation.spec b/base/qt6/qt6-qtlocation/qt6-qtlocation.spec index 7c08f49..8137999 100644 --- a/base/qt6/qt6-qtlocation/qt6-qtlocation.spec +++ b/base/qt6/qt6-qtlocation/qt6-qtlocation.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Location Libraries Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} # Rest of the licenses are for Qt code in src/location and src/plugins @@ -38,7 +38,7 @@ BuildRequires: qt6-qtbase-private-devel BuildRequires: qt6-qtdeclarative-devel >= %{version} BuildRequires: qt6-qtpositioning-devel >= %{version} BuildRequires: qt6-qtshadertools-devel >= %{version} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %description @@ -73,9 +73,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} # we update this change. Until such time... # Disable LTO %global _lto_cflags %{nil} -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" +export LDFLAGS="${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -127,8 +125,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtlottie/qt6-qtlottie.spec b/base/qt6/qt6-qtlottie/qt6-qtlottie.spec index 2b5673c..a3b74a7 100644 --- a/base/qt6/qt6-qtlottie/qt6-qtlottie.spec +++ b/base/qt6/qt6-qtlottie/qt6-qtlottie.spec @@ -8,7 +8,7 @@ Summary: Qt6 - Lottie Animation Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -29,7 +29,7 @@ BuildRequires: qt6-qtbase-devel >= %{version} BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{version} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(openssl) >= 3.0 %description @@ -50,9 +50,6 @@ Requires: qt6-qtbase-devel%{?_isa} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 @@ -82,8 +79,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec b/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec index a52eba1..294067c 100644 --- a/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec +++ b/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec @@ -1,7 +1,7 @@ %global qt_module qtmqtt Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} Summary: Qt6 - Mqtt module @@ -41,9 +41,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" + %cmake_qt6 %cmake_build @@ -71,6 +69,9 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %{_qt6_examplesdir} %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0 diff --git a/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec b/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec index 5537240..954dce6 100644 --- a/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec +++ b/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec @@ -16,7 +16,7 @@ Summary: Qt6 - Multimedia support Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -75,11 +75,11 @@ BuildRequires: pkgconfig(libva) pkgconfig(libva-drm) %endif BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xv) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(openssl) # workaround missing dep # /usr/include/gstreamer-1.0/gst/gl/wayland/gstgldisplay_wayland.h:26:10: fatal error: wayland-client.h: No such file or directory -BuildRequires: rx-wayland-devel + %description The Qt Multimedia module provides a rich feature set that enables you to @@ -115,9 +115,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %if 0%{?rhel} < 10 %enable_devtoolset13 %endif -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} @@ -159,6 +156,7 @@ popd %endif %files devel +%{_qt6_headerdir}/QtQGstreamerMediaPlugin/ %{_qt6_headerdir}/QtMultimedia/ %{_qt6_headerdir}/QtMultimediaQuick/ %{_qt6_headerdir}/QtMultimediaWidgets/ @@ -167,6 +165,8 @@ popd %{_qt6_libdir}/libQt6BundledResonanceAudio.a %{_qt6_libdir}/libQt6Multimedia.so %{_qt6_libdir}/libQt6Multimedia.prl +%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.a +%{_qt6_libdir}/libQt6QGstreamerMediaPlugin.prl %{_qt6_libdir}/libQt6MultimediaQuick.so %{_qt6_libdir}/libQt6MultimediaQuick.prl %{_qt6_libdir}/libQt6MultimediaWidgets.so @@ -179,6 +179,8 @@ popd %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake %dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/ %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/ +%{_qt6_libdir}/cmake/Qt6QGstreamerMediaPluginPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate %{_qt6_libdir}/cmake/Qt6MultimediaQuickPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6Multimedia @@ -204,11 +206,14 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Mon May 13 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Sat Dec 16 2023 Raven - 6.6.1-1 -- update to 6.6.1 +- 6.6.1 * Fri Jul 21 2023 Jan Grulich - 6.5.2-1 - 6.5.2 diff --git a/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec b/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec index 2c5c10c..8eee1cf 100644 --- a/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec +++ b/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec @@ -10,7 +10,7 @@ Summary: Qt6 - NetworkAuth component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -33,7 +33,7 @@ BuildRequires: ninja-build BuildRequires: qt6-qtbase-devel >= %{version} BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %description %{summary} @@ -59,9 +59,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" + %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -111,8 +109,11 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtopcua/.cmake.conf b/base/qt6/qt6-qtopcua/.cmake.conf new file mode 100644 index 0000000..bb318d5 --- /dev/null +++ b/base/qt6/qt6-qtopcua/.cmake.conf @@ -0,0 +1,7 @@ +set(QT_REPO_MODULE_VERSION "6.7.1") +set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") + +set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_LEAN_HEADERS=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") +list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff --git a/base/qt6/qt6-qtopcua/.tag b/base/qt6/qt6-qtopcua/.tag new file mode 100644 index 0000000..53ff672 --- /dev/null +++ b/base/qt6/qt6-qtopcua/.tag @@ -0,0 +1 @@ +93be31dae3335f84c7c9eebf798571543c1a390e diff --git a/base/qt6/qt6-qtopcua/qt6-qtopcua.spec b/base/qt6/qt6-qtopcua/qt6-qtopcua.spec index 2e6cd03..a0ea241 100644 --- a/base/qt6/qt6-qtopcua/qt6-qtopcua.spec +++ b/base/qt6/qt6-qtopcua/qt6-qtopcua.spec @@ -1,15 +1,10 @@ %global qt_module qtopcua -#global unstable 1 -%if 0%{?unstable} -%global prerelease rc2 -%endif - %global examples 1 Summary: Qt6 - OPC UA component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -17,11 +12,7 @@ Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) %global qt_version %(echo %{version} | cut -d~ -f1) -%if 0%{?unstable} -Source0: https://download.qt.io/development_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}-%{prerelease}.tar.xz -%else -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz -%endif +Source0: https://github.com/qt/%{qt_module}/archive/refs/tags/v%{version}/%{qt_module}-%{version}.tar.gz ## upstreamable patches @@ -57,7 +48,7 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %endif %prep -%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 +%autosetup -n %{qt_module}-%{qt_version} -p1 %build @@ -109,8 +100,11 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release} %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Fri Dec 08 2023 Marie Loise Nolden - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec b/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec index 8c9162e..3d55b03 100644 --- a/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec +++ b/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Positioning component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -50,7 +50,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libssl) BuildRequires: pkgconfig(libcrypto) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %description @@ -87,9 +87,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -151,8 +148,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec b/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec index e5d4a12..49a7f1a 100644 --- a/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec +++ b/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Quick3D Libraries and utilities Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -254,6 +254,9 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0 diff --git a/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec b/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec index 4665a68..649f219 100644 --- a/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec +++ b/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec @@ -8,7 +8,7 @@ Summary: Qt6 - QuickTimeline plugin Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -95,6 +95,9 @@ Requires: qt6-qtdeclarative-devel%{?_isa} %{_qt6_libdir}/pkgconfig/*.pc %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0 diff --git a/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec b/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec index 5180533..31e7521 100644 --- a/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec +++ b/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Qt Remote Objects Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -33,7 +33,7 @@ BuildRequires: qt6-qtbase-private-devel #libQt6Core.so.6(Qt_5_PRIVATE_API)(64bit) %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %description Qt Remote Objects (QtRO) is an inter-process communication (IPC) module developed for Qt. @@ -61,10 +61,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -114,8 +110,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtscxml/qt6-qtscxml.spec b/base/qt6/qt6-qtscxml/qt6-qtscxml.spec index bba4448..339ff1d 100644 --- a/base/qt6/qt6-qtscxml/qt6-qtscxml.spec +++ b/base/qt6/qt6-qtscxml/qt6-qtscxml.spec @@ -10,7 +10,7 @@ Summary: Qt6 - ScXml component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -31,7 +31,7 @@ BuildRequires: qt6-qtbase-devel >= %{version} BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{version} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: openssl3-devel %description @@ -63,9 +63,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -122,8 +119,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtsensors/qt6-qtsensors.spec b/base/qt6/qt6-qtsensors/qt6-qtsensors.spec index 63c5ce4..524d99b 100644 --- a/base/qt6/qt6-qtsensors/qt6-qtsensors.spec +++ b/base/qt6/qt6-qtsensors/qt6-qtsensors.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Sensors component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details @@ -38,7 +38,7 @@ BuildRequires: qt6-qtbase-private-devel BuildRequires: qt6-qtdeclarative-devel >= %{version} BuildRequires: qt6-qtsvg-devel >= %{version} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: openssl3-devel # provides a plugin that can use iio-sensor-proxy @@ -72,10 +72,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -133,8 +129,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec b/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec index f16916e..4626989 100644 --- a/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec +++ b/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec @@ -10,7 +10,7 @@ Summary: Qt6 - SerialBus component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -38,7 +38,7 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtserialport-devel >= %{version} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: openssl3-devel %description @@ -68,10 +68,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -110,8 +106,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtserialport/qt6-qtserialport.spec b/base/qt6/qt6-qtserialport/qt6-qtserialport.spec index 590059b..a04a5cf 100644 --- a/base/qt6/qt6-qtserialport/qt6-qtserialport.spec +++ b/base/qt6/qt6-qtserialport/qt6-qtserialport.spec @@ -10,7 +10,7 @@ Summary: Qt6 - SerialPort component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details @@ -109,8 +109,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec b/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec index e52fd53..45168b9 100644 --- a/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec +++ b/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec @@ -8,7 +8,7 @@ Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -32,7 +32,7 @@ BuildRequires: ninja-build BuildRequires: qt6-qtbase-devel >= %{version} BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %description %{summary}. @@ -51,9 +51,7 @@ Requires: qt6-qtbase-devel%{?_isa} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" + %cmake_qt6 %cmake_build @@ -114,8 +112,11 @@ popd %{_qt6_libdir}/pkgconfig/Qt6ShaderTools.pc %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtspeech/qt6-qtspeech.spec b/base/qt6/qt6-qtspeech/qt6-qtspeech.spec index 3bf1362..902cbef 100644 --- a/base/qt6/qt6-qtspeech/qt6-qtspeech.spec +++ b/base/qt6/qt6-qtspeech/qt6-qtspeech.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Speech component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} # Code can be either LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only @@ -147,6 +147,9 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 - update to 6.7.0 diff --git a/base/qt6/qt6-qtsvg/qt6-qtsvg.spec b/base/qt6/qt6-qtsvg/qt6-qtsvg.spec index 69cf866..9b0da03 100644 --- a/base/qt6/qt6-qtsvg/qt6-qtsvg.spec +++ b/base/qt6/qt6-qtsvg/qt6-qtsvg.spec @@ -10,7 +10,7 @@ Summary: Qt6 - Support for rendering and displaying SVG Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -32,7 +32,7 @@ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: qt6-qtbase-devel >= %{version} BuildRequires: pkgconfig(zlib) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} @@ -64,9 +64,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -122,8 +119,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qttools/qt6-qttools.spec b/base/qt6/qt6-qttools/qt6-qttools.spec index 3729939..3955b54 100644 --- a/base/qt6/qt6-qttools/qt6-qttools.spec +++ b/base/qt6/qt6-qttools/qt6-qttools.spec @@ -9,8 +9,8 @@ Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.7.0 -Release: 2%{?dist} +Version: 6.7.1 +Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -48,9 +48,9 @@ BuildRequires: qt6-qtbase-static >= %{version} BuildRequires: qt6-qtdeclarative-static >= %{version} BuildRequires: qt6-qtdeclarative >= %{version} %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} -BuildRequires: llvm-devel clang-devel >= 17.0 +BuildRequires: llvm-devel clang-devel BuildRequires: libzstd-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) Requires: %{name}-common = %{version}-%{release} @@ -74,7 +74,7 @@ Requires: qt6-doctools = %{version}-%{release} Requires: qt6-designer = %{version}-%{release} Requires: qt6-linguist = %{version}-%{release} Requires: qt6-qtbase-devel%{?_isa} -Requires: pkgconfig(xkbcommon) >= 1.3 +Requires: pkgconfig(xkbcommon) %description devel %{summary}. @@ -153,10 +153,6 @@ Requires: %{name}-common = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -367,6 +363,9 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Mon May 27 2024 Raven - 6.7.0-2 - rebuilt for new llvm diff --git a/base/qt6/qt6-qttranslations/qt6-qttranslations.spec b/base/qt6/qt6-qttranslations/qt6-qttranslations.spec index a474613..2ac8f0d 100644 --- a/base/qt6/qt6-qttranslations/qt6-qttranslations.spec +++ b/base/qt6/qt6-qttranslations/qt6-qttranslations.spec @@ -7,7 +7,7 @@ Summary: Qt6 - QtTranslations module Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -107,6 +107,7 @@ Provides: %{_qt6}-zh_TW = %{version}-%{release} %lang(hr) %{_qt6_translationdir}/*_hr.qm %lang(it) %{_qt6_translationdir}/*_it.qm %lang(ja) %{_qt6_translationdir}/*_ja.qm +%lang(ka) %{_qt6_translationdir}/*_ka.qm %lang(ko) %{_qt6_translationdir}/*_ko.qm %lang(lt) %{_qt6_translationdir}/*_lt.qm %lang(lv) %{_qt6_translationdir}/*_lv.qm @@ -126,8 +127,11 @@ Provides: %{_qt6}-zh_TW = %{version}-%{release} %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec b/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec index b66c1d5..2800731 100644 --- a/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec +++ b/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec @@ -10,7 +10,7 @@ Summary: Qt6 - VirtualKeyboard component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -78,10 +78,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -132,8 +128,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtwayland/qt6-qtwayland.spec b/base/qt6/qt6-qtwayland/qt6-qtwayland.spec index ebf351f..8d232c7 100644 --- a/base/qt6/qt6-qtwayland/qt6-qtwayland.spec +++ b/base/qt6/qt6-qtwayland/qt6-qtwayland.spec @@ -1,6 +1,3 @@ -%global _rxlibdir /opt/rx/%{_lib} -%global _rxincludedir /opt/rx/include - %global qt_module qtwayland #global unstable 1 @@ -12,7 +9,7 @@ Summary: Qt6 - Wayland platform support and QtCompositor module Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -44,10 +41,10 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wayland-client) >= 1.22 +BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(egl) @@ -55,16 +52,10 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(libinput) >= 1.22 +BuildRequires: pkgconfig(libinput) BuildRequires: libXext-devel -Requires: rx-libwayland-egl -Requires: rx-libwayland-client -Requires: rx-libwayland-cursor -Requires: rx-libwayland-server -Requires: rx-libinput -Requires: rx-libxkbcommon %description %{summary}. @@ -92,8 +83,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} @@ -187,8 +176,11 @@ popd %endif %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Fri Mar 1 2024 Raven - 6.6.1-2 - link with newer versions of libinput and libwayland diff --git a/base/qt6/qt6-qtwebchannel/qt6-qtwebchannel.spec b/base/qt6/qt6-qtwebchannel/qt6-qtwebchannel.spec index e72c5f1..f6f1524 100644 --- a/base/qt6/qt6-qtwebchannel/qt6-qtwebchannel.spec +++ b/base/qt6/qt6-qtwebchannel/qt6-qtwebchannel.spec @@ -10,7 +10,7 @@ Summary: Qt6 - WebChannel component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -35,7 +35,7 @@ BuildRequires: qt6-qtbase-private-devel BuildRequires: qt6-qtdeclarative-devel BuildRequires: qt6-qtwebsockets-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: openssl3-devel %description @@ -66,10 +66,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -127,8 +123,11 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine b/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine index 040d584..c2f9d82 100644 --- a/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine +++ b/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine @@ -2,5 +2,3 @@ %_qt6_qtwebengine_epoch @@EPOCH@@ %_qt6_qtwebengine_version @@VERSION@@ %_qt6_qtwebengine_evr @@EVR@@ - -%qt6_qtwebengine_arches %{ix86} x86_64 %{arm} aarch64 \ No newline at end of file diff --git a/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec b/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec index 76d6eef..ec2b254 100644 --- a/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec +++ b/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec @@ -1,10 +1,13 @@ %global qt_module qtwebengine %global _hardened_build 1 -#global _qt6_build_type MinSizeRel - +# use clang by default +%bcond_without clang %bcond_with optimize_size -%bcond_with clang + +%if %{with optimize_size} +%global _qt6_build_type MinSizeRel +%endif %global use_system_ffmpeg 1 @@ -19,12 +22,12 @@ %if 0%{?fedora} > 30 || 0%{?epel} > 7 %global use_system_jsoncpp 1 -%global use_system_libwebp 1 -%global use_system_harfbuzz 1 %endif %if 0%{?fedora} || 0%{?rhel} >= 9 %global use_system_re2 1 +%global use_system_harfbuzz 1 +%global use_system_libwebp 1 %endif %if 0%{?fedora} > 34 || 0%{?rhel} >= 8 @@ -60,7 +63,7 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine Version: 6.7.1 -Release: 1%{?dist} +Release: 2%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-6.0/qtdoc/licensing.html @@ -171,7 +174,7 @@ BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) %if 0%{?use_system_libwebp} -BuildRequires: pkgconfig(libwebp) >= 1.2.0 +BuildRequires: pkgconfig(libwebp) %endif %if 0%{?use_system_harfbuzz} BuildRequires: pkgconfig(harfbuzz) >= 2.0 @@ -210,7 +213,7 @@ BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xshmfence) BuildRequires: python3-html5lib @@ -394,6 +397,7 @@ Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} Requires: qt6-qtbase-devel%{?_isa} Requires: qt6-qtdeclarative-devel%{?_isa} +Requires: qt6-srpm-macros # not arch'd for now, see if can get away with avoiding multilib'ing -- rex Requires: %{name} = %{version}-%{release} %description devel @@ -482,11 +486,6 @@ export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflag %endif %cmake_qt6 \ -%if %{with optimize_size} - -DCMAKE_BUILD_TYPE=MinSizeRel \ -%else - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -%endif -DCMAKE_TOOLCHAIN_FILE:STRING="%{_qt6_libdir}/cmake/Qt6/qt.toolchain.cmake" \ -DCMAKE_C_FLAGS:STRING="$CFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$CXXFLAGS" \ @@ -607,6 +606,9 @@ rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6BuildInternals %changelog +* Mon May 27 2024 Raven - 6.7.1-2 +- rebuilt for qt 6.7.1 + * Thu May 16 2024 Raven - 6.7.1-1 - update to 6.7.1 diff --git a/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec b/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec index 7ee1b85..1012f86 100644 --- a/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec +++ b/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec @@ -10,7 +10,7 @@ Summary: Qt6 - WebSockets component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -37,7 +37,7 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) BuildRequires: pkgconfig(openssl) %description @@ -66,9 +66,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ @@ -120,8 +117,11 @@ popd %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Mon Nov 27 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6-qtwebview/qt6-qtwebview.spec b/base/qt6/qt6-qtwebview/qt6-qtwebview.spec index ef754b9..d05ce7c 100644 --- a/base/qt6/qt6-qtwebview/qt6-qtwebview.spec +++ b/base/qt6/qt6-qtwebview/qt6-qtwebview.spec @@ -4,7 +4,7 @@ Summary: Qt6 - WebView component Name: qt6-%{qt_module} -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -24,7 +24,7 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{version} BuildRequires: qt6-qtwebengine-devel -BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon) %description Qt WebView provides a way to display web content in a QML application @@ -54,10 +54,6 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %enable_devtoolset13 -%global _rxlibdir /opt/rx/%{_lib} -export PKG_CONFIG_PATH=%{_rxlibdir}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} -export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldflags}" - %cmake_qt6 \ -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} @@ -105,8 +101,11 @@ export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} ${LDFLAGS:-%__global_ldfl %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Wed May 8 2024 Raven - 6.7.0-1 -- update to 6.7.0 +- 6.7.0 * Tue Nov 28 2023 Jan Grulich - 6.6.1-1 - 6.6.1 diff --git a/base/qt6/qt6/qt6.spec b/base/qt6/qt6/qt6.spec index f981ae4..f6a290b 100644 --- a/base/qt6/qt6/qt6.spec +++ b/base/qt6/qt6/qt6.spec @@ -1,6 +1,6 @@ Name: qt6 -Version: 6.7.0 +Version: 6.7.1 Release: 1%{?dist} Summary: Qt6 meta package License: GPL-3.0-only @@ -51,7 +51,6 @@ Requires: qt6-qtwebsockets Summary: Qt6 meta devel package Requires: qt6-designer Requires: qt6-linguist -Requires: qt6-qdoc Requires: qt6-qhelpgenerator Requires: qt6-qt3d-devel Requires: qt6-qt5compat-devel @@ -90,6 +89,7 @@ Requires: qt6-rpm-macros %package rpm-macros Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages Requires: cmake >= 3.29 +Requires: ninja-build >= 1.11 Requires: gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-plugin-annobin %description rpm-macros %{summary}. @@ -148,6 +148,9 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README %changelog +* Mon May 27 2024 Raven - 6.7.1-1 +- 6.7.1 + * Tue Apr 02 2024 Jan Grulich - 6.7.0-1 - 6.7.0