diff --git a/base/qt6/polkit-qt/polkit-qt-1.spec b/base/qt6/polkit-qt/polkit-qt-1.spec index e18032c..bb0d5eb 100644 --- a/base/qt6/polkit-qt/polkit-qt-1.spec +++ b/base/qt6/polkit-qt/polkit-qt-1.spec @@ -2,7 +2,7 @@ Name: polkit-qt-1 Version: 0.114.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Qt bindings for PolicyKit License: GPLv2+ diff --git a/base/qt6/python-pyqt6/pyqt-disable-axcontainer.patch b/base/qt6/python-pyqt6/pyqt-disable-axcontainer.patch deleted file mode 100644 index 0a24aa8..0000000 --- a/base/qt6/python-pyqt6/pyqt-disable-axcontainer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Naur a/project.py b/project.py ---- a/project.py 2023-12-01 01:22:34.326570700 +0600 -+++ b/project.py 2023-12-19 08:36:07.045689007 +0600 -@@ -52,8 +52,7 @@ - QtSvg, QtSvgWidgets, QtTest, QtXml, QtMultimedia, - QtMultimediaWidgets, QtPositioning, QtRemoteObjects, QtSensors, - QtSerialPort, QtWebChannel, QtWebSockets, QtBluetooth, QtNfc, -- QtPdf, QtPdfWidgets, QtSpatialAudio, QtTextToSpeech, -- QAxContainer] -+ QtPdf, QtPdfWidgets, QtSpatialAudio, QtTextToSpeech] - - def apply_user_defaults(self, tool): - """ Set default values where needed. """ diff --git a/base/qt6/python-pyqt6/python-pyqt6.spec b/base/qt6/python-pyqt6/python-pyqt6.spec index e1d5d07..41bb32b 100644 --- a/base/qt6/python-pyqt6/python-pyqt6.spec +++ b/base/qt6/python-pyqt6/python-pyqt6.spec @@ -2,30 +2,28 @@ %global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])" 2>/dev/null || echo "%{python3_sitearch}/dbus/mainloop") %endif +#define snap dev2404051544 Summary: PyQt6 is Python bindings for Qt6 Name: python-pyqt6 -Version: 6.6.1 -Release: 1%{?dist} +Version: 6.7.0 +Release: 1%{?snap:^%{snap}}%{?dist} License: gpl-3.0-only Url: http://www.riverbankcomputing.com/software/pyqt/ -Source0: https://pypi.python.org/packages/source/P/PyQt6/PyQt6-%{version}.tar.gz +Source0: https://pypi.python.org/packages/source/P/PyQt6/PyQt6-%{version}%{?snap:.%{snap}}.tar.gz Source1: macros.pyqt6 -Patch0: pyqt-disable-axcontainer.patch - BuildRequires: make BuildRequires: chrpath BuildRequires: findutils BuildRequires: cmake -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-python) BuildRequires: pkgconfig(libpulse-mainloop-glib) BuildRequires: qt6-qtbase-private-devel -BuildRequires: qt6-srpm-macros BuildRequires: cmake(Qt6Core) BuildRequires: cmake(Qt6Bluetooth) @@ -36,9 +34,11 @@ BuildRequires: cmake(Qt6Multimedia) BuildRequires: cmake(Qt6Nfc) BuildRequires: cmake(Qt6Network) BuildRequires: cmake(Qt6OpenGL) +%if 0%{?fedora} || 0%{?epel} %ifarch %{qt6_qtwebengine_arches} BuildRequires: cmake(Qt6Pdf) cmake(Qt6PdfWidgets) %endif +%endif BuildRequires: cmake(Qt6Positioning) BuildRequires: cmake(Qt6Quick) cmake(Qt6QuickWidgets) BuildRequires: cmake(Qt6Sensors) @@ -56,7 +56,7 @@ BuildRequires: cmake(Qt6RemoteObjects) BuildRequires: python%{python3_pkgversion}-devel python%{python3_pkgversion} BuildRequires: python%{python3_pkgversion}-dbus -BuildRequires: %{py3_dist PyQt-builder} >= 1.15.0 +BuildRequires: %{py3_dist PyQt-builder} >= 1.1.0 BuildRequires: %{py3_dist sip} %description @@ -116,11 +116,11 @@ BuildArch: noarch %prep %autosetup -n PyQt6-%{version}%{?snap:.%{snap}} -p1 - %build +%enable_devtoolset13 PATH=%{_qt6_bindir}:$PATH ; export PATH - +%global _rxlibdir /opt/rx/%{_lib} # Python 3 build: sip-build \ @@ -132,9 +132,9 @@ sip-build \ --verbose \ --dbus=%{_includedir}/dbus-1.0/ \ --pep484-pyi \ - --qmake-setting 'QMAKE_CFLAGS_RELEASE=%{build_cflags}' \ + --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="%{build_ldflags}"' + --qmake-setting 'QMAKE_LFLAGS_RELEASE="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} %{build_ldflags}"' %make_build -C build @@ -176,10 +176,12 @@ sed -i \ %{python3_sitearch}/PyQt6/QtMultimedia.* %{python3_sitearch}/PyQt6/QtMultimediaWidgets.* %{python3_sitearch}/PyQt6/QtNfc.* +%if 0%{?fedora} || 0%{?epel} %ifarch %{qt6_qtwebengine_arches} %{python3_sitearch}/PyQt6/QtPdf.* %{python3_sitearch}/PyQt6/QtPdfWidgets.* %endif +%endif %{python3_sitearch}/PyQt6/QtPositioning.* %{python3_sitearch}/PyQt6/QtQml.* %{python3_sitearch}/PyQt6/QtQuick.* @@ -198,7 +200,7 @@ sed -i \ %files -n python%{python3_pkgversion}-pyqt6-base -%doc NEWS README +%doc NEWS %license LICENSE %{python3_dbus_dir}/pyqt6.abi3.so %dir %{python3_sitearch}/PyQt6/ @@ -241,6 +243,27 @@ sed -i \ %changelog +* Fri Apr 26 2024 Jan Grulich - 6.7.0-1 +- Update to 6.7.0 + +* Mon Apr 08 2024 Jan Grulich - 6.7.0-0.1^dev2404051544 +- Update to snapshot of 6.7.0 + +* Thu Apr 04 2024 Jan Grulich - 6.6.1-6 +- Rebuild (qt6) + +* Fri Feb 16 2024 Jan Grulich - 6.6.1-5 +- Rebuild (qt6) + +* Mon Jan 29 2024 Fedora Release Engineering - 6.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Dec 06 2023 Jonathan Wright - 6.6.1-1 - Update to 6.1.2 rhbz#2252735 diff --git a/base/qt6/qca/qca.spec b/base/qt6/qca/qca.spec index b168c95..b42d365 100644 --- a/base/qt6/qca/qca.spec +++ b/base/qt6/qca/qca.spec @@ -11,7 +11,7 @@ Name: qca Summary: Qt Cryptographic Architecture Version: 2.3.7 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ URL: https://userbase.kde.org/QCA @@ -420,6 +420,9 @@ test "$(pkg-config --modversion qca2-qt6)" = "%{version}" %endif %changelog +* Thu May 16 2024 Raven - 2.3.7-4 +- Rebuild for new qt6 + * Fri Jan 26 2024 Fedora Release Engineering - 2.3.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/base/qt6/qcoro/qcoro.spec b/base/qt6/qcoro/qcoro.spec index d2df898..cf96367 100644 --- a/base/qt6/qcoro/qcoro.spec +++ b/base/qt6/qcoro/qcoro.spec @@ -15,7 +15,7 @@ application remains responsive.} Name: qcoro Version: 0.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Summary: C++ Coroutines for Qt @@ -45,7 +45,7 @@ BuildRequires: cmake(Qt6Quick) BuildRequires: cmake(Qt6Test) BuildRequires: cmake(Qt6WebSockets) BuildRequires: cmake(Qt6Widgets) -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon) >= 1.3 BuildRequires: qt6-qtbase-private-devel %endif @@ -53,6 +53,7 @@ BuildRequires: cmake BuildRequires: dbus-x11 %if 0%{?rhel} < 9 BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: gcc-toolset-13-gcc-plugin-annobin %else BuildRequires: gcc-c++ %endif @@ -85,6 +86,7 @@ Summary: C++ Coroutines for Qt 6 Summary: Development files for %{appname} (Qt 6 version) Requires: %{name}-qt6%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: qt6-qtbase-devel%{?_isa} +Requires: rx-libxkbcommon %description qt6 %_description %description qt6-devel %_description @@ -119,6 +121,9 @@ 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 \ @@ -189,6 +194,9 @@ popd %endif %changelog +* Wed May 8 2024 Raven - 0.10.0-2 +- Rebuild (qt6) + * Wed Dec 06 2023 Yaakov Selkowitz - 0.10.0-1 - 0.10.0 diff --git a/base/qt6/qt6-qt3d/qt6-qt3d.spec b/base/qt6/qt6-qt3d/qt6-qt3d.spec index bc4a301..f2b7b78 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.6.1 +Version: 6.7.0 Release: 1%{?dist} %global examples 1 @@ -30,7 +30,7 @@ Patch0: qt3d-assimp-fix-build.patch %if 0%{?use_clang} BuildRequires: clang %else -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-13-gcc-c++ %endif BuildRequires: cmake BuildRequires: ninja-build @@ -80,6 +80,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %if 0%{?use_clang} export CC=clang export CXX=clang++ +%else +%enable_devtoolset13 %endif %cmake_qt6 \ @@ -211,6 +213,9 @@ popd %changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + * Sat Dec 16 2023 Raven - 6.6.1-1 - update to 6.6.1 diff --git a/base/qt6/qt6-qt5compat/qt6-qt5compat.spec b/base/qt6/qt6-qt5compat/qt6-qt5compat.spec new file mode 100644 index 0000000..c542ae0 --- /dev/null +++ b/base/qt6/qt6-qt5compat/qt6-qt5compat.spec @@ -0,0 +1,248 @@ + +%global qt_module qt5compat + +%global examples 1 + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - Qt 5 Compatibility Libraries +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +# Upstream patches + +# Upstreamable patches + +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +# qt6-qtdeclarative is required for QtGraphicalEffects +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtshadertools-devel +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: pkgconfig(icu-i18n) + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6Core5Compat.so.6* +%{_qt6_libdir}/qt6/qml/Qt5Compat/GraphicalEffects/* + +%files devel +%{_qt6_headerdir}/QtCore5Compat/ +%{_qt6_libdir}/libQt6Core5Compat.prl +%{_qt6_libdir}/libQt6Core5Compat.so +%{_qt6_libdir}/cmake/Qt6/FindWrapIconv.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/Qt5CompatTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6Core5Compat/ +%{_qt6_libdir}/cmake/Qt6Core5Compat/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Thu Jul 13 2023 František Zatloukal - 6.5.1-5 +- Rebuilt for ICU 73.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-4 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Tue Jul 11 2023 František Zatloukal - 6.5.1-2 +- Rebuilt for ICU 73.2 + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Sat Dec 31 2022 Pete Walter - 6.4.1-2 +- Rebuild for ICU 72 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Mon Aug 01 2022 Frantisek Zatloukal - 6.3.1-3 +- Rebuilt for ICU 71.1 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Mon Jan 31 2022 Uwe Klotz - 6.2.2-3 +- Add missing unpackaged files for QtGraphicalEffects + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 20 2021 Pete Walter - 6.1.0-2 +- Rebuild for ICU 69 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Jan Grulich - 6.0.0 +- 6.0.0 diff --git a/base/qt6/qt6-qtbase/qt6-qtbase.spec b/base/qt6/qt6-qtbase/qt6-qtbase.spec index b3d0480..7d2fc0e 100644 --- a/base/qt6/qt6-qtbase/qt6-qtbase.spec +++ b/base/qt6/qt6-qtbase/qt6-qtbase.spec @@ -12,6 +12,18 @@ %endif %endif +%ifarch %{arm} aarch64 +%global with_gles 1 +%endif + +%if 0%{?rhel} >= 10 +# Use mutter on RHEL 10+ since it's the only shipped compositor +%global wlheadless_compositor mutter +%else +# Use the simple reference compositor to simplify dependencies +%global wlheadless_compositor weston +%endif + %global platform linux-g++ %if 0%{?use_clang} @@ -37,7 +49,7 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.6.1 +Version: 6.7.0 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -91,14 +103,13 @@ Patch58: qtbase-libglvnd.patch # FIXME: this change seems to completely break font rendering for some people # Patch60: qtbase-cache-emoji-font.patch - -%if 0%{?fedora} < 39 +%if 0%{?fedora} && 0%{?fedora} < 39 # Latest QGnomePlatform needs to be specified to be used 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 ## upstream patches @@ -114,7 +125,7 @@ Patch100: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch %if 0%{?use_clang} BuildRequires: clang >= 6.0.0 %else -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-13-gcc-c++ %endif BuildRequires: cmake BuildRequires: ninja-build @@ -122,13 +133,19 @@ BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: findutils BuildRequires: double-conversion-devel +%if 0%{?fedora} || 0%{?epel} BuildRequires: libb2-devel +%else +Provides: bundled(libb2) +%endif BuildRequires: libjpeg-devel BuildRequires: libmng-devel BuildRequires: libtiff-devel BuildRequires: libzstd-devel BuildRequires: mtdev-devel +%if 0%{?fedora} || 0%{?epel} BuildRequires: tslib-devel +%endif BuildRequires: pkgconfig(alsa) # required for -accessibility BuildRequires: pkgconfig(atspi-2) @@ -146,13 +163,13 @@ BuildRequires: pkgconfig(libsctp) BuildRequires: pkgconfig(ice) pkgconfig(sm) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) -BuildRequires: openssl-devel +BuildRequires: pkgconfig(openssl) >= 3.0 BuildRequires: pkgconfig(libpulse) pkgconfig(libpulse-mainloop-glib) -BuildRequires: pkgconfig(libinput) +BuildRequires: pkgconfig(libinput) >= 1.22 BuildRequires: pkgconfig(xcb-xkb) >= 1.10 BuildRequires: pkgconfig(xcb-util) -BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 -BuildRequires: pkgconfig(xkbcommon-x11) >= 0.4.1 +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: pkgconfig(xkbcommon-x11) >= 1.3 BuildRequires: pkgconfig(xkeyboard-config) %global vulkan 1 BuildRequires: pkgconfig(vulkan) @@ -162,12 +179,13 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(libglvnd) BuildRequires: pkgconfig(x11) +%if 0%{?with_gles} # only needed for GLES2 and GLES3 builds -#BuildRequires: pkgconfig(glesv2) +BuildRequires: pkgconfig(glesv2) +%endif %global sqlite 1 BuildRequires: pkgconfig(sqlite3) >= 3.7 -BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(libpcre2-16) >= 10.20 %global pcre 1 @@ -180,6 +198,10 @@ BuildRequires: perl-generators BuildRequires: python3 BuildRequires: qt6-rpm-macros +%if 0%{?rhel} >= 9 +BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 +%endif + %if 0%{?tests} BuildRequires: dbus-x11 BuildRequires: mesa-dri-drivers @@ -189,6 +211,9 @@ 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 @@ -220,7 +245,7 @@ Requires: pkgconfig(gl) Requires: pkgconfig(vulkan) %endif # Optional dev dependency of Qt6::Gui -Requires: pkgconfig(xkbcommon) +Requires: pkgconfig(xkbcommon) >= 1.3 Requires: qt6-rpm-macros %if 0%{?use_clang} Requires: clang >= 3.7.0 @@ -254,8 +279,8 @@ Summary: Static library files for %{name} Requires: %{name}-devel%{?_isa} = %{version}-%{release} Requires: pkgconfig(fontconfig) Requires: pkgconfig(glib-2.0) -Requires: pkgconfig(libinput) -Requires: pkgconfig(xkbcommon) +Requires: pkgconfig(libinput) >= 1.22 +Requires: pkgconfig(xkbcommon) >= 1.3 Requires: pkgconfig(zlib) %description static @@ -349,17 +374,21 @@ RPM_OPT_FLAGS="$RPM_OPT_FLAGS %{?qt6_arm_flag} %{?qt6_deprecated_flag} %{?qt6_nu RPM_OPT_FLAGS=`echo "$RPM_OPT_FLAGS -Qunused-arguments" | sed 's|-fno-delete-null-pointer-checks||g'` export CC=clang 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="$LDFLAGS $RPM_LD_FLAGS" +export LDFLAGS="-L%{_rxlibdir} -Wl,-rpath=%{_rxlibdir} $LDFLAGS $RPM_LD_FLAGS" export MAKEFLAGS="%{?_smp_mflags}" %cmake_qt6 \ -DQT_FEATURE_accessibility=ON \ -DQT_FEATURE_fontconfig=ON \ -DQT_FEATURE_glib=ON \ + -DQT_FEATURE_gtk3=ON \ -DQT_FEATURE_sse2=%{?no_sse2:OFF}%{!?no_sse2:ON} \ -DQT_FEATURE_icu=ON \ -DQT_FEATURE_enable_new_dtags=ON \ @@ -387,10 +416,12 @@ export MAKEFLAGS="%{?_smp_mflags}" -DBUILD_SHARED_LIBS=ON \ -DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \ -DQT_BUILD_TESTS=%{?tests:ON}%{!?tests:OFF} \ - -DQT_QMAKE_TARGET_MKSPEC=%{platform} - -# FIXME -# -DQT_FEATURE_directfb=ON \ + -DQT_QMAKE_TARGET_MKSPEC=%{platform} \ +%if 0%{?with_gles} + -DQT_INPUT_opengl=es2 \ + -DQT_FEATURE_opengles3=TRUE \ +%endif + -DQT_FEATURE_directfb=OFF %cmake_build @@ -423,7 +454,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.5.2 +Version: 6.7.0 EOF # rpm macros @@ -625,7 +656,6 @@ make check -k ||: %{_qt6_libexecdir}/qt-internal-configure-tests %{_qt6_libexecdir}/sanitizer-testrunner.py %{_qt6_libexecdir}/syncqt -%{_qt6_libexecdir}/android_emulator_launcher.sh %{_qt6_libexecdir}/moc %{_qt6_libexecdir}/tracegen %{_qt6_libexecdir}/tracepointgen @@ -713,6 +743,7 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6BuildInternals/QtStandaloneTestTemplateProject/Main.cmake %{_qt6_libdir}/cmake/Qt6Concurrent/*.cmake %{_qt6_libdir}/cmake/Qt6Core/*.cmake +%{_qt6_libdir}/cmake/Qt6Core/Qt6CoreResourceInit.in.cpp %{_qt6_libdir}/cmake/Qt6Core/Qt6CoreConfigureFileTemplate.in %{_qt6_libdir}/cmake/Qt6CoreTools/*.cmake %{_qt6_libdir}/cmake/Qt6DBus/*.cmake @@ -740,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.cpp.o +%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons_init.cpp.o %{_qt6_libdir}/pkgconfig/*.pc %if 0%{?egl} @@ -846,6 +877,9 @@ make check -k ||: %changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + * Sat Dec 16 2023 Raven - 6.6.1-1 - update to 6.6.1 diff --git a/base/qt6/qt6-qtbase/qtbase-gcc11.patch b/base/qt6/qt6-qtbase/qtbase-gcc11.patch deleted file mode 100644 index dfbd08f..0000000 --- a/base/qt6/qt6-qtbase/qtbase-gcc11.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/examples/corelib/tools/contiguouscache/randomlistmodel.h b/examples/corelib/tools/contiguouscache/randomlistmodel.h -index 1fabb0d9..393ebaa3 100644 ---- a/examples/corelib/tools/contiguouscache/randomlistmodel.h -+++ b/examples/corelib/tools/contiguouscache/randomlistmodel.h -@@ -50,6 +50,7 @@ - #ifndef RANDOMLISTMODEL_H - #define RANDOMLISTMODEL_H - -+#include - #include - #include - -diff --git a/src/corelib/text/qanystringview.h b/src/corelib/text/qanystringview.h -index a7606253..60747cf0 100644 ---- a/src/corelib/text/qanystringview.h -+++ b/src/corelib/text/qanystringview.h -@@ -39,6 +39,7 @@ - #ifndef QANYSTRINGVIEW_H - #define QANYSTRINGVIEW_H - -+#include - #include - #include - -diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h -index 9f646aaa..a5af793c 100644 ---- a/src/corelib/text/qbytearray.h -+++ b/src/corelib/text/qbytearray.h -@@ -41,6 +41,7 @@ - #ifndef QBYTEARRAY_H - #define QBYTEARRAY_H - -+#include - #include - #include - #include 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 index fd2ac7a..4fa1aaf 100644 --- 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 @@ -1,28 +1,13 @@ -From 25e78cce15fdf737cc48ed5d7683ad1d01b55621 Mon Sep 17 00:00:00 2001 -From: Christophe Giboudeaux -Date: Sun, 20 Sep 2020 09:57:22 +0200 -Subject: [PATCH] Tell the truth about private API - -Mark private API with symbols only for the current patch release - -This change is a port of the libqt5-qtbase patch which was -added during the Qt 5.6 cycle. ---- - cmake/QtFlagHandlingHelpers.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/cmake/QtFlagHandlingHelpers.cmake b/cmake/QtFlagHandlingHelpers.cmake -index d8597326cc..f9da7b2171 100644 +index 28231cb5..018d697b 100644 --- a/cmake/QtFlagHandlingHelpers.cmake +++ b/cmake/QtFlagHandlingHelpers.cmake -@@ -23,7 +23,7 @@ function(qt_internal_add_linker_version_script target) - endif() - - if(TEST_ld_version_script) -- set(contents "Qt_${PROJECT_VERSION_MAJOR}_PRIVATE_API {\n qt_private_api_tag*;\n") -+ set(contents "Qt_${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}_PRIVATE_API {\n qt_private_api_tag*;\n") +@@ -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") --- -2.40.0 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 new file mode 100644 index 0000000..113d48b --- /dev/null +++ b/base/qt6/qt6-qtbase/qtbase-use-ifdefs-instead-if-for-cpp-lib-span.patch @@ -0,0 +1,31 @@ +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-qgnomeplatform-as-default-platform-theme-on-gnome.patch b/base/qt6/qt6-qtbase/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch deleted file mode 100644 index 82461d5..0000000 --- a/base/qt6/qt6-qtbase/qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/gui/platform/unix/qgenericunixthemes.cpp b/src/gui/platform/unix/qgenericunixthemes.cpp -index 1efd759b..d0129f73 100644 ---- a/src/gui/platform/unix/qgenericunixthemes.cpp -+++ b/src/gui/platform/unix/qgenericunixthemes.cpp -@@ -977,6 +977,7 @@ QStringList QGenericUnixTheme::themeNames() - result.push_back(QLatin1StringView(QKdeTheme::name)); - #endif - } else if (gtkBasedEnvironments.contains(desktopName)) { -+ result.push_back(QStringLiteral("qgnomeplatform")); - // prefer the GTK3 theme implementation with native dialogs etc. - result.push_back(QStringLiteral("gtk3")); - // fallback to the generic Gnome theme if loading the GTK3 theme fails diff --git a/base/qt6/qt6-qtcharts/qt6-qtcharts.spec b/base/qt6/qt6-qtcharts/qt6-qtcharts.spec new file mode 100644 index 0000000..43d73c5 --- /dev/null +++ b/base/qt6/qt6-qtcharts/qt6-qtcharts.spec @@ -0,0 +1,203 @@ + +%global qt_module qtcharts + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Charts component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +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 + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +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 + +%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 +integrated to modern user interfaces. Qt Charts can be used as QWidgets, QGraphicsWidget, or QML types. +Users can easily create impressive graphs by selecting one of the charts themes. + +%package devel +Summary: Development files for %{name} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtcharts-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + +%install +%cmake_install + + +%files +%license LICENSES/GPL* +%{_qt6_libdir}/libQt6Charts.so.6* +%{_qt6_libdir}/libQt6ChartsQml.so.6* +%{_qt6_qmldir}/QtCharts/ + +%files devel +%{_qt6_headerdir}/QtCharts/ +%{_qt6_headerdir}/QtChartsQml/ +%{_qt6_libdir}/libQt6Charts.so +%{_qt6_libdir}/libQt6Charts.prl +%{_qt6_libdir}/libQt6ChartsQml.so +%{_qt6_libdir}/libQt6ChartsQml.prl +%dir %{_qt6_libdir}/cmake/Qt6Charts/ +%{_qt6_libdir}/cmake/Qt6Charts/ +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtChartsTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6qtchartsqml2*.cmake +%dir %{_qt6_libdir}/cmake/Qt6ChartsQml/ +%{_qt6_libdir}/cmake/Qt6ChartsQml/ +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Jan Grulich - 6.1.1 +- 6.1.1 diff --git a/base/qt6/qt6-qtcoap/qt6-qtcoap.spec b/base/qt6/qt6-qtcoap/qt6-qtcoap.spec new file mode 100644 index 0000000..28e064c --- /dev/null +++ b/base/qt6/qt6-qtcoap/qt6-qtcoap.spec @@ -0,0 +1,115 @@ +%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 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +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 + +## upstreamable patches + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +#libQt6Core.so.6(Qt_6_PRIVATE_API)(64bit) +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel >= %{version} + +%description +Qt CoAP (API) provides classes and functions to access the CoAP protocol + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description devel +%{summary}. + + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%enable_devtoolset13 + +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} + +%cmake_build + + +%install +%cmake_install + + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6Coap.so.* + +%files devel +%{_qt6_headerdir}/QtCoap/ +%{_qt6_libdir}/libQt6Coap.so +%{_qt6_libdir}/libQt6Coap.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtCoapTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6Coap/ +%{_qt6_libdir}/cmake/Qt6Coap/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Sat Feb 17 2024 Marie Loise Nolden - 6.6.2-1 +- 6.6.2 + +* Fri Dec 08 2023 Marie Loise Nolden - 6.6.1-1 +- 6.6.1 + +* Thu May 25 2023 Marie Loise Nolden - 6.5.1-1 +- 6.5.1 + +* Tue Apr 4 2023 Marie Loise Nolden - 6.5.0-1 +- 6.5.0 + +* Thu Dec 08 2022 Marie Loise Nolden - 6.4.1-1 +- 6.4.1 + +* Fri Aug 05 2022 Marie Loise Nolden - 6.3.1-1 +- 6.3.1 diff --git a/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec b/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec new file mode 100644 index 0000000..fc3d7b5 --- /dev/null +++ b/base/qt6/qt6-qtconnectivity/qt6-qtconnectivity.spec @@ -0,0 +1,210 @@ + +%global qt_module qtconnectivity + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Connectivity components +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +# See LICENSE.GPL3, respectively, for exception details +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +Url: http://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 + +# filter qml provides +%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +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(openssl) + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/GPL* LICENSES/LGPL* +%{_qt6_libexecdir}/sdpscanner +%{_qt6_libdir}/libQt6Bluetooth.so.6* +%{_qt6_libdir}/libQt6Nfc.so.6* + +%files devel +%{_qt6_headerdir}/QtBluetooth/ +%{_qt6_libdir}/libQt6Bluetooth.so +%{_qt6_libdir}/libQt6Bluetooth.prl +%{_qt6_headerdir}/QtNfc/ +%{_qt6_libdir}/libQt6Nfc.so +%{_qt6_libdir}/libQt6Nfc.prl +%dir %{_qt6_libdir}/cmake/Qt6Bluetooth/ +%dir %{_qt6_libdir}/cmake/Qt6Nfc/ +%{_qt6_libdir}/cmake/Qt6/FindBlueZ.cmake +%{_qt6_libdir}/cmake/Qt6/FindPCSCLITE.cmake +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake +%{_qt6_libdir}/cmake/Qt6Bluetooth/*.cmake +%{_qt6_libdir}/cmake/Qt6Nfc/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_bluetooth*.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_nfc*.pri +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc 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 new file mode 100644 index 0000000..f92628b --- /dev/null +++ b/base/qt6/qt6-qtdeclarative/qquickselectiontriangle-fix-crash-when-target-is-null.patch @@ -0,0 +1,23 @@ +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 new file mode 100644 index 0000000..a1944af --- /dev/null +++ b/base/qt6/qt6-qtdeclarative/qquicktextedit-check-qquickaccessibleattached-for-nullptr.patch @@ -0,0 +1,35 @@ +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 714c5c1..7089291 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.6.1 +Version: 6.7.0 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -34,6 +34,8 @@ 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 @@ -44,7 +46,7 @@ BuildRequires: cmake %if 0%{?use_clang} BuildRequires: clang %else -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-13-gcc-c++ %endif BuildRequires: ninja-build BuildRequires: qt6-rpm-macros @@ -52,9 +54,10 @@ BuildRequires: qt6-qtbase-devel >= %{version} BuildRequires: qt6-qtbase-private-devel BuildRequires: qt6-qtlanguageserver-devel >= %{version} BuildRequires: qt6-qtshadertools-devel >= %{version} +BuildRequires: qt6-qtsvg-devel >= %{version} %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: python%{python3_pkgversion} -BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 +BuildRequires: pkgconfig(xkbcommon) >= 1.3 %if 0%{?tests} BuildRequires: dbus-x11 @@ -63,6 +66,8 @@ BuildRequires: time BuildRequires: xorg-x11-server-Xvfb %endif +Requires: rx-libxkbcommon + Obsoletes: qt6-qtquickcontrols2 < 6.2.0~beta3-1 Provides: qt6-qtquickcontrols2 = %{version}-%{release} @@ -109,7 +114,12 @@ export PATH=`pwd`:$PATH %if 0%{?use_clang} export CC=clang 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} @@ -133,7 +143,7 @@ for i in * ; do case "${i}" in qmlcachegen|qmlleasing|qmlformat|qmleasing|qmlimportscanner|qmllint| \ qmlpreview|qmlscene|qmltestrunner|qmltyperegistrar|qmlplugindump| \ - qmlprofiler|qml|qmlbundle|qmlmin|qmltime) + qmlprofiler|qml|qmlbundle|qmlmin|qmltime|svgtoqml) ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6 ;; *) @@ -153,8 +163,6 @@ for prl_file in libQt6*.prl ; do done popd -# FIXME: where does it come from? -rm -rf %{buildroot}%{_qt6_libdir}/objects-RelWithDebInfo/QmlCompilerPrivate_resources_1/.rcc/qrc_builtins.cpp.o %check %if 0%{?tests} @@ -180,12 +188,13 @@ make check -k -C tests ||: %{_qt6_libdir}/libQt6LabsSharedImage.so.6* %{_qt6_libdir}/libQt6LabsWavefrontMesh.so.6* %{_qt6_libdir}/libQt6QmlLocalStorage.so.6* +%{_qt6_libdir}/libQt6QmlNetwork.so.6* %{_qt6_libdir}/libQt6Qml.so.6* %{_qt6_libdir}/libQt6QmlCompiler.so.* %{_qt6_libdir}/libQt6QmlCore.so.6* %{_qt6_libdir}/libQt6QmlModels.so.6* %{_qt6_libdir}/libQt6QmlWorkerScript.so.6* -%{_qt6_libdir}/libQt6Quick.so.6* +%{_qt6_libdir}/libQt6Quick*.so.6* %{_qt6_libdir}/libQt6QuickControls2.so.6* %{_qt6_libdir}/libQt6QuickControls2Impl.so.6* %{_qt6_libdir}/libQt6QuickDialogs2.so.6* @@ -207,6 +216,7 @@ make check -k -C tests ||: %dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate %dir %{_qt6_libdir}/cmake/Qt6Qml %dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins +%dir %{_qt6_libdir}/cmake/Qt6QmlBuiltins %dir %{_qt6_libdir}/cmake/Qt6QmlCompiler %dir %{_qt6_libdir}/cmake/Qt6QmlCore %dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate @@ -218,10 +228,21 @@ make check -k -C tests ||: %dir %{_qt6_libdir}/cmake/Qt6LabsSettings %dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage %dir %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Basic +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2BasicStyleImpl +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Fusion +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2FusionStyleImpl +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Imagine +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2ImagineStyleImpl +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Material +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Universal +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl %dir %{_qt6_libdir}/cmake/Qt6QmlLSPrivate %dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate %dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage %dir %{_qt6_libdir}/cmake/Qt6QmlModels +%dir %{_qt6_libdir}/cmake/Qt6QmlNetwork %dir %{_qt6_libdir}/cmake/Qt6QmlTools %dir %{_qt6_libdir}/cmake/Qt6QmlToolingSettingsPrivate %dir %{_qt6_libdir}/cmake/Qt6QmlWorkerScript @@ -241,11 +262,15 @@ make check -k -C tests ||: %dir %{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate %dir %{_qt6_libdir}/cmake/Qt6QuickTemplates2 %dir %{_qt6_libdir}/cmake/Qt6QmlXmlListModel +%dir %{_qt6_libdir}/cmake/Qt6QuickTools %{_bindir}/qml* %{_qt6_bindir}/qml* +%{_bindir}/svgtoqml-qt6 +%{_qt6_bindir}/svgtoqml %{_qt6_libexecdir}/qmlcachegen %{_qt6_libexecdir}/qmlimportscanner %{_qt6_libexecdir}/qmltyperegistrar +%{_qt6_libexecdir}/qmljsrootgen %{_qt6_headerdir}/Qt*/ %{_qt6_libdir}/libQt6LabsAnimation.so %{_qt6_libdir}/libQt6LabsFolderListModel.so @@ -255,6 +280,7 @@ make check -k -C tests ||: %{_qt6_libdir}/libQt6LabsWavefrontMesh.so %{_qt6_libdir}/libQt6QmlLocalStorage.so %{_qt6_libdir}/libQt6Qml.so +%{_qt6_libdir}/libQt6QmlNetwork.so %{_qt6_libdir}/libQt6QmlCompiler.so %{_qt6_libdir}/libQt6QmlCore.so %{_qt6_libdir}/libQt6QmlModels.so @@ -262,6 +288,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_archdatadir}/mkspecs/modules/*.pri %{_qt6_archdatadir}/mkspecs/features/*.prf %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake @@ -269,6 +296,7 @@ make check -k -C tests ||: %{_qt6_libdir}/cmake/Qt6Qml/*.cmake* %{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in %{_qt6_libdir}/cmake/Qt6Qml/*.qrc.in +%{_qt6_libdir}/cmake/Qt6QmlBuiltins/*cmake %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake %{_qt6_libdir}/cmake/Qt6QmlCompiler/*.cmake %{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake @@ -285,10 +313,21 @@ make check -k -C tests ||: %{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake %{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlNetwork/*.cmake %{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake %{_qt6_libdir}/cmake/Qt6QmlToolingSettingsPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake %{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickControls2Basic/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2BasicStyleImpl/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2Fusion/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2FusionStyleImpl/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2Imagine/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2ImagineStyleImpl/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2Material/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2MaterialStyleImpl/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2Universal/*.cmake + %{_qt6_libdir}/cmake/Qt6QuickControls2UniversalStyleImpl/*.cmake %{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Quick/*.cmake %{_qt6_libdir}/cmake/Qt6QuickControls2/*.cmake @@ -305,6 +344,7 @@ make check -k -C tests ||: %{_qt6_libdir}/cmake/Qt6QuickTemplates2/*.cmake %{_qt6_libdir}/cmake/Qt6QmlXmlListModel/*.cmake %{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickTools/*.cmake %{_qt6_libdir}/qt6/modules/*.json %{_qt6_libdir}/pkgconfig/*.pc @@ -315,12 +355,15 @@ make check -k -C tests ||: %{_qt6_libdir}/libQt6LabsSettings.prl %{_qt6_libdir}/libQt6LabsSharedImage.prl %{_qt6_libdir}/libQt6LabsWavefrontMesh.prl +%{_qt6_libdir}/libQt6QmlBuiltins.a +%{_qt6_libdir}/libQt6QmlBuiltins.prl %{_qt6_libdir}/libQt6QmlCore.prl %{_qt6_libdir}/libQt6QmlDom.a %{_qt6_libdir}/libQt6QmlDom.prl %{_qt6_libdir}/libQt6QmlLocalStorage.prl %{_qt6_libdir}/libQt6QmlLS.a %{_qt6_libdir}/libQt6QmlLS.prl +%{_qt6_libdir}/libQt6QmlNetwork.prl %{_qt6_libdir}/libQt6Quick*.prl %{_qt6_libdir}/libQt6QmlWorkerScript.prl %{_qt6_libdir}/libQt6QmlModels.prl @@ -344,6 +387,9 @@ make check -k -C tests ||: %endif %changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 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 new file mode 100644 index 0000000..c2eb88a --- /dev/null +++ b/base/qt6/qt6-qtgraphs/qt6-qtgraphs.spec @@ -0,0 +1,116 @@ +%global qt_module qtgraphs + +Name: qt6-qtgraphs +Version: 6.7.0 +Release: 1%{?dist} + +%global examples 1 + +%global majmin %(echo %{version} | cut -d. -f1-2) +%global qt_version %(echo %{version} | cut -d~ -f1) + +Summary: The Qt Graphs module enables you to visualize data in 3D +License: BSD-3-Clause AND GFDL-1.3-no-invariants-only AND GPL-3.0-only +URL: https://doc.qt.io/qt-6/qtgraphs-index.html +Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{qt_version}/submodules/%{qt_module}-everywhere-src-%{qt_version}.tar.xz + +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build + +BuildRequires: cmake(Qt6BuildInternals) +BuildRequires: cmake(Qt6Core) +BuildRequires: cmake(Qt6Quick) +BuildRequires: cmake(Qt6Gui) +BuildRequires: cmake(Qt6Widgets) +BuildRequires: cmake(Qt6QuickTest) +BuildRequires: cmake(Qt6QuickWidgets) +BuildRequires: cmake(Qt6Test) +BuildRequires: cmake(Qt6Quick3D) +BuildRequires: qt6-qtbase-private-devel + +%description +The Qt Graphs module enables you to visualize data in 3D as bar, +scatter, and surface graphs. It's especially useful for visualizing +depth maps and large quantities of rapidly changing data, such as +data received from multiple sensors. The look and feel of graphs +can be customized by using themes or by adding custom items and labels. + +Qt Graphs is built on Qt 6 and Qt Quick 3D to take advantage of +hardware acceleration and Qt Quick. + +%package devel +Summary: Development Files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary} +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version} -p1 + +%build +%enable_devtoolset13 +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} + +%cmake_build + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + +%files +%license LICENSES/BSD-3-Clause.txt LICENSES/GFDL*.txt LICENSES/GPL-*.txt +%{_qt6_libdir}/libQt6Graphs.so.6* +%{_qt6_libdir}/qt6/metatypes/qt6graphs_relwithdebinfo_metatypes.json +%{_qt6_libdir}/qt6/modules/Graphs.json +%{_qt6_qmldir}/QtGraphs + +%files devel +%{_qt6_headerdir}/QtGraphs +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtGraphsTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Graphs +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6Graphsplugin*.cmake +%{_qt6_libdir}/libQt6Graphs.so +%{_qt6_libdir}/pkgconfig/Qt6Graphs.pc +%{_qt6_libdir}/libQt6Graphs.prl +%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_graphs*.pri + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Mon Feb 19 2024 Jan Grulich - 6.6.2-2 +- Examples: also install source files + +* Thu Feb 15 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Fri Jan 26 2024 Steve Cossette - 6.6.1-1 +- Initital release of qtgraphs diff --git a/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec b/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec new file mode 100644 index 0000000..78cac71 --- /dev/null +++ b/base/qt6/qt6-qthttpserver/qt6-qthttpserver.spec @@ -0,0 +1,111 @@ +#global unstable 0 +%global qt_module qthttpserver + +%global examples 1 + +Name: qt6-qthttpserver +Version: 6.7.0 +Release: 1%{?dist} +Summary: Library to facilitate the creation of an http server with Qt + +License: BSD-3-Clause AND GFDL-1.3-no-invariants-only AND GPL-3.0-only WITH Qt-GPL-exception-1.0 +URL: http://qt-project.org/ +%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 + +BuildRequires: qt6-rpm-macros +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: cmake(Qt6BuildInternals) = %{version} +BuildRequires: cmake(Qt6Core) = %{version} +BuildRequires: qt6-qtbase-private-devel = %{version} +BuildRequires: cmake(Qt6Network) = %{version} +BuildRequires: cmake(Qt6Concurrent) = %{version} +BuildRequires: cmake(Qt6WebSockets) = %{version} +BuildRequires: cmake(Qt6Gui) = %{version} +BuildRequires: pkgconfig(xkbcommon) + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + +%if 0%{?examples} +%package examples +Summary: Document files for %{name} +Requires: %{name}-devel = %{version}-%{release} +%description examples +The %{name}-examples package contains examples that pertain +to the usage of %{name}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{version} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + +%files +%license LICENSES/*.txt +%{_qt6_libdir}/libQt6HttpServer.so.6{,.*} + +%files devel +%dir %{_qt6_headerdir}/QtHttpServer +%{_qt6_headerdir}/QtHttpServer/* +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtHttpServerTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6HttpServer +%{_qt6_libdir}/cmake/Qt6HttpServer/* +%{_qt6_libdir}/libQt6HttpServer.prl +%{_qt6_libdir}/libQt6HttpServer.so +%{_qt6_libdir}/pkgconfig/Qt6HttpServer.pc +%{_qt6_libdir}/qt6/metatypes/qt6httpserver_relwithdebinfo_metatypes.json +%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_httpserver.pri +%{_qt6_libdir}/qt6/mkspecs/modules/qt_lib_httpserver_private.pri +%{_qt6_libdir}/qt6/modules/HttpServer.json + +%if 0%{?examples} +%files examples +%{_qt6_libdir}/qt6/examples/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Mon Oct 02 2023 Justin Zobel - 6.5.3-1 +- Update to 6.5.3 + +* Sat Sep 23 2023 Steve Cossette - 6.5.2-1 +- Initial release diff --git a/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec b/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec new file mode 100644 index 0000000..3234ad5 --- /dev/null +++ b/base/qt6/qt6-qtimageformats/qt6-qtimageformats.spec @@ -0,0 +1,203 @@ + +%global qt_module qtimageformats + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - QtImageFormats component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +Patch0: qtimageformats-fix-build.patch + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build >= 1.11 +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: libtiff-devel +BuildRequires: jasper-devel +BuildRequires: pkgconfig(libmng) +BuildRequires: pkgconfig(libwebp) >= 1.2 + +Requires: rx-libwebp + +# filter plugin provides +%global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$ + +%description +The core Qt Gui library by default supports reading and writing image +files of the most common file formats: PNG, JPEG, BMP, GIF and a few more, +ref. Reading and Writing Image Files. The Qt Image Formats add-on module +provides optional support for other image file formats, including: +MNG, TGA, TIFF, WBMP. + +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. + + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + +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 + + +%install +%cmake_install + + +%files +%license LICENSES/GPL* +%license LICENSES/LGPL* +%{_qt6_plugindir}/imageformats/libqmng.so +%{_qt6_plugindir}/imageformats/libqtga.so +%{_qt6_plugindir}/imageformats/libqtiff.so +%{_qt6_plugindir}/imageformats/libqwbmp.so +%{_qt6_plugindir}/imageformats/libqicns.so +%{_qt6_plugindir}/imageformats/libqjp2.so +%{_qt6_plugindir}/imageformats/libqwebp.so +%{_qt6_libdir}/cmake/Qt6/*.cmake +%{_qt6_libdir}/cmake/Qt6Gui/*.cmake + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-3 +- Enable s390x builds + +* Sun Feb 13 2022 Josef Ridky - 6.2.3-2 +- Rebuilt for libjasper.so.6 + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 18 2021 Jan Grulich - 6.0.0-1 +- 6.0.0 diff --git a/base/qt6/qt6-qtimageformats/qtimageformats-fix-build.patch b/base/qt6/qt6-qtimageformats/qtimageformats-fix-build.patch new file mode 100644 index 0000000..db9594e --- /dev/null +++ b/base/qt6/qt6-qtimageformats/qtimageformats-fix-build.patch @@ -0,0 +1,14 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 47694d0..3ba68b6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -16,4 +16,9 @@ if(NOT TARGET Qt::Gui) + message(NOTICE "Skipping the build as the condition \"TARGET Qt::Gui\" is not met.") + return() + endif() ++if (NOT TARGET Threads::Threads) ++ find_package(Threads) ++endif() ++qt_internal_disable_find_package_global_promotion(Threads::Threads) ++ + qt_build_repo() diff --git a/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec b/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec new file mode 100644 index 0000000..d2cc766 --- /dev/null +++ b/base/qt6/qt6-qtlanguageserver/qt6-qtlanguageserver.spec @@ -0,0 +1,124 @@ + +%global qt_module qtlanguageserver + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - LanguageServer component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +Url: http://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 + +## upstreamable patches + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} + +%description +The Qt Language Server component provides an implementation of the Language +Server protocol. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%cmake_qt6 + +%cmake_build + + +%install +%cmake_install + + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6JsonRpc.so.6* +%{_qt6_libdir}/libQt6LanguageServer.so.6* + +%files devel +%{_qt6_headerdir}/QtJsonRpc/ +%{_qt6_headerdir}/QtLanguageServer/ +%{_qt6_libdir}/libQt6JsonRpc.prl +%{_qt6_libdir}/libQt6JsonRpc.so +%{_qt6_libdir}/libQt6LanguageServer.prl +%{_qt6_libdir}/libQt6LanguageServer.so +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLanguageServer* +%{_qt6_libdir}/cmake/Qt6JsonRpcPrivate/ +%{_qt6_libdir}/cmake/Qt6LanguageServerPrivate/ +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_jsonrpc*.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_languageserver*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/JsonRpcPrivate.json +%{_qt6_libdir}/qt6/modules/LanguageServerPrivate.json +#{_qt6_libdir}/pkgconfig/*.pc + + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Thu Feb 15 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Wed May 24 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Thu May 04 2023 Yaakov Selkowitz - 6.5.0-1 +- 6.5.0 + +* Thu May 04 2023 Yaakov Selkowitz - 6.4.3-1 +- 6.4.3 diff --git a/base/qt6/qt6-qtlocation/qt6-qtlocation.spec b/base/qt6/qt6-qtlocation/qt6-qtlocation.spec new file mode 100644 index 0000000..7c08f49 --- /dev/null +++ b/base/qt6/qt6-qtlocation/qt6-qtlocation.spec @@ -0,0 +1,156 @@ + +%global qt_module qtlocation + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Location Libraries +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +# Rest of the licenses are for Qt code in src/location and src/plugins +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) +%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 + +# filter plugin/qml provides +%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel >= %{version} +BuildRequires: qt6-qtpositioning-devel >= %{version} +BuildRequires: qt6-qtshadertools-devel >= %{version} +BuildRequires: pkgconfig(xkbcommon) >= 1.3 + + +%description +The Qt Location API helps you create viable mapping solutions using +the data available from some of the popular location services. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qtdeclarative-devel%{?_isa} +Requires: qt6-qtpositioning-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%enable_devtoolset13 +# QT is known not to work properly with LTO at this point. Some of the issues +# are being worked on upstream and disabling LTO should be re-evaluated as +# 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}" + +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%files +%license LICENSES/GPL* LICENSES/LGPL* +%{_qt6_libdir}/libQt6Location.so.6* +%dir %{_qt6_archdatadir}/qml/QtLocation +%{_qt6_archdatadir}/qml/QtLocation/* +%{_qt6_plugindir}/geoservices/ + +%files devel +%dir %{_qt6_headerdir}/QtLocation +%{_qt6_headerdir}/QtLocation/* +%{_qt6_libdir}/libQt6Location.so +%{_qt6_libdir}/libQt6Location.prl +%dir %{_qt6_libdir}/cmake/Qt6Location +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLocationTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Location/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_location*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Wed May 24 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + diff --git a/base/qt6/qt6-qtlottie/qt6-qtlottie.spec b/base/qt6/qt6-qtlottie/qt6-qtlottie.spec new file mode 100644 index 0000000..2b5673c --- /dev/null +++ b/base/qt6/qt6-qtlottie/qt6-qtlottie.spec @@ -0,0 +1,176 @@ + +%global qt_module qtlottie + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - Lottie Animation +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +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 + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +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(openssl) >= 3.0 + +%description +Qt Lottie Animation provides a QML API for rendering graphics and animations +that are exported in JSON format by the Bodymovin plugin for Adobe After +Effects. + +%package devel +Summary: Development files for %{name} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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 + +%install +%cmake_install + + +%files +%license LICENSES/GPL* +%{_qt6_libdir}/libQt6Bodymovin.so* +%{_qt6_qmldir}/Qt/labs/lottieqt/ + +%files devel +%dir %{_qt6_libdir}/cmake/Qt6BodymovinPrivate +%dir %{_qt6_headerdir}/QtBodymovin +%{_qt6_headerdir}/QtBodymovin +%{_qt6_libdir}/libQt6Bodymovin.so +%{_qt6_libdir}/libQt6Bodymovin.prl +%{_qt6_libdir}/cmake/Qt6BodymovinPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtLottieTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/Qt6lottieqtplugin*.cmake +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Jan Grulich - 6.1.1 +- 6.1.1 diff --git a/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec b/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec new file mode 100644 index 0000000..a52eba1 --- /dev/null +++ b/base/qt6/qt6-qtmqtt/qt6-qtmqtt.spec @@ -0,0 +1,81 @@ +%global qt_module qtmqtt + +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} +Summary: Qt6 - Mqtt module + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +URL: https://github.com/qt/qtmqtt/ +Source0: https://github.com/qt/qtmqtt/archive/refs/tags/v%{version}/%{qt_module}-%{version}.tar.gz + +BuildRequires: cmake >= 3.16 +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} + +%description +MQTT is a machine-to-machine (M2M) protocol utilizing the publish-and-subscribe +paradigm, and provides a channel with minimal communication overhead. +The Qt MQTT module provides a standard compliant implementation of the MQTT +protocol specification. It enables applications to act as telemetry displays +and devices to publish telemetry data. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description devel +%{summary} + +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary} + +%prep +%autosetup -n %{qt_module}-%{version} + +%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 + +%install +%cmake_install + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6Mqtt.so.6* + +%files devel +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtMqttTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Mqtt/*.cmake +%{_qt6_libdir}/libQt6Mqtt.prl +%{_qt6_libdir}/libQt6Mqtt.so +%{_qt6_libdir}/pkgconfig/Qt6Mqtt.pc +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_headerdir}/QtMqtt/* +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%dir %{_qt6_libdir}/cmake/Qt6Mqtt/ +%dir %{_qt6_headerdir}/QtMqtt + +%files examples +%{_qt6_examplesdir} + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Thu Feb 22 2024 Dana Elfassy - 6.6.2-2 +- Bump version + +* Thu Feb 08 2024 Dana Elfassy +- QtMqtt initial release diff --git a/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec b/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec index 0aa5c65..5537240 100644 --- a/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec +++ b/base/qt6/qt6-qtmultimedia/qt6-qtmultimedia.spec @@ -1,4 +1,3 @@ - %global qt_module qtmultimedia %global gst 0.10 @@ -17,7 +16,7 @@ Summary: Qt6 - Multimedia support Name: qt6-%{qt_module} -Version: 6.6.1 +Version: 6.7.0 Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -35,8 +34,9 @@ Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submod %global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ BuildRequires: cmake -%if 0%{?rhel} < 7 -BuildRequires: clang + +%if 0%{?rhel} && 0%{?rhel} < 10 +BuildRequires: gcc-toolset-13-gcc-c++ %else BuildRequires: gcc-c++ %endif @@ -47,6 +47,7 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel >= %{version} BuildRequires: qt6-qtshadertools-devel >= %{version} +BuildRequires: qt6-qtquick3d-devel >= %{version} BuildRequires: pkgconfig(alsa) %if "%{?gst}" == "0.10" BuildRequires: pkgconfig(gstreamer-interfaces-0.10) @@ -74,11 +75,11 @@ BuildRequires: pkgconfig(libva) pkgconfig(libva-drm) %endif BuildRequires: pkgconfig(xrandr) BuildRequires: pkgconfig(xv) -BuildRequires: pkgconfig(xkbcommon) >= 0.5.0 -BuildRequires: openssl-devel +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +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: wayland-devel +BuildRequires: rx-wayland-devel %description The Qt Multimedia module provides a rich feature set that enables you to @@ -112,9 +113,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build %if 0%{?rhel} < 10 -export CC=clang -export CXX=clang++ +%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} @@ -145,7 +148,10 @@ popd %{_qt6_libdir}/libQt6MultimediaQuick.so.6* %{_qt6_libdir}/libQt6MultimediaWidgets.so.6* %{_qt6_libdir}/libQt6SpatialAudio.so.6* +%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so.6* %{_qt6_archdatadir}/qml/QtMultimedia/ +%dir %{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio +%{_qt6_archdatadir}/qml/QtQuick3D/SpatialAudio/ %dir %{_qt6_plugindir}/multimedia %{_qt6_plugindir}/multimedia/libgstreamermediaplugin.so %if %{with ffmpeg} @@ -157,6 +163,7 @@ popd %{_qt6_headerdir}/QtMultimediaQuick/ %{_qt6_headerdir}/QtMultimediaWidgets/ %{_qt6_headerdir}/QtSpatialAudio/ +%{_qt6_headerdir}/QtQuick3DSpatialAudio/ %{_qt6_libdir}/libQt6BundledResonanceAudio.a %{_qt6_libdir}/libQt6Multimedia.so %{_qt6_libdir}/libQt6Multimedia.prl @@ -166,6 +173,8 @@ popd %{_qt6_libdir}/libQt6MultimediaWidgets.prl %{_qt6_libdir}/libQt6SpatialAudio.so %{_qt6_libdir}/libQt6SpatialAudio.prl +%{_qt6_libdir}/libQt6Quick3DSpatialAudio.so +%{_qt6_libdir}/libQt6Quick3DSpatialAudio.prl %{_qt6_libdir}/cmake/Qt6/*.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake %dir %{_qt6_libdir}/cmake/Qt6BundledResonanceAudio/ @@ -178,6 +187,8 @@ popd %{_qt6_libdir}/cmake/Qt6MultimediaWidgets/*.cmake %dir %{_qt6_libdir}/cmake/Qt6SpatialAudio/ %{_qt6_libdir}/cmake/Qt6SpatialAudio/*cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate +%{_qt6_libdir}/cmake/Qt6Quick3DSpatialAudioPrivate/*cmake %dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake %{_qt6_archdatadir}/mkspecs/modules/*.pri @@ -193,6 +204,9 @@ popd %changelog +* Mon May 13 2024 Raven - 6.7.0-1 +- update to 6.7.0 + * Sat Dec 16 2023 Raven - 6.6.1-1 - update to 6.6.1 diff --git a/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec b/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec new file mode 100644 index 0000000..2c5c10c --- /dev/null +++ b/base/qt6/qt6-qtnetworkauth/qt6-qtnetworkauth.spec @@ -0,0 +1,220 @@ + +%global qt_module qtnetworkauth + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - NetworkAuth component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +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 + +# filter plugin/qml provides +%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: pkgconfig(xkbcommon) >= 1.3 + +%description +%{summary} + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + + +%cmake_build + +%install +%cmake_install + + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/GPL* +%{_qt6_libdir}/libQt6NetworkAuth.so.6* + +%files devel +%{_qt6_headerdir}/QtNetworkAuth/ +%{_qt6_libdir}/libQt6NetworkAuth.so +%{_qt6_libdir}/libQt6NetworkAuth.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtNetworkAuthTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6NetworkAuth/ +%{_qt6_libdir}/cmake/Qt6NetworkAuth/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_networkauth*.pri +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 20 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jan 18 2021 Jan Grulich - 6.0.0-1 +- 6.0.0 diff --git a/base/qt6/qt6-qtopcua/qt6-qtopcua.spec b/base/qt6/qt6-qtopcua/qt6-qtopcua.spec new file mode 100644 index 0000000..2e6cd03 --- /dev/null +++ b/base/qt6/qt6-qtopcua/qt6-qtopcua.spec @@ -0,0 +1,128 @@ +%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 +Release: 1%{?dist} + +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) +%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 + +## upstreamable patches + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +#libQt6Core.so.6(Qt_6_PRIVATE_API)(64bit) +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel >= %{version} +BuildRequires: pkgconfig(openssl) +BuildRequires: mbedtls-devel +#BuildRequires: open62541-devel + +%description +Qt OPC UA (API) provides classes and functions to access the OPC UA protocol + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description devel +%{summary}. + + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%enable_devtoolset13 +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} + +%cmake_build + + +%install +%cmake_install + + +%files +%license LICENSES/* +%{_qt6_bindir}/qopcuaxmldatatypes2cpp +%{_qt6_libdir}/libQt6OpcUa.so.* +%{_qt6_plugindir}/opcua/libopen62541_backend.so +%{_qt6_libdir}/libQt6DeclarativeOpcua.so.* +%{_qt6_qmldir}/QtOpcUa/* + +%files devel +%{_qt6_headerdir}/QtOpcUa/ +%{_qt6_headerdir}/QtDeclarativeOpcua/ +%{_qt6_libdir}/libQt6OpcUa.so +%{_qt6_libdir}/libQt6OpcUa.prl +%{_qt6_libdir}/libQt6DeclarativeOpcua.so +%{_qt6_libdir}/libQt6DeclarativeOpcua.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtOpcUaTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6OpcUa/ +%{_qt6_libdir}/cmake/Qt6OpcUa/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6DeclarativeOpcua/ +%{_qt6_libdir}/cmake/Qt6DeclarativeOpcua/*.cmake +%{_qt6_libdir}/cmake/Qt6/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QtOpcUaTools +%{_qt6_libdir}/cmake/Qt6QtOpcUaTools/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Fri Dec 08 2023 Marie Loise Nolden - 6.6.1-1 +- 6.6.1 + +* Thu May 25 2023 Marie Loise Nolden - 6.5.1-1 +- 6.5.1 + +* Tue Apr 4 2023 Marie Loise Nolden - 6.5.0-1 +- 6.5.0 + +* Thu Dec 08 2022 Marie Loise Nolden - 6.4.1-1 +- 6.4.1 + +* Fri Aug 05 2022 Marie Loise Nolden - 6.3.1-1 +- 6.3.1 diff --git a/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec b/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec new file mode 100644 index 0000000..8c9162e --- /dev/null +++ b/base/qt6/qt6-qtpositioning/qt6-qtpositioning.spec @@ -0,0 +1,225 @@ + +%global qt_module qtpositioning + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Positioning component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +# build failure with gcc10 +# various C++ runtime headers indirectly included which in turn +# included and . Those indirect inclusions have been +# eliminated which in turn forces packages to include the C++ headers they +# actually need. +# Patch0: qtpositioning-gcc10.patch + +# filter plugin/qml provides +%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +# QtPositioning core-private +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel >= %{version} +BuildRequires: qt6-qtserialport-devel >= %{version} + +BuildRequires: pkgconfig(dconf) +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(icu-i18n) +BuildRequires: pkgconfig(libssl) +BuildRequires: pkgconfig(libcrypto) +BuildRequires: pkgconfig(xkbcommon) >= 1.3 + + +%description +The Qt Positioning APIs gives developers the ability to +determine a position by using a variety of possible sources, including +satellite, or wifi, or text file, and so on. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtpositioning-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +# QT is known not to work properly with LTO at this point. Some of the issues +# are being worked on upstream and disabling LTO should be re-evaluated as +# we update this change. Until such time... +# Disable LTO +%define _lto_cflags %{nil} + +%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} + + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/GPL* LICENSES/LGPL* +%{_qt6_libdir}/libQt6Positioning.so.6* +%dir %{_qt6_archdatadir}/qml/QtPositioning +%{_qt6_archdatadir}/qml/QtPositioning/* +%{_qt6_plugindir}/position/ +%{_qt6_libdir}/libQt6PositioningQuick.so.6* + +%files devel +%{_qt6_headerdir}/QtPositioning/ +%{_qt6_libdir}/libQt6Positioning.so +%{_qt6_libdir}/libQt6Positioning.prl +%{_qt6_headerdir}/QtPositioningQuick/ +%{_qt6_libdir}/libQt6PositioningQuick.so +%{_qt6_libdir}/libQt6PositioningQuick.prl +%dir %{_qt6_libdir}/cmake/Qt6Positioning +%{_qt6_libdir}/cmake/Qt6/*.cmake +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtPositioningTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Bundled_Clip2Tri/Qt6Bundled_Clip2TriDependencies.cmake +%{_qt6_libdir}/cmake/Qt6Positioning/*.cmake +%{_qt6_libdir}/cmake/Qt6PositioningQuick/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_positioning*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + diff --git a/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec b/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec new file mode 100644 index 0000000..e5d4a12 --- /dev/null +++ b/base/qt6/qt6-qtquick3d/qt6-qtquick3d.spec @@ -0,0 +1,378 @@ + +%global qt_module qtquick3d + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Quick3D Libraries and utilities +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 +Patch0: qtquick3d-fix-build-with-gcc11.patch + +BuildRequires: cmake +%if 0%{?rhel} >= 10 +BuildRequires: gcc-c++ +%else +BuildRequires: gcc-toolset-13-gcc-c++ +%endif +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros >= %{version} +BuildRequires: qt6-qtbase-static >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtdeclarative-static +BuildRequires: qt6-qtquicktimeline-devel +BuildRequires: qt6-qtshadertools-devel + +#if 0{?fedora} +# BuildRequires: pkgconfig(assimp) >= 5.0.0 +#endif + +%description +The Qt 6 Quick3D library. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qtdeclarative-devel%{?_isa} +%description devel +%{summary}. + +%ifnarch s390x +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtquick3d-devel >= %{version} +%description examples +%{summary}. +%endif +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%if 0%{?rhel} >= 10 +%ifarch x86_64 +# The bundled embree attempts to limit optimization to SSE4.1 and disable AVX, +# but RHEL 10 defaults to -march=x86-64-v3 which includes AVX, resulting in +# build failures due to missing symbols from the AVX code which is not built. +CXXFLAGS="$CXXFLAGS -mno-avx" +%endif +%else +%enable_devtoolset13 +%endif + +# QT is known not to work properly with LTO at this point. Some of the issues +# are being worked on upstream and disabling LTO should be re-evaluated as +# we update this change. Until such time... +# Disable LTO +%define _lto_cflags %{nil} + +%cmake_qt6 \ +%ifarch s390x + -DQT_BUILD_EXAMPLES=OFF +%else + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} +%endif +# -DQT_FEATURE_system_assimp=ON + +%cmake_build + + +%install +%cmake_install + +# hardlink files to %{_bindir}, add -qt6 postfix to not conflict +mkdir %{buildroot}%{_bindir} +pushd %{buildroot}%{_qt6_bindir} +for i in * ; do + case "${i}" in + balsam|meshdebug|shadergen|balsamui|instancer|materialeditor|shapegen) + ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6 + ;; + *) + ln -v ${i} %{buildroot}%{_bindir}/${i} + ;; + esac +done +popd + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/GPL* +%{_qt6_libdir}/libQt6Quick3D.so.6* +%{_qt6_libdir}/libQt6Quick3DAssetImport.so.6* +%{_qt6_libdir}/libQt6Quick3DRuntimeRender.so.6* +%{_qt6_libdir}/libQt6Quick3DUtils.so.6* +%{_qt6_libdir}/libQt6Quick3DIblBaker.so.6* +%{_qt6_libdir}/libQt6Quick3DParticles.so.6* +%{_qt6_libdir}/libQt6Quick3DAssetUtils.so.6* +%{_qt6_libdir}/libQt6Quick3DEffects.so.6* +%{_qt6_libdir}/libQt6Quick3DHelpers.so.6* +%{_qt6_libdir}/libQt6Quick3DHelpersImpl.so* +%{_qt6_libdir}/libQt6Quick3DParticleEffects.so.6* +%{_qt6_libdir}/libQt6Quick3DGlslParser.so.6* +%dir %{_qt6_qmldir}/QtQuick3D/ +%{_qt6_qmldir}/QtQuick3D/ +%{_qt6_plugindir}/assetimporters/*.so + +%files devel +%{_bindir}/balsam-qt6 +%{_bindir}/meshdebug-qt6 +%{_bindir}/shadergen-qt6 +%{_bindir}/balsamui-qt6 +%{_bindir}/instancer-qt6 +%{_bindir}/materialeditor-qt6 +%{_bindir}/shapegen-qt6 +%{_qt6_bindir}/balsam +%{_qt6_bindir}/meshdebug +%{_qt6_bindir}/shadergen +%{_qt6_bindir}/balsamui +%{_qt6_bindir}/instancer +%{_qt6_bindir}/materialeditor +%{_qt6_bindir}/shapegen +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_includedir}/QtQuick3D +%{_qt6_includedir}/QtQuick3DAssetImport +%{_qt6_includedir}/QtQuick3DIblBaker +%{_qt6_includedir}/QtQuick3DParticles +%{_qt6_includedir}/QtQuick3DRuntimeRender +%{_qt6_includedir}/QtQuick3DUtils +%{_qt6_includedir}/QtQuick3DAssetUtils +%{_qt6_includedir}/QtQuick3DHelpers +%{_qt6_includedir}/QtQuick3DHelpersImpl +%{_qt6_includedir}/QtQuick3DGlslParser +%dir %{_qt6_libdir}/cmake/Qt6Quick3DIblBaker +%{_qt6_libdir}/cmake/Qt6Quick3DIblBaker/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticles +%{_qt6_libdir}/cmake/Qt6Quick3DParticles/*.cmake +%{_qt6_libdir}/cmake/Qt6/FindWrapQuick3DAssimp.cmake +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%ifarch x86_64 aarch64 +%dir %{_qt6_libdir}/cmake/Qt6BundledEmbree/ +%{_qt6_libdir}/cmake/Qt6/FindWrapBundledEmbreeConfigExtra.cmake +%{_qt6_libdir}/cmake/Qt6BundledEmbree/*.cmake +%endif +%dir %{_qt6_libdir}/cmake/Qt6Quick3D/ +%{_qt6_libdir}/cmake/Qt6Quick3D/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DAssetImport/ +%{_qt6_libdir}/cmake/Qt6Quick3DAssetImport/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DRuntimeRender/ +%{_qt6_libdir}/cmake/Qt6Quick3DRuntimeRender/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DTools/ +%{_qt6_libdir}/cmake/Qt6Quick3DTools/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DUtils/ +%{_qt6_libdir}/cmake/Qt6Quick3DUtils/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DAssetUtils/ +%{_qt6_libdir}/cmake/Qt6Quick3DAssetUtils/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DEffects/ +%{_qt6_libdir}/cmake/Qt6Quick3DEffects/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DHelpers/ +%{_qt6_libdir}/cmake/Qt6Quick3DHelpers/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DHelpersImpl/ +%{_qt6_libdir}/cmake/Qt6Quick3DHelpersImpl/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DGlslParserPrivate +%{_qt6_libdir}/cmake/Qt6Quick3DGlslParserPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects +%{_qt6_libdir}/cmake/Qt6Quick3DParticleEffects/*.cmake +%ifarch x86_64 aarch64 +%{_qt6_libdir}/libQt6BundledEmbree.a +%endif +%{_qt6_libdir}/libQt6Quick3D.prl +%{_qt6_libdir}/libQt6Quick3D.so +%{_qt6_libdir}/libQt6Quick3DAssetImport.prl +%{_qt6_libdir}/libQt6Quick3DAssetImport.so +%{_qt6_libdir}/libQt6Quick3DRuntimeRender.prl +%{_qt6_libdir}/libQt6Quick3DRuntimeRender.so +%{_qt6_libdir}/libQt6Quick3DUtils.prl +%{_qt6_libdir}/libQt6Quick3DUtils.so +%{_qt6_libdir}/libQt6Quick3DIblBaker.prl +%{_qt6_libdir}/libQt6Quick3DIblBaker.so +%{_qt6_libdir}/libQt6Quick3DParticles.prl +%{_qt6_libdir}/libQt6Quick3DParticles.so +%{_qt6_libdir}/libQt6Quick3DAssetUtils.prl +%{_qt6_libdir}/libQt6Quick3DAssetUtils.so +%{_qt6_libdir}/libQt6Quick3DEffects.prl +%{_qt6_libdir}/libQt6Quick3DEffects.so +%{_qt6_libdir}/libQt6Quick3DHelpers.prl +%{_qt6_libdir}/libQt6Quick3DHelpers.so +%{_qt6_libdir}/libQt6Quick3DHelpersImpl.prl +%{_qt6_libdir}/libQt6Quick3DHelpersImpl.so +%{_qt6_libdir}/libQt6Quick3DGlslParser.prl +%{_qt6_libdir}/libQt6Quick3DGlslParser.so +%{_qt6_libdir}/libQt6Quick3DParticleEffects.prl +%{_qt6_libdir}/libQt6Quick3DParticleEffects.so +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_plugindir}/qmltooling/libqmldbg_quick3dprofiler.so +%{_qt6_libdir}/pkgconfig/*.pc + + +%ifnarch s390x +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif +%endif + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Mon Feb 19 2024 Jan Grulich - 6.6.2-2 +- Examples: also install source files + +* Thu Feb 15 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Jan Grulich - 6.0.0-1 +- 6.0.0 diff --git a/base/qt6/qt6-qtquick3d/qtquick3d-fix-build-with-gcc11.patch b/base/qt6/qt6-qtquick3d/qtquick3d-fix-build-with-gcc11.patch new file mode 100644 index 0000000..f389f77 --- /dev/null +++ b/base/qt6/qt6-qtquick3d/qtquick3d-fix-build-with-gcc11.patch @@ -0,0 +1,24 @@ +diff --git a/src/3rdparty/assimp/src/code/Common/Importer.cpp b/src/3rdparty/assimp/src/code/Common/Importer.cpp +index a2ad041..6f2438f 100644 +--- a/src/3rdparty/assimp/src/code/Common/Importer.cpp ++++ b/src/3rdparty/assimp/src/code/Common/Importer.cpp +@@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + #include + #include + #include ++#include + + // ------------------------------------------------------------------------------------------------ + /* Uncomment this line to prevent Assimp from catching unknown exceptions. +diff --git a/src/3rdparty/assimp/src/include/assimp/Importer.hpp b/src/3rdparty/assimp/src/include/assimp/Importer.hpp +index 09b5b68..89eb071 100644 +--- a/src/3rdparty/assimp/src/include/assimp/Importer.hpp ++++ b/src/3rdparty/assimp/src/include/assimp/Importer.hpp +@@ -58,6 +58,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + // Public ASSIMP data structures + #include ++#include + + #include + diff --git a/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec b/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec new file mode 100644 index 0000000..4665a68 --- /dev/null +++ b/base/qt6/qt6-qtquicktimeline/qt6-qtquicktimeline.spec @@ -0,0 +1,213 @@ + +%global qt_module qtquicktimeline + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - QuickTimeline plugin +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +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 + +BuildRequires: cmake +%if 0%{?rhel} >= 10 +BuildRequires: gcc-c++ +%else +BuildRequires: gcc-toolset-13-gcc-c++ +%endif +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros >= %{version} +BuildRequires: qt6-qtbase-static >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtdeclarative-static + + +%description +The Qt Quick Timeline plugin provides QML types to use timelines and keyframes +to animate Qt Quick user interfaces. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qtdeclarative-devel%{?_isa} +%description devel +%{summary}. + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%if 0%{?rhel} < 10 +%enable_devtoolset13 +%endif +%cmake_qt6 + +%cmake_build + + +%install +%cmake_install + +%ldconfig_scriptlets + +%files +%license LICENSES/GPL* +%dir %{_qt6_qmldir}/QtQuick +%{_qt6_libdir}/libQt6QuickTimeline.so.6* +%{_qt6_libdir}/libQt6QuickTimelineBlendTrees.so.6* +%{_qt6_qmldir}/QtQuick/Timeline/ + +%files devel +%{_qt6_includedir}/QtQuickTimeline/ +%{_qt6_includedir}/QtQuickTimelineBlendTrees/ +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QuickTimeline/ +%{_qt6_libdir}/cmake/Qt6QuickTimeline/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QuickTimelineBlendTrees/ +%{_qt6_libdir}/cmake/Qt6QuickTimelineBlendTrees/*.cmake +%{_qt6_libdir}/libQt6QuickTimeline.prl +%{_qt6_libdir}/libQt6QuickTimeline.so +%{_qt6_libdir}/libQt6QuickTimeline.prl +%{_qt6_libdir}/libQt6QuickTimeline.so +%{_qt6_libdir}/libQt6QuickTimelineBlendTrees.prl +%{_qt6_libdir}/libQt6QuickTimelineBlendTrees.so +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Thu Feb 15 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Jan Grulich - 6.0.0-1 +- 6.0.0 diff --git a/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec b/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec new file mode 100644 index 0000000..5180533 --- /dev/null +++ b/base/qt6/qt6-qtremoteobjects/qt6-qtremoteobjects.spec @@ -0,0 +1,199 @@ + +%global qt_module qtremoteobjects + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Qt Remote Objects +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +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 + +%description +Qt Remote Objects (QtRO) is an inter-process communication (IPC) module developed for Qt. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtremoteobjects-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + +%install +%cmake_install + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libexecdir}/repc +%{_qt6_libdir}/libQt6RemoteObjects.so.6* +%{_qt6_libdir}/libQt6RemoteObjectsQml.so.6* +%{_qt6_qmldir}/QtRemoteObjects/ + +%files devel +%{_qt6_headerdir}/QtRemoteObjects/ +%{_qt6_headerdir}/QtRepParser/ +%{_qt6_headerdir}/QtRemoteObjectsQml/ +%{_qt6_libdir}/libQt6RemoteObjects.so +%{_qt6_libdir}/libQt6RemoteObjects.prl +%{_qt6_libdir}/libQt6RemoteObjectsQml.prl +%{_qt6_libdir}/libQt6RemoteObjectsQml.so +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtRemoteObjectsTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6RemoteObjects/ +%{_qt6_libdir}/cmake/Qt6RemoteObjects/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6RemoteObjectsQml +%{_qt6_libdir}/cmake/Qt6RemoteObjectsQml/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6RepParser +%{_qt6_libdir}/cmake/Qt6RepParser/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6RemoteObjectsTools +%{_qt6_libdir}/cmake/Qt6RemoteObjectsTools/*.cmake +%{_qt6_archdatadir}/mkspecs/features/* +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc diff --git a/base/qt6/qt6-qtscxml/qt6-qtscxml.spec b/base/qt6/qt6-qtscxml/qt6-qtscxml.spec new file mode 100644 index 0000000..bba4448 --- /dev/null +++ b/base/qt6/qt6-qtscxml/qt6-qtscxml.spec @@ -0,0 +1,219 @@ + +%global qt_module qtscxml + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - ScXml component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +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: openssl3-devel + +%description +The Qt SCXML module provides functionality to create state machines from SCXML files. +This includes both dynamically creating state machines loading the SCXML file and instantiating states and transitions) +and generating a C++ file that has a class implementing the state machine. +It also contains functionality to support data models and executable content. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qtdeclarative-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtscxml-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + +%install +%cmake_install + + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6Scxml.so.6* +%{_qt6_libdir}/libQt6ScxmlQml.so.6* +%{_qt6_libdir}/libQt6StateMachineQml.so.6* +%{_qt6_libdir}/libQt6StateMachine.so.6* +%{_qt6_libexecdir}/qscxmlc +%{_qt6_qmldir}/QtScxml/ +%{_qt6_qmldir}/QtQml/ + +%{_qt6_plugindir}/scxmldatamodel/libqscxmlecmascriptdatamodel.so + +%files devel +%{_qt6_headerdir}/QtScxml/ +%{_qt6_headerdir}/QtScxmlQml/ +%{_qt6_headerdir}/QtStateMachineQml +%{_qt6_headerdir}/QtStateMachine/ +%{_qt6_libdir}/libQt6Scxml.so +%{_qt6_libdir}/libQt6Scxml.prl +%{_qt6_libdir}/libQt6ScxmlQml.prl +%{_qt6_libdir}/libQt6ScxmlQml.so +%{_qt6_libdir}/libQt6StateMachine.prl +%{_qt6_libdir}/libQt6StateMachine.so +%{_qt6_libdir}/libQt6StateMachineQml.prl +%{_qt6_libdir}/libQt6StateMachineQml.so +%{_qt6_libdir}/cmake/Qt6Scxml +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtScxmlTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%{_qt6_libdir}/cmake/Qt6ScxmlQml/*.cmake +%{_qt6_libdir}/cmake/Qt6ScxmlTools/*.cmake +%{_qt6_libdir}/cmake/Qt6StateMachine/*.cmake +%{_qt6_libdir}/cmake/Qt6StateMachineQml/*.cmake +%{_qt6_archdatadir}/mkspecs/features/qscxmlc.prf +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Jan Grulich - 6.1.1 +- 6.1.1 diff --git a/base/qt6/qt6-qtsensors/qt6-qtsensors.spec b/base/qt6/qt6-qtsensors/qt6-qtsensors.spec new file mode 100644 index 0000000..63c5ce4 --- /dev/null +++ b/base/qt6/qt6-qtsensors/qt6-qtsensors.spec @@ -0,0 +1,218 @@ + +%global qt_module qtsensors + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Sensors component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details +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) +%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 + +# filter qml/plugin provides +%global __provides_exclude_from ^(%{_qt6_archdatadir}/qml/.*\\.so|%{_qt6_plugindir}/.*\\.so)$ + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel >= %{version} +BuildRequires: qt6-qtsvg-devel >= %{version} + +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: openssl3-devel + +# provides a plugin that can use iio-sensor-proxy +Recommends: iio-sensor-proxy + +%description +The Qt Sensors API provides access to sensor hardware via QML and C++ +interfaces. The Qt Sensors API also provides a motion gesture recognition +API for devices. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtsensors-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6Sensors.so.6* +%{_qt6_libdir}/libQt6SensorsQuick.so.6* +%{_qt6_plugindir}/sensors/ +%{_qt6_archdatadir}/qml/QtSensors/ + +%files devel +%{_qt6_headerdir}/QtSensors/ +%{_qt6_headerdir}/QtSensorsQuick/ +%{_qt6_libdir}/libQt6Sensors.so +%{_qt6_libdir}/libQt6Sensors.prl +%{_qt6_libdir}/libQt6SensorsQuick.prl +%{_qt6_libdir}/libQt6SensorsQuick.so +%{_qt6_libdir}/cmake/Qt6/FindSensorfw.cmake +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtSensorsTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Sensors/ +%{_qt6_libdir}/cmake/Qt6Sensors/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6SensorsQuick/ +%{_qt6_libdir}/cmake/Qt6SensorsQuick/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_sensors*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc diff --git a/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec b/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec new file mode 100644 index 0000000..f16916e --- /dev/null +++ b/base/qt6/qt6-qtserialbus/qt6-qtserialbus.spec @@ -0,0 +1,195 @@ + +%global qt_module qtserialbus + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - SerialBus component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +## upstreamable patches +# workaround FTBFS against kernel-header-5.2.0+ +Patch100: qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +#libQt6Core.so.6(Qt_5_PRIVATE_API)(64bit) +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtserialport-devel >= %{version} + +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: openssl3-devel + +%description +Qt Serial Bus (API) provides classes and functions to access the various +industrial serial buses and protocols, such as CAN, ModBus, and others. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtserialbus-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6SerialBus.so.6* +%{_qt6_bindir}/canbusutil +%{_qt6_plugindir}/canbus + +%files devel +%{_qt6_headerdir}/QtSerialBus/ +%{_qt6_libdir}/libQt6SerialBus.so +%{_qt6_libdir}/libQt6SerialBus.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtSerialBusTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6SerialBus/ +%{_qt6_libdir}/cmake/Qt6SerialBus/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/* +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 20 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc diff --git a/base/qt6/qt6-qtserialbus/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch b/base/qt6/qt6-qtserialbus/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch new file mode 100644 index 0000000..b37b8d2 --- /dev/null +++ b/base/qt6/qt6-qtserialbus/qtserialbus-everywhere-src-5.12.3-SIOCGSTAMP.patch @@ -0,0 +1,16 @@ +diff --git a/src/plugins/canbus/socketcan/socketcanbackend.cpp b/src/plugins/canbus/socketcan/socketcanbackend.cpp +index 572fef8..68e8b3f 100644 +--- a/src/plugins/canbus/socketcan/socketcanbackend.cpp ++++ b/src/plugins/canbus/socketcan/socketcanbackend.cpp +@@ -56,6 +56,11 @@ + #include + #include + ++// Seems that kernel 5.2.0 renames this define to SIOCGSTAMP_OLD ++#ifndef SIOCGSTAMP ++#define SIOCGSTAMP 0x8906 /* Get stamp (timeval) */ ++#endif ++ + #ifndef CANFD_BRS + # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ + #endif diff --git a/base/qt6/qt6-qtserialport/qt6-qtserialport.spec b/base/qt6/qt6-qtserialport/qt6-qtserialport.spec new file mode 100644 index 0000000..590059b --- /dev/null +++ b/base/qt6/qt6-qtserialport/qt6-qtserialport.spec @@ -0,0 +1,194 @@ + +%global qt_module qtserialport + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - SerialPort component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +# See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details +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) +%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 + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: pkgconfig(libudev) + +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} + +%description +Qt Serial Port provides the basic functionality, which includes configuring, +I/O operations, getting and setting the control signals of the RS-232 pinouts. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtserialport-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%enable_devtoolset13 + +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_INSTALL_EXAMPLES_SOURCES=%{?examples:ON}%{!?examples:OFF} + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6SerialPort.so.6* + +%files devel +%{_qt6_headerdir}/QtSerialPort/ +%{_qt6_libdir}/libQt6SerialPort.so +%{_qt6_libdir}/libQt6SerialPort.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtSerialPortTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6SerialPort/ +%{_qt6_libdir}/cmake/Qt6SerialPort/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_serialport*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc diff --git a/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec b/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec new file mode 100644 index 0000000..e52fd53 --- /dev/null +++ b/base/qt6/qt6-qtshadertools/qt6-qtshadertools.spec @@ -0,0 +1,232 @@ + +%global qt_module qtshadertools + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - Qt Shader Tools module builds on the SPIR-V Open Source Ecosystem +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +# Upstream patches + +# Upstreamable patches + +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: pkgconfig(xkbcommon) >= 1.3 + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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 + + +%install +%cmake_install + +# hardlink files to %{_bindir}, add -qt6 postfix to not conflict +mkdir %{buildroot}%{_bindir} +pushd %{buildroot}%{_qt6_bindir} +for i in * ; do + case "${i}" in + qsb) + ln -v ${i} %{buildroot}%{_bindir}/${i}-qt6 + ;; + *) + ln -v ${i} %{buildroot}%{_bindir}/${i} + ;; + esac +done +popd + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_bindir}/qsb-qt6 +%{_qt6_bindir}/qsb +%{_qt6_libdir}/libQt6ShaderTools.so.6* + + +%files devel +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_headerdir}/QtShaderTools/ +%{_qt6_libdir}/libQt6ShaderTools.prl +%{_qt6_libdir}/libQt6ShaderTools.so +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtShaderToolsTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6ShaderTools/ +%{_qt6_libdir}/cmake/Qt6ShaderTools/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6ShaderToolsTools/ +%{_qt6_libdir}/cmake/Qt6ShaderToolsTools/*.cmake +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/pkgconfig/Qt6ShaderTools.pc + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Mon Apr 03 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-3 +- Backport glslang and SPIRV-tools patches for s390x builds + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-2 +- Skip s390x because of QTBUG-93101 + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Mon Aug 30 2021 Jan Grulich - 6.2.0~beta3-1 +- 6.2.0 - beta3 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 13 2021 Jan Grulich - 6.0.0 +- 6.0.0 diff --git a/base/qt6/qt6-qtspeech/qt6-qtspeech.spec b/base/qt6/qt6-qtspeech/qt6-qtspeech.spec index f8f082c..3bf1362 100644 --- a/base/qt6/qt6-qtspeech/qt6-qtspeech.spec +++ b/base/qt6/qt6-qtspeech/qt6-qtspeech.spec @@ -10,8 +10,8 @@ Summary: Qt6 - Speech component Name: qt6-%{qt_module} -Version: 6.6.1 -Release: 3%{?dist} +Version: 6.7.0 +Release: 1%{?dist} # Code can be either LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only # See e.g. src/plugins/speechdispatcher or src/tts @@ -21,7 +21,7 @@ Url: http://www.qt.io %global majmin %(echo %{version} | cut -d. -f1-2) Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-src-%{version}.tar.xz -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: qt6-qtbase-devel >= %{version} @@ -84,6 +84,8 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %build +%enable_devtoolset13 + %cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} %cmake_build @@ -145,6 +147,9 @@ popd %changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + * Sat Dec 16 2023 Raven - 6.6.1-1 - update to 6.6.1 diff --git a/base/qt6/qt6-qtsvg/qt6-qtsvg.spec b/base/qt6/qt6-qtsvg/qt6-qtsvg.spec new file mode 100644 index 0000000..69cf866 --- /dev/null +++ b/base/qt6/qt6-qtsvg/qt6-qtsvg.spec @@ -0,0 +1,246 @@ + +%global qt_module qtsvg + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - Support for rendering and displaying SVG +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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) +%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 + +# filter plugin provides +%global __provides_exclude_from ^%{_qt6_plugindir}/.*\\.so$ + +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: pkgconfig(zlib) +BuildRequires: pkgconfig(xkbcommon) >= 1.3 + +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} + +%description +Scalable Vector Graphics (SVG) is an XML-based language for describing +two-dimensional vector graphics. Qt provides classes for rendering and +displaying SVG drawings in widgets and on other paint devices. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%files +%license LICENSES/GPL* LICENSES/LGPL* +%{_qt6_libdir}/libQt6Svg.so.6* +%{_qt6_libdir}/libQt6SvgWidgets.so.6* +%{_qt6_plugindir}/iconengines/libqsvgicon.so +%{_qt6_plugindir}/imageformats/libqsvg.so + +%files devel +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_headerdir}/QtSvg/ +%{_qt6_headerdir}/QtSvgWidgets/ +%{_qt6_libdir}/libQt6Svg.so +%{_qt6_libdir}/libQt6Svg.prl +%{_qt6_libdir}/libQt6SvgWidgets.so +%{_qt6_libdir}/libQt6SvgWidgets.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtSvgTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Gui/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6Svg/ +%{_qt6_libdir}/cmake/Qt6Svg/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6SvgWidgets/ +%{_qt6_libdir}/cmake/Qt6SvgWidgets/*.cmake +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +# FIXME there don't seem to be any examples +%files examples +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Wed Oct 18 2023 Jan Grulich - 6.6.0-3 +- Don't crash QML image on bad source + +* Tue Oct 17 2023 Jan Grulich - 6.6.0-2 +- Re-enable examples + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Thu May 26 2022 Jan Grulich - 6.3.0-3 +- -examples: qt6-qtsvg-common doesn't exist + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-3 +- Enable s390x builds + +* Thu Feb 03 2022 Benjamin A. Beasley - 6.2.3-2 +- Fix license file name (fix RHBZ#2048723) + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Jan Grulich - 6.0.0 +- 6.0.0 diff --git a/base/qt6/qt6-qttools/qt6-qttools.spec b/base/qt6/qt6-qttools/qt6-qttools.spec index cade608..3729939 100644 --- a/base/qt6/qt6-qttools/qt6-qttools.spec +++ b/base/qt6/qt6-qttools/qt6-qttools.spec @@ -1,4 +1,3 @@ - %global qt_module qttools #global unstable 1 @@ -10,8 +9,8 @@ Summary: Qt6 - QtTool components Name: qt6-qttools -Version: 6.6.1 -Release: 1%{?dist} +Version: 6.7.0 +Release: 2%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -37,11 +36,8 @@ Source20: assistant.desktop Source21: designer.desktop Source22: linguist.desktop Source23: qdbusviewer.desktop -%if 0%{?use_clang} -BuildRequires: clang -%else -BuildRequires: gcc-c++ -%endif + +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: desktop-file-utils @@ -52,8 +48,9 @@ BuildRequires: qt6-qtbase-static >= %{version} BuildRequires: qt6-qtdeclarative-static >= %{version} BuildRequires: qt6-qtdeclarative >= %{version} %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} -BuildRequires: clang-devel llvm-devel +BuildRequires: llvm-devel clang-devel >= 17.0 BuildRequires: libzstd-devel +BuildRequires: pkgconfig(xkbcommon) >= 1.3 Requires: %{name}-common = %{version}-%{release} @@ -77,6 +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 %description devel %{summary}. @@ -117,15 +115,6 @@ Requires: %{name}-libs-designercomponents%{?_isa} = %{version}-%{release} %description -n qt6-designer %{summary}. -%if 0%{?webkit} -%package -n qt6-designer-plugin-webkit -Summary: Qt6 designer plugin for WebKit -BuildRequires: pkgconfig(Qt6WebKitWidgets) -Requires: %{name}-libs-designer%{?_isa} = %{version}-%{release} -%description -n qt6-designer-plugin-webkit -%{summary}. -%endif - %package -n qt6-linguist Summary: Qt6 Linguist Tools Requires: %{name}-common = %{version}-%{release} @@ -162,12 +151,15 @@ Requires: %{name}-common = %{version}-%{release} %endif %build -%if 0%{?use_clang} -export CC=clang -export CXX=clang++ -%endif +%enable_devtoolset13 -%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} +%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} %cmake_build @@ -248,20 +240,14 @@ popd %files common %license LICENSES/LGPL* -%ldconfig_scriptlets libs-designer - %files libs-designer %{_qt6_libdir}/libQt6Designer.so.6* %dir %{_qt6_libdir}/cmake/Qt6Designer/ %{_qt6_plugindir}/designer/* -%ldconfig_scriptlets libs-designercomponents - %files libs-designercomponents %{_qt6_libdir}/libQt6DesignerComponents.so.6* -%ldconfig_scriptlets libs-help - %files libs-help %{_qt6_libdir}/libQt6Help.so.6* @@ -271,7 +257,6 @@ popd %{_datadir}/applications/*assistant.desktop %{_datadir}/icons/hicolor/*/apps/assistant*.* - %files -n qt6-doctools %{_bindir}/qdoc* %{_qt6_bindir}/qdoc* @@ -286,13 +271,6 @@ popd %{_datadir}/applications/*designer.desktop %{_datadir}/icons/hicolor/*/apps/designer*.* -%if 0%{?webkit} -%files -n qt6-designer-plugin-webkit -%{_qt6_plugindir}/designer/libqwebview.so -%{_qt6_libdir}/cmake/Qt6Designer/Qt6Designer_QWebViewPlugin.cmake -%endif - - %files -n qt6-linguist %{_bindir}/linguist* %{_qt6_bindir}/linguist* @@ -324,21 +302,28 @@ popd %{_qt6_bindir}/pixeltool* %{_qt6_bindir}/qtdiag* %{_qt6_bindir}/qtplugininfo* +%{_qt6_headerdir}/QtQDocCatch/ +%{_qt6_headerdir}/QtQDocCatchConversions/ +%{_qt6_headerdir}/QtQDocCatchGenerators/ %{_qt6_headerdir}/QtDesigner/ %{_qt6_headerdir}/QtDesignerComponents/ %{_qt6_headerdir}/QtHelp/ %{_qt6_headerdir}/QtUiPlugin %{_qt6_headerdir}/QtUiTools/ %{_qt6_headerdir}/QtTools/ -%{_qt6_headerdir}/QtQDocCatch* %{_qt6_libdir}/libQt6Designer*.so %{_qt6_libdir}/libQt6Help.so %{_qt6_libdir}/libQt6UiTools.so %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake -%{_qt6_libdir}/cmake/Qt6QDocCatch* %{_qt6_libdir}/cmake/Qt6Designer/*.cmake %{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QDocCatchPrivate +%{_qt6_libdir}/cmake/Qt6QDocCatchPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QDocCatchConversionsPrivate +%{_qt6_libdir}/cmake/Qt6QDocCatchConversionsPrivate/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6QDocCatchGeneratorsPrivate +%{_qt6_libdir}/cmake/Qt6QDocCatchGeneratorsPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6Help/ %{_qt6_libdir}/cmake/Qt6Help/*.cmake %dir %{_qt6_libdir}/cmake/Qt6Linguist @@ -353,22 +338,19 @@ popd %{_qt6_libdir}/cmake/Qt6ToolsTools/*.cmake %dir %{_qt6_libdir}/cmake/Qt6LinguistTools %{_qt6_libdir}/cmake/Qt6UiTools/ +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatch_private.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversions_private.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgenerators_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designer_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_designercomponents_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_help.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_help_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_linguist_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_tools_private.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uiplugin.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools.pri %{_qt6_archdatadir}/mkspecs/modules/qt_lib_uitools_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatch_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversionsprivate.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchconversionsprivate_private.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgeneratorsprivate.pri -%{_qt6_archdatadir}/mkspecs/modules/qt_lib_qdoccatchgeneratorsprivate_private.pri %{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json %{_qt6_libdir}/qt6/modules/*.json %{_qt6_libdir}/pkgconfig/*.pc @@ -381,13 +363,39 @@ popd %if 0%{?examples} %files examples %{_qt6_examplesdir}/ -%dir %{_qt6_libdir}/cmake/Qt6Designer %endif %changelog -* Sat Dec 16 2023 Raven - 6.6.1-1 -- update to 6.6.1 +* Mon May 27 2024 Raven - 6.7.0-2 +- rebuilt for new llvm + +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Sat Mar 2 2024 Marie Loise Nolden - 6.6.2-3 +- minor cleanups + +* Mon Feb 19 2024 Jan Grulich - 6.6.2-2 +- Examples: also install source files + +* Thu Feb 15 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild * Fri Jul 21 2023 Jan Grulich - 6.5.2-1 - 6.5.2 diff --git a/base/qt6/qt6-qttranslations/qt6-qttranslations.spec b/base/qt6/qt6-qttranslations/qt6-qttranslations.spec new file mode 100644 index 0000000..a474613 --- /dev/null +++ b/base/qt6/qt6-qttranslations/qt6-qttranslations.spec @@ -0,0 +1,229 @@ +%global qt_module qttranslations + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +Summary: Qt6 - QtTranslations module +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +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 + +BuildArch: noarch + +BuildRequires: cmake +BuildRequires: ninja-build +## versioning recently dropped, but could do >= %%majmin if needed --rex +BuildRequires: qt6-qtbase-devel +# for lrelease +BuildRequires: qt6-linguist +BuildRequires: qt6-qttools-devel + +# help system-config-language and dnf/yum langpacks pull these in +%if 0%{?_qt6:1} +Provides: %{_qt6}-ar = %{version}-%{release} +Provides: %{_qt6}-ca = %{version}-%{release} +Provides: %{_qt6}-cs = %{version}-%{release} +Provides: %{_qt6}-da = %{version}-%{release} +Provides: %{_qt6}-de = %{version}-%{release} +Provides: %{_qt6}-es = %{version}-%{release} +Provides: %{_qt6}-fa = %{version}-%{release} +Provides: %{_qt6}-fi = %{version}-%{release} +Provides: %{_qt6}-fr = %{version}-%{release} +Provides: %{_qt6}-gl = %{version}-%{release} +Provides: %{_qt6}-gd = %{version}-%{release} +Provides: %{_qt6}-he = %{version}-%{release} +Provides: %{_qt6}-hu = %{version}-%{release} +Provides: %{_qt6}-hr = %{version}-%{release} +Provides: %{_qt6}-it = %{version}-%{release} +Provides: %{_qt6}-ja = %{version}-%{release} +Provides: %{_qt6}-ko = %{version}-%{release} +Provides: %{_qt6}-lt = %{version}-%{release} +Provides: %{_qt6}-lv = %{version}-%{release} +Provides: %{_qt6}-nl = %{version}-%{release} +Provides: %{_qt6}-nn = %{version}-%{release} +Provides: %{_qt6}-pl = %{version}-%{release} +Provides: %{_qt6}-pt_BR = %{version}-%{release} +Provides: %{_qt6}-pt_PT = %{version}-%{release} +Provides: %{_qt6}-ru = %{version}-%{release} +Provides: %{_qt6}-sk = %{version}-%{release} +Provides: %{_qt6}-sl = %{version}-%{release} +Provides: %{_qt6}-sv = %{version}-%{release} +Provides: %{_qt6}-uk = %{version}-%{release} +Provides: %{_qt6}-zh_CN = %{version}-%{release} +Provides: %{_qt6}-zh_TW = %{version}-%{release} +%endif + +%description +%{summary}. + + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build +%cmake_qt6 + +%cmake_build + + +%install +%cmake_install + +# not used currently, since we track locales manually to keep %%files/Provides sync'd -- rex +#find_lang qttranslations --all-name --with-qt --without-mo + +%files +%license LICENSES/* +%{_qt6_datadir}/translations/catalogs.json +%lang(ar) %{_qt6_translationdir}/*_ar.qm +%lang(bg) %{_qt6_translationdir}/*_bg.qm +%lang(ca) %{_qt6_translationdir}/*_ca.qm +%lang(cs) %{_qt6_translationdir}/*_cs.qm +%lang(da) %{_qt6_translationdir}/*_da.qm +%lang(de) %{_qt6_translationdir}/*_de.qm +%lang(es) %{_qt6_translationdir}/*_es.qm +%lang(en) %{_qt6_translationdir}/*_en.qm +%lang(fa) %{_qt6_translationdir}/*_fa.qm +%lang(fi) %{_qt6_translationdir}/*_fi.qm +%lang(fr) %{_qt6_translationdir}/*_fr.qm +%lang(gd) %{_qt6_translationdir}/*_gd.qm +%lang(gl) %{_qt6_translationdir}/*_gl.qm +%lang(he) %{_qt6_translationdir}/*_he.qm +%lang(hu) %{_qt6_translationdir}/*_hu.qm +%lang(hr) %{_qt6_translationdir}/*_hr.qm +%lang(it) %{_qt6_translationdir}/*_it.qm +%lang(ja) %{_qt6_translationdir}/*_ja.qm +%lang(ko) %{_qt6_translationdir}/*_ko.qm +%lang(lt) %{_qt6_translationdir}/*_lt.qm +%lang(lv) %{_qt6_translationdir}/*_lv.qm +%lang(nl) %{_qt6_translationdir}/*_nl.qm +%lang(nn) %{_qt6_translationdir}/*_nn.qm +%lang(pl) %{_qt6_translationdir}/*_pl.qm +%lang(pt_BR) %{_qt6_translationdir}/*_pt_BR.qm +%lang(pt_PT) %{_qt6_translationdir}/*_pt_PT.qm +%lang(ru) %{_qt6_translationdir}/*_ru.qm +%lang(sk) %{_qt6_translationdir}/*_sk.qm +%lang(sl) %{_qt6_translationdir}/*_sl.qm +%lang(sv) %{_qt6_translationdir}/*_sv.qm +%lang(tr) %{_qt6_translationdir}/*_tr.qm +%lang(uk) %{_qt6_translationdir}/*_uk.qm +%lang(zh_CN) %{_qt6_translationdir}/*_zh_CN.qm +%lang(zh_TW) %{_qt6_translationdir}/*_zh_TW.qm + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Jan 14 2021 Jan Grulich - 6.0.0-1 +- 6.0.0 diff --git a/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec b/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec new file mode 100644 index 0000000..b66c1d5 --- /dev/null +++ b/base/qt6/qt6-qtvirtualkeyboard/qt6-qtvirtualkeyboard.spec @@ -0,0 +1,229 @@ + +%global qt_module qtvirtualkeyboard + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - VirtualKeyboard component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: GPL-3.0-only WITH Qt-GPL-exception-1.0 +Url: http://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 + +## upstreamable patches + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel >= %{version} +BuildRequires: qt6-qtsvg-devel >= %{version} +BuildRequires: pkgconfig(xkbcommon) +BuildRequires: openssl3-devel +BuildRequires: hunspell-devel + +# version unknown +Provides: bundled(libpinyin) + +%description +The Qt Virtual Keyboard project provides an input framework and reference keyboard frontend +for Qt 6. Key features include: +* Customizable keyboard layouts and styles with dynamic switching. +* Predictive text input with word selection. +* Character preview and alternative character view. +* Automatic capitalization and space insertion. +* Scalability to different resolutions. +* Support for different character sets (Latin, Simplified/Traditional Chinese, Hindi, Japanese, Arabic, Korean, and others). +* Support for most common input languages, with possibility to easily extend the language support. +* Left-to-right and right-to-left input. +* Hardware key support for 2-way and 5-way navigation. +* Handwriting support, with gestures for fullscreen input. +* Audio feedback. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6HunspellInputMethod.so.6* +%{_qt6_libdir}/libQt6VirtualKeyboard.so.6* +%{_qt6_libdir}/libQt6VirtualKeyboardSettings.so.6* +%{_qt6_plugindir}/platforminputcontexts/libqtvirtualkeyboardplugin.so +%{_qt6_qmldir}/QtQuick/VirtualKeyboard/ + +%files devel +%{_qt6_headerdir}/QtHunspellInputMethod/ +%{_qt6_headerdir}/QtVirtualKeyboard/ +%{_qt6_headerdir}/QtVirtualKeyboardSettings/ +%{_qt6_libdir}/libQt6HunspellInputMethod.prl +%{_qt6_libdir}/libQt6HunspellInputMethod.so +%{_qt6_libdir}/libQt6VirtualKeyboard.prl +%{_qt6_libdir}/libQt6VirtualKeyboard.so +%{_qt6_libdir}/libQt6VirtualKeyboardSettings.prl +%{_qt6_libdir}/libQt6VirtualKeyboardSettings.so +%{_qt6_libdir}/cmake/Qt6/ +%{_qt6_libdir}/cmake/Qt6HunspellInputMethod/ +%{_qt6_libdir}/cmake/Qt6VirtualKeyboard/ +%{_qt6_libdir}/cmake/Qt6VirtualKeyboardSettings/ +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtVirtualKeyboardTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6BundledOpenwnn/Qt6BundledOpenwnnDependencies.cmake +%{_qt6_libdir}/cmake/Qt6BundledPinyin/Qt6BundledPinyinDependencies.cmake +%{_qt6_libdir}/cmake/Qt6BundledTcime/Qt6BundledTcimeDependencies.cmake +%{_qt6_libdir}/cmake/Qt6Gui/Qt6QVirtualKeyboardPlugin*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_hunspellinputmethod*.pri +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_virtualkeyboard*.pri +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-4 +- migrated to SPDX license + +* Mon Jan 23 2023 Yaakov Selkowitz - 6.4.2-3 +- Enable the Hunspell input method + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 11 2021 Jan Grulich - 6.1.1 +- 6.1.1 diff --git a/base/qt6/qt6-qtwayland/qt6-qtwayland.spec b/base/qt6/qt6-qtwayland/qt6-qtwayland.spec index e94eb5f..ebf351f 100644 --- a/base/qt6/qt6-qtwayland/qt6-qtwayland.spec +++ b/base/qt6/qt6-qtwayland/qt6-qtwayland.spec @@ -12,8 +12,8 @@ Summary: Qt6 - Wayland platform support and QtCompositor module Name: qt6-%{qt_module} -Version: 6.6.1 -Release: 2%{?dist} +Version: 6.7.0 +Release: 1%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -35,7 +35,7 @@ Patch0: qtwayland-use-adwaita-decorations-by-default.patch # filter qml provides %global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ -BuildRequires: gcc-c++ +BuildRequires: gcc-toolset-13-gcc-c++ BuildRequires: cmake BuildRequires: ninja-build BuildRequires: qt6-qtbase-devel >= %{version} @@ -44,12 +44,12 @@ BuildRequires: qt6-qtbase-private-devel %{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} BuildRequires: qt6-qtdeclarative-devel -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon) >= 1.3 BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) -BuildRequires: pkgconfig(wayland-client) +BuildRequires: pkgconfig(wayland-client) >= 1.22 BuildRequires: pkgconfig(wayland-cursor) -BuildRequires: pkgconfig(wayland-egl) >= 1.22 +BuildRequires: pkgconfig(wayland-egl) BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(xcomposite) @@ -64,6 +64,7 @@ Requires: rx-libwayland-client Requires: rx-libwayland-cursor Requires: rx-libwayland-server Requires: rx-libinput +Requires: rx-libxkbcommon %description %{summary}. @@ -90,6 +91,7 @@ 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}" @@ -185,6 +187,9 @@ popd %endif %changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 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 new file mode 100644 index 0000000..e72c5f1 --- /dev/null +++ b/base/qt6/qt6-qtwebchannel/qt6-qtwebchannel.spec @@ -0,0 +1,212 @@ + +%global qt_module qtwebchannel + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - WebChannel component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +Url: http://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 + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +#libQt6Core.so.6(Qt_5_PRIVATE_API)(64bit) +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: qt6-qtdeclarative-devel +BuildRequires: qt6-qtwebsockets-devel + +BuildRequires: pkgconfig(xkbcommon) >= 1.3 +BuildRequires: openssl3-devel + +%description +The Qt WebChannel module provides a library for seamless integration of C++ +and QML applications with HTML/JavaScript clients. Any QObject can be +published to remote clients, where its public API becomes available. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtwebchannel-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6WebChannel.so.6* +%{_qt6_libdir}/libQt6WebChannelQuick.so.6* +%{_qt6_archdatadir}/qml/QtWebChannel/ + +%files devel +%{_qt6_headerdir}/QtWebChannel/ +%{_qt6_headerdir}/QtWebChannelQuick/ +%{_qt6_libdir}/libQt6WebChannel.so +%{_qt6_libdir}/libQt6WebChannel.prl +%{_qt6_libdir}/libQt6WebChannelQuick.so +%{_qt6_libdir}/libQt6WebChannelQuick.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebChannelTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6WebChannel/ +%{_qt6_libdir}/cmake/Qt6WebChannel/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6WebChannelQuick/ +%{_qt6_libdir}/cmake/Qt6WebChannelQuick/*.cmake +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_webchannel*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc diff --git a/base/qt6/qt6-qtwebengine/Partial-migration-from-imp-to-importlib.patch b/base/qt6/qt6-qtwebengine/Partial-migration-from-imp-to-importlib.patch deleted file mode 100644 index 46cc88f..0000000 --- a/base/qt6/qt6-qtwebengine/Partial-migration-from-imp-to-importlib.patch +++ /dev/null @@ -1,36 +0,0 @@ -From cbf5f7ad619a967bd54482e1d1df36d80b28145a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= -Date: Thu, 13 Jul 2023 12:18:00 +0200 -Subject: [PATCH] Partial migration from imp to importlib - ---- - .../resources/protobufs/binary_proto_generator.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -index 2a1802d..ba67251 100755 ---- a/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -+++ b/src/3rdparty/chromium/components/resources/protobufs/binary_proto_generator.py -@@ -9,7 +9,7 @@ - """ - from __future__ import print_function - import abc --import imp -+from importlib import util - import optparse - import os - import re -@@ -68,7 +68,9 @@ class GoogleProtobufModuleImporter: - raise ImportError(fullname) - - filepath = self._fullname_to_filepath(fullname) -- return imp.load_source(fullname, filepath) -+ spec = util.spec_from_file_location(fullname, filepath) -+ loaded = util.module_from_spec(spec) -+ return spec.loader.exec_module(loaded) - - class BinaryProtoGenerator: - --- -2.41.0 - diff --git a/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine b/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine index c2f9d82..040d584 100644 --- a/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine +++ b/base/qt6/qt6-qtwebengine/macros.qt6-qtwebengine @@ -2,3 +2,5 @@ %_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/qt-installer-package-config.json b/base/qt6/qt6-qtwebengine/qt-installer-package-config.json new file mode 100644 index 0000000..ac604d7 --- /dev/null +++ b/base/qt6/qt6-qtwebengine/qt-installer-package-config.json @@ -0,0 +1,24 @@ +{ + "version": "1", + "module-split": { + "qtpdf": [ + "**/bin/*Pdf*", + "**/include/*QtPdf*/**/*", + "**/lib/cmake/Qt*Gui/*Pdf*", + "**/lib/cmake/Qt*Pdf*/*", + "**/lib/cmake/Qt*Qml/QmlPlugins/*Pdf*", + "**/lib/pkgconfig/*Pdf*", + "**/lib/*Pdf*", + "**/lib/static_chrome/*", + "**/lib/QtPdf*.framework/**", + "**/metatypes/*pdf*", + "**/mkspecs/modules/qt_lib_pdf*", + "**/mkspecs/modules/qt_plugin_qpdf.pri", + "**/modules/Pdf*", + "**/plugins/imageformats/**/*", + "**/qml/QtQuick/**/*", + "**/qml/QtQuick/Pdf/**/.rcc/*", + "**/qml/QtQuick/Pdf/**/.rcc/qmlcache/*" + ] + } +} diff --git a/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec b/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec index 0230773..76d6eef 100644 --- a/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec +++ b/base/qt6/qt6-qtwebengine/qt6-qtwebengine.spec @@ -19,8 +19,12 @@ %if 0%{?fedora} > 30 || 0%{?epel} > 7 %global use_system_jsoncpp 1 -%global use_system_re2 1 %global use_system_libwebp 1 +%global use_system_harfbuzz 1 +%endif + +%if 0%{?fedora} || 0%{?rhel} >= 9 +%global use_system_re2 1 %endif %if 0%{?fedora} > 34 || 0%{?rhel} >= 8 @@ -55,8 +59,8 @@ Summary: Qt6 - QtWebEngine components Name: qt6-qtwebengine -Version: 6.6.1 -Release: 2%{?dist} +Version: 6.7.1 +Release: 1%{?dist} # See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details # See also http://qt-project.org/doc/qt-6.0/qtdoc/licensing.html @@ -73,30 +77,23 @@ Source10: macros.qt6-qtwebengine # pulseaudio headers Source20: pulseaudio-12.2-headers.tar.gz + # workaround FTBFS against kernel-headers-5.2.0+ Patch1: qtwebengine-SIOCGSTAMP.patch Patch2: qtwebengine-link-pipewire.patch -# Fix/workaround FTBFS on aarch64 with newer glibc -Patch3: qtwebengine-aarch64-new-stat.patch -Patch4: qtwebengine-ffmpeg-first_dts.patch # FTBS warning: elaborated-type-specifier for a scoped enum must not # use the 'class' keyword Patch50: qtwebengine-fix-build.patch -# FTBFS Fix with Python 3.12 later on -# Parts of the project are fine with zombie-imp, this one not, however -# (It's messing with sys.path a lot) -Patch60: Partial-migration-from-imp-to-importlib.patch - ## Upstream patches: -# https://webrtc-review.googlesource.com/c/src/+/285464 -Patch100: qtwebengine-webrtc-dlopen-h264.patch ## Upstreamable patches: -Patch110: qtwebengine-blink-dlopen-h264.patch +Patch110: qtwebengine-webrtc-system-openh264.patch +Patch111: qtwebengine-blink-system-openh264.patch +Patch112: qtwebengine-media-system-openh264.patch -Patch120: qtwebengine-icu-74.patch +Patch500: qtwebengine-everywhere-src-6.7.0-flags-1.patch BuildRequires: make BuildRequires: qt6-qtbase-devel @@ -137,7 +134,7 @@ BuildRequires: flex BuildRequires: clang %else %if 0%{?rhel} && 0%{?rhel} < 10 -BuildRequires: gcc-toolset-13 +BuildRequires: gcc-toolset-13-libatomic-devel %else BuildRequires: gcc-c++ gcc %endif @@ -174,13 +171,10 @@ BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libudev) %if 0%{?use_system_libwebp} -BuildRequires: pkgconfig(libwebp) >= 0.6.0 -%if 0%{?rhel} == 8 -Requires: rx-libwebp +BuildRequires: pkgconfig(libwebp) >= 1.2.0 %endif -%endif -%if !0%{?rhel} -BuildRequires: pkgconfig(harfbuzz) +%if 0%{?use_system_harfbuzz} +BuildRequires: pkgconfig(harfbuzz) >= 2.0 %endif BuildRequires: pkgconfig(libdrm) BuildRequires: pkgconfig(libopenjp2) @@ -216,7 +210,7 @@ BuildRequires: pkgconfig(libpci) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(lcms2) -BuildRequires: pkgconfig(xkbcommon) +BuildRequires: pkgconfig(xkbcommon) >= 1.3 BuildRequires: pkgconfig(xkbfile) BuildRequires: pkgconfig(xshmfence) BuildRequires: python3-html5lib @@ -224,6 +218,7 @@ BuildRequires: python3-html5lib BuildRequires: pkgconfig(libtiff-4) >= 4.2.0 %endif +BuildRequires: pkgconfig(openh264) %if 0%{?use_system_ffmpeg} BuildRequires: pkgconfig(libavcodec) BuildRequires: pkgconfig(libavformat) @@ -268,7 +263,7 @@ BuildRequires: pkgconfig(vpx) >= 1.12.0 # see dist/changes-5.10.1 for the version numbers (base, security fixes) and for # a list of CVEs fixed by the added security backports # See Patch101 for additional fixes applied (up to version 65.0.3325.146) -Provides: bundled(chromium) = 119.0.6045.123 +Provides: bundled(chromium) = 124.0.6367.202 # Bundled in src/3rdparty/chromium/third_party: # Check src/3rdparty/chromium/third_party/*/README.chromium for version numbers, @@ -286,7 +281,7 @@ Provides: bundled(boringssl) Provides: bundled(brotli) %if !0%{?use_system_ffmpeg} # see src/3rdparty/chromium/third_party/ffmpeg/Changelog for the version number -Provides: bundled(ffmpeg) = 5.1.2 +Provides: bundled(ffmpeg) = 6.0.0 %endif Provides: bundled(hunspell) = 1.6.0 Provides: bundled(iccjpeg) @@ -306,9 +301,12 @@ Provides: bundled(libvpx) = 1.12.0 %if !0%{?use_system_libwebp} Provides: bundled(libwebp) = 1.3.0 %endif +%if !0%{?use_system_harfbuzz} +Provides: bundled(harfbuzz) +%endif # bundled as "libxml" # see src/3rdparty/chromium/third_party/libxml/linux/include/libxml/xmlversion.h -Provides: bundled(libxml2) = 2.9.13 +Provides: bundled(libxml2) = 2.12.0 # see src/3rdparty/chromium/third_party/libxslt/linux/config.h for version Provides: bundled(libxslt) = 1.1.3 Provides: bundled(libXNVCtrl) = 302.17 @@ -325,7 +323,7 @@ Provides: bundled(sfntly) Provides: bundled(skia) # bundled as "smhasher" Provides: bundled(SMHasher) = 0-147 -Provides: bundled(sqlite) = 3.39.4 +Provides: bundled(sqlite) = 3.42.0 Provides: bundled(usrsctp) Provides: bundled(webrtc) = 90 @@ -363,7 +361,7 @@ Provides: bundled(nsURLParsers) # Bundled outside of third_party, apparently not considered as such by Chromium: Provides: bundled(mojo) # see src/3rdparty/chromium/v8/include/v8_version.h for the version number -Provides: bundled(v8) = 10.2.154.16 +Provides: bundled(v8) = 11.8.172.18 # bundled by v8 (src/3rdparty/chromium/v8/src/base/ieee754.cc) # The version number is 5.3, the last version that upstream released, years ago: # http://www.netlib.org/fdlibm/readme @@ -379,6 +377,13 @@ Conflicts: qt6-qtwebengine-freeworld < 6.2.0-1 Obsoletes: %{name}-libs < %{version}-%{release} Provides: %{name}-libs = %{version}-%{release} +%if 0%{?rhel} == 8 +Requires: rx-harfbuzz +Requires: rx-libxkbcommon +%if 0%{?use_system_libwebp} +Requires: rx-libwebp +%endif +%endif %description %{summary}. @@ -413,21 +418,17 @@ popd %patch1 -p1 -b .SIOCGSTAMP %patch2 -p1 -b .link-pipewire -%patch3 -p1 -b .aarch64-new-stat -%patch4 -p1 -b .qtwebengine-ffmpeg-first_dts - + %patch50 -p1 -b .fix-build.patch -%if 0%{?fedora} && 0%{?fedora} >= 39 -%patch60 -p1 -b .fix-py-imp.patch -%endif - + ## upstream patches -%patch100 -p1 -b .webrtc-dlopen-h264 - + ## upstreamable patches -%patch110 -p1 -b .blink-dlopen-h264 +%patch110 -p1 -b .webrtc-system-openh264 +%patch111 -p1 -b .blink-system-openh264 +%patch112 -p1 -b .media-system-openh264 -%patch120 -p1 -b .icu +%patch500 -p1 -b .flags # delete all "toolprefix = " lines from build/toolchain/linux/BUILD.gn, as we # never cross-compile in native Fedora RPMs, fixes ARM and aarch64 FTBFS @@ -457,29 +458,27 @@ cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium %build # Increase open files limit -ulimit -n 4096 +ulimit -n 8192 %if %{with clang} export CC=clang export CXX=clang++ %global optflags %(echo %{optflags}) -fpic -fno-semantic-interposition -Qunused-arguments %else -%global _gcc_bindir %{_bindir} -%if 0%{?rhel} && 0%{?rhel} < 10 . /opt/rh/gcc-toolset-13/enable %global _gcc_bindir /opt/rh/gcc-toolset-13/root/usr/bin %endif -%endif export STRIP=strip export NINJAFLAGS="%{__ninja_common_opts}" export NINJA_PATH=%{__ninja} + %if 0%{?rhel} == 8 -%if 0%{?use_system_libwebp} -export CFLAGS="%{optflags} -I/opt/rx/include" -export LDFLAGS="$LDFLAGS -L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/" -%endif +export PKG_CONFIG_PATH=/opt/rx/%{_lib}/pkgconfig${PKG_CONFIG_PATH:+:${PKG_CONFIG_PATH}} +export CFLAGS="-I/opt/rx/include %(echo %{optflags} | sed 's/-Werror=format-security//') -fno-sized-deallocation -Wno-format-security" +export CXXFLAGS="-I/opt/rx/include %(echo %{optflags} | sed 's/-Werror=format-security//') -fno-sized-deallocation -Wno-format-security" +export LDFLAGS="-L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/ %{__global_ldflags}" %endif %cmake_qt6 \ @@ -489,6 +488,8 @@ export LDFLAGS="$LDFLAGS -L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/" -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" \ %if %{with clang} -DCMAKE_C_COMPILER=clang \ -DCMAKE_CXX_COMPILER=clang++ \ @@ -503,6 +504,7 @@ export LDFLAGS="$LDFLAGS -L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/" -DFEATURE_webengine_extensions:BOOL=ON \ -DFEATURE_webengine_kerberos:BOOL=ON \ -DFEATURE_webengine_native_spellchecker:BOOL=OFF \ + -DFEATURE_webengine_printing_and_pdf:BOOL=ON \ -DFEATURE_webengine_webrtc:BOOL=ON \ -DFEATURE_webengine_webrtc_pipewire:BOOL=ON \ %if 0%{?use_system_ffmpeg} @@ -514,7 +516,9 @@ export LDFLAGS="$LDFLAGS -L/opt/rx/%{_lib}/ -Wl,-rpath=/opt/rx/%{_lib}/" %endif %{?use_system_libvpx:-DQT_FEATURE_webengine_system_libvpx:BOOL=ON} \ -DQT_FEATURE_webengine_system_libxml:BOOL=OFF \ +%if ! 0%{?use_system_harfbuzz} -DQT_FEATURE_webengine_system_harfbuzz:BOOL=OFF \ +%endif %{?use_system_libicu:-DQT_FEATURE_webengine_system_icu=ON} \ %if 0%{?rhel} >= 8 || 0%{?fedora} < 30 -DQT_FEATURE_webengine_system_minizip:BOOL=ON \ @@ -573,6 +577,7 @@ rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6BuildInternals %{_qt6_qmldir}/Qt* %{_qt6_libdir}/qt6/qml/* %{_qt6_libexecdir}/QtWebEngineProcess +%{_qt6_libexecdir}/webenginedriver %dir %{_qt6_datadir}/resources/ %if ! 0%{?use_system_libicu} %{_qt6_datadir}/resources/icudtl.dat @@ -602,6 +607,12 @@ rm -fr %{buildroot}%{_qt6_libdir}/cmake/Qt6BuildInternals %changelog +* Thu May 16 2024 Raven - 6.7.1-1 +- update to 6.7.1 + +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + * Sat Dec 16 2023 Raven - 6.6.1-2 - remove system protobuf diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-SIOCGSTAMP.patch b/base/qt6/qt6-qtwebengine/qtwebengine-SIOCGSTAMP.patch index 7609f85..d97da42 100644 --- a/base/qt6/qt6-qtwebengine/qtwebengine-SIOCGSTAMP.patch +++ b/base/qt6/qt6-qtwebengine/qtwebengine-SIOCGSTAMP.patch @@ -1,8 +1,8 @@ diff --git a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc -index c38d7fdfa..0a8b0fd8b 100644 +index d421682..ffa75a7 100644 --- a/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc +++ b/src/3rdparty/chromium/third_party/webrtc/rtc_base/physical_socket_server.cc -@@ -72,6 +72,11 @@ typedef void* SockOptArg; +@@ -77,6 +77,11 @@ typedef void* SockOptArg; #if defined(WEBRTC_POSIX) && !defined(WEBRTC_MAC) && !defined(__native_client__) diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-aarch64-new-stat.patch b/base/qt6/qt6-qtwebengine/qtwebengine-aarch64-new-stat.patch deleted file mode 100644 index 2b17be4..0000000 --- a/base/qt6/qt6-qtwebengine/qtwebengine-aarch64-new-stat.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h ---- qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat 2018-11-19 12:55:45.000000000 -0600 -+++ qtwebengine-everywhere-src-5.11.3/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h 2018-12-08 21:16:39.931896244 -0600 -@@ -5,6 +5,8 @@ - #ifndef SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ - #define SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ - -+#define __ARCH_WANT_NEW_STAT -+ - #include - - #if !defined(__NR_io_setup) diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-blink-dlopen-h264.patch b/base/qt6/qt6-qtwebengine/qtwebengine-blink-dlopen-h264.patch deleted file mode 100644 index 6dae942..0000000 --- a/base/qt6/qt6-qtwebengine/qtwebengine-blink-dlopen-h264.patch +++ /dev/null @@ -1,146 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn -index cf6de49be..61e8879d6 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn -@@ -5,12 +5,23 @@ - import("//build/buildflag_header.gni") - import("//third_party/blink/renderer/modules/modules.gni") - import("//third_party/webrtc/webrtc.gni") -+import("//tools/generate_stubs/rules.gni") - - buildflag_header("buildflags") { - header = "buildflags.h" - flags = [ "RTC_USE_H264=$rtc_use_h264" ] - } - -+if (rtc_use_h264 && rtc_dlopen_openh264) { -+ # When OpenH264 is not directly linked, use stubs to allow for dlopening of -+ # the binary. -+ generate_stubs("openh264_stubs") { -+ extra_header = "openh264_stub_header.fragment" -+ output_name = "openh264_stubs" -+ sigs = [ "openh264.sigs" ] -+ } -+} -+ - blink_modules_sources("mediarecorder") { - sources = [ - "audio_track_encoder.cc", -@@ -56,6 +67,11 @@ blink_modules_sources("mediarecorder") { - "h264_encoder.h", - ] - -- deps += [ "//third_party/openh264:encoder" ] -+ if (rtc_dlopen_openh264) { -+ defines = [ "BLINK_DLOPEN_OPENH264" ] -+ deps += [ ":openh264_stubs" ] -+ } else { -+ deps += [ "//third_party/openh264:encoder" ] -+ } - } - } -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -index 4253f3280..56ea1574c 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc -@@ -23,9 +23,21 @@ - #include "third_party/openh264/src/codec/api/wels/codec_def.h" - #include "ui/gfx/geometry/size.h" - -+#if defined(BLINK_DLOPEN_OPENH264) -+#include "third_party/blink/renderer/modules/mediarecorder/openh264_stubs.h" -+#endif // defined(BLINK_DLOPEN_OPENH264) -+ - namespace blink { - namespace { - -+#if defined(BLINK_DLOPEN_OPENH264) -+using third_party_blink_renderer_modules_mediarecorder::InitializeStubs; -+using third_party_blink_renderer_modules_mediarecorder::kModuleOpenh264; -+using third_party_blink_renderer_modules_mediarecorder::StubPathMap; -+ -+static constexpr char kOpenH264Lib[] = "libopenh264.so.7"; -+#endif -+ - absl::optional ToOpenH264Profile( - media::VideoCodecProfile profile) { - static const HashMap -@@ -86,6 +98,13 @@ H264Encoder::H264Encoder( - : Encoder(on_encoded_video_cb, bits_per_second), - codec_profile_(codec_profile) { - DCHECK_EQ(codec_profile_.codec_id, VideoTrackRecorder::CodecId::kH264); -+ -+#if defined(BLINK_DLOPEN_OPENH264) -+ StubPathMap paths; -+ paths[kModuleOpenh264].push_back(kOpenH264Lib); -+ -+ openh264_dlopened_ = InitializeStubs(paths); -+#endif - } - - // Needs to be defined here to combat a Windows linking issue. -@@ -167,6 +186,14 @@ void H264Encoder::EncodeFrame(scoped_refptr frame, - - bool H264Encoder::ConfigureEncoder(const gfx::Size& size) { - TRACE_EVENT0("media", "H264Encoder::ConfigureEncoder"); -+ -+#if defined(BLINK_DLOPEN_OPENH264) -+ if (!openh264_dlopened_) { -+ NOTREACHED() << "Failed to dlopen openh264"; -+ return false; -+ } -+#endif -+ - ISVCEncoder* temp_encoder = nullptr; - if (WelsCreateSVCEncoder(&temp_encoder) != 0) { - NOTREACHED() << "Failed to create OpenH264 encoder"; -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.h b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.h -index 1d9d7bc5a..a5b7eefe3 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.h -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/h264_encoder.h -@@ -58,6 +58,8 @@ class MODULES_EXPORT H264Encoder final : public VideoTrackRecorder::Encoder { - // The |VideoFrame::timestamp()| of the first received frame. - base::TimeTicks first_frame_timestamp_; - base::WeakPtrFactory weak_factory_{this}; -+ -+ bool openh264_dlopened_ = false; - }; - - } // namespace blink -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/openh264.sigs b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/openh264.sigs -new file mode 100644 -index 000000000..4924f8e9a ---- /dev/null -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/openh264.sigs -@@ -0,0 +1,14 @@ -+// Copyright 2022 The WebRTC project authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+//------------------------------------------------ -+// Functions from OpenH264. -+//------------------------------------------------ -+int WelsCreateSVCEncoder(ISVCEncoder **ppEncoder); -+void WelsDestroySVCEncoder(ISVCEncoder *pEncoder); -+int WelsGetDecoderCapability(SDecoderCapability *pDecCapability); -+long WelsCreateDecoder(ISVCDecoder **ppDecoder); -+void WelsDestroyDecoder(ISVCDecoder *pDecoder); -+OpenH264Version WelsGetCodecVersion(void); -+void WelsGetCodecVersionEx(OpenH264Version *pVersion); -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/openh264_stub_header.fragment b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/openh264_stub_header.fragment -new file mode 100644 -index 000000000..e8a3727a0 ---- /dev/null -+++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/openh264_stub_header.fragment -@@ -0,0 +1,11 @@ -+// The extra include header needed in the generated stub file for defining -+// various OpenH264 types. -+ -+extern "C" { -+ -+#include "third_party/openh264/src/codec/api/wels/codec_api.h" -+#include "third_party/openh264/src/codec/api/wels/codec_app_def.h" -+#include "third_party/openh264/src/codec/api/wels/codec_def.h" -+#include "third_party/openh264/src/codec/api/wels/codec_ver.h" -+ -+} diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-blink-system-openh264.patch b/base/qt6/qt6-qtwebengine/qtwebengine-blink-system-openh264.patch new file mode 100644 index 0000000..2f102b1 --- /dev/null +++ b/base/qt6/qt6-qtwebengine/qtwebengine-blink-system-openh264.patch @@ -0,0 +1,79 @@ +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn +index 0be70ed4b..bec344dec 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/mediarecorder/BUILD.gn +@@ -3,6 +3,7 @@ + # found in the LICENSE file. + + import("//build/buildflag_header.gni") ++import("//build/config/linux/pkg_config.gni") + import("//media/media_options.gni") + import("//third_party/blink/renderer/modules/modules.gni") + import("//third_party/libaom/options.gni") +@@ -13,6 +14,14 @@ buildflag_header("buildflags") { + flags = [ "RTC_USE_H264=$rtc_use_h264" ] + } + ++if (rtc_use_h264 && rtc_use_system_openh264) { ++ pkg_config("openh264") { ++ packages = [ ++ "openh264", ++ ] ++ } ++} ++ + blink_modules_sources("mediarecorder") { + sources = [ + "audio_track_encoder.cc", +@@ -62,7 +71,11 @@ blink_modules_sources("mediarecorder") { + "h264_encoder.h", + ] + +- deps += [ "//third_party/openh264:encoder" ] ++ if (rtc_use_system_openh264) { ++ configs += [":openh264"] ++ } else { ++ deps += [ "//third_party/openh264:encoder" ] ++ } + } + + if (enable_libaom) { +diff --git a/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn +index 28205ad14..def86bc8f 100644 +--- a/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/blink/renderer/modules/webcodecs/BUILD.gn +@@ -2,11 +2,21 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/linux/pkg_config.gni") + import("//media/media_options.gni") + import("//third_party/blink/renderer/modules/modules.gni") + import("//third_party/libaom/options.gni") + import("//third_party/libprotobuf-mutator/fuzzable_proto_library.gni") + import("//third_party/protobuf/proto_library.gni") ++import("//third_party/webrtc/webrtc.gni") ++ ++if (rtc_use_h264 && rtc_use_system_openh264) { ++ pkg_config("openh264") { ++ packages = [ ++ "openh264", ++ ] ++ } ++} + + blink_modules_sources("webcodecs") { + sources = [ +@@ -115,7 +125,11 @@ blink_modules_sources("webcodecs") { + deps += [ "//third_party/libvpx" ] + } + if (media_use_openh264) { +- deps += [ "//third_party/openh264:encoder" ] ++ if (rtc_use_system_openh264) { ++ configs += [":openh264"] ++ } else { ++ deps += [ "//third_party/openh264:encoder" ] ++ } + } + if (is_fuchsia) { + deps += [ "//media/fuchsia/video" ] diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-everywhere-src-6.7.0-flags-1.patch b/base/qt6/qt6-qtwebengine/qtwebengine-everywhere-src-6.7.0-flags-1.patch new file mode 100644 index 0000000..f433ac2 --- /dev/null +++ b/base/qt6/qt6-qtwebengine/qtwebengine-everywhere-src-6.7.0-flags-1.patch @@ -0,0 +1,91 @@ +Submitted By: Ken Moffat +Date: 2024-02-18 +Initial Package Version: 6.6.1 +Upstream Status: Not acceptable, fixes a QTBUG decision. +Origin: Gentoo +Description: Allows *some* user flags to be used. + +To see what flags are being used, after the build has started +(only a second or two on a fast machine) + grep FLAGS build/build.ninja | sort -u + +A couple of gentoo patches, + 01-toolchain.patch 03-gn-bootstrap.patch - + +Patch status: here forever(?) + +Respect user flags, and provide readelf path. + +Upstream has seemingly intentionally left out extra_* variables so +flags are not respected. It may arguably be easier to overwrite this +file with chromium's toolchain/linux/unbundle/BUILD.gn which then uses +e.g. CC+CFLAGS and BUILD_CC+BUILD_CFLAGS env vars and bypass cmake. + +Albeit qtwebengine's does set a few extras in there and so +still using for now. + +File is processed twice for host(CBUILD) and target(CHOST), so it +is better to use CMAKE_* variables where possible (still subpar). +Odds are cross is still completely broken for many reasons though. + +https://bugs.gentoo.org/652172 +--- a/src/host/BUILD.toolchain.gn.in ++++ b/src/host/BUILD.toolchain.gn.in +@@ -8,3 +8,7 @@ + nm = "@CMAKE_NM@" +- extra_cppflags = "" ++ readelf = "@CMAKE_READELF@" ++ extra_cflags = "@CMAKE_C_FLAGS@" ++ extra_cppflags = getenv("CPPFLAGS") ++ extra_cxxflags = "@CMAKE_CXX_FLAGS@" ++ extra_ldflags = "@CMAKE_EXE_LINKER_FLAGS@" + toolchain_args = { +Patch status: here forever(?), not respecting flags is intentional + +Original gen.py respects *FLAGS to some extend, but Qt blocked +this after a user reported a bug with overzealous *FLAGS[2]. + +So re-add, but also put more at the end to allow overrides. +Also respect NINJAFLAGS and prevent -static-libstdc++ for libcxx. + +TODO: fix cross + Technically should use BUILD_CXXFLAGS and so here but, even + without trying, cross is most likely broken given it insists + on finding gn in CBUILD rather than cross-compile it. To avoid + more patching, an option may be BDEPEND="dev-qt/qtwebengine-gn" + that would do INSTALL_GN=ON and not build qtwebengine. + +Note that qtwebengine's gn is modified, so dev-util/gn may not +be a straight forward to use as an alternative and be fragile. + +[1] https://github.com/qt/qtwebengine-chromium/commit/19e8b974c8348dd6ba33153facc0b67a7ab774e1 +[2] https://bugreports.qt.io/browse/QTBUG-64759 +[3] https://bugs.gentoo.org/652172 +--- a/src/3rdparty/gn/build/gen.py ++++ b/src/3rdparty/gn/build/gen.py +@@ -942,4 +942,7 @@ + executables['gn_unittests']['libs'].extend(static_libraries.keys()) + ++ cflags += os.environ.get('CXXFLAGS', '').split() ++ cflags += os.environ.get('CPPFLAGS', '').split() ++ ldflags += os.environ.get('LDFLAGS', '').split() + WriteGenericNinja(path, static_libraries, executables, cxx, ar, ld, + platform, host, options, args_list, +--- a/src/gn/CMakeLists.txt ++++ b/src/gn/CMakeLists.txt +@@ -35,4 +35,5 @@ + endif() + ++separate_arguments(NINJAFLAGS UNIX_COMMAND "$ENV{NINJAFLAGS}") + file(MAKE_DIRECTORY ${GN_BINARY_DIR}) + +@@ -63,7 +64,8 @@ + --ar ${CMAKE_AR} + --qt-version "${QT_REPO_MODULE_VERSION}.qtwebengine.qt.io" ++ --no-static-libstdc++ + $<$:--isysroot> + $<$:${CMAKE_OSX_SYSROOT}> +- COMMAND Ninja::ninja -C ${GN_BINARY_DIR}/$ ${GN_EXECUTABLE} ++ COMMAND Ninja::ninja ${NINJAFLAGS} -C ${GN_BINARY_DIR}/$ ${GN_EXECUTABLE} + VERBATIM + USES_TERMINAL diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-ffmpeg-first_dts.patch b/base/qt6/qt6-qtwebengine/qtwebengine-ffmpeg-first_dts.patch deleted file mode 100644 index e2c7118..0000000 --- a/base/qt6/qt6-qtwebengine/qtwebengine-ffmpeg-first_dts.patch +++ /dev/null @@ -1,168 +0,0 @@ -diff --git a/configure.cmake b/configure.cmake -index 8f30b34..bbd934e 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -209,25 +209,6 @@ int main(void){ - }" - ) - --qt_config_compile_test(libavformat -- LABEL "libavformat" -- LIBRARIES -- PkgConfig::FFMPEG -- CODE --" --#include \"libavformat/version.h\" --extern \"C\" { --#include \"libavformat/avformat.h\" --} --int main(void) { --#if LIBAVFORMAT_VERSION_MAJOR >= 59 -- AVStream stream; -- auto first_dts = av_stream_get_first_dts(&stream); --#endif -- return 0; --}" --) -- - #### Features - - qt_feature("qtwebengine-build" PUBLIC -@@ -563,11 +544,6 @@ add_check_for_support( - CONDITION NOT LINUX OR DBUS_FOUND - MESSAGE "Build requires dbus." - ) --add_check_for_support( -- MODULES QtWebEngine -- CONDITION NOT LINUX OR NOT QT_FEATURE_webengine_system_ffmpeg OR TEST_libavformat -- MESSAGE "Unmodified ffmpeg >= 5.0 is not supported." --) - # FIXME: This prevents non XCB Linux builds from building: - set(xcbSupport X11 LIBDRM XCOMPOSITE XCURSOR XRANDR XI XPROTO XSHMFENCE XTST) - foreach(xs ${xcbSupport}) -diff --git a/src/3rdparty/chromium/AUTHORS b/src/3rdparty/chromium/AUTHORS -index ff6abe8..0fd7937 100644 ---- a/src/3rdparty/chromium/AUTHORS -+++ b/src/3rdparty/chromium/AUTHORS -@@ -99,6 +99,7 @@ Andra Paraschiv - Andras Tokodi - Andreas Nazlidis - Andreas Papacharalampous -+Andreas Schneider - Andrei Borza - Andrei Parvu - Andrei Parvu -diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc -index f41464b..3aa3918 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.cc -@@ -59,7 +59,7 @@ namespace media { - - namespace { - --constexpr int64_t kInvalidPTSMarker = static_cast(0x8000000000000000); -+constexpr int64_t kRelativeTsBase = static_cast(0x7ffeffffffffffff); - - void SetAVStreamDiscard(AVStream* stream, AVDiscard discard) { - DCHECK(stream); -@@ -97,7 +97,7 @@ static base::TimeDelta FramesToTimeDelta(int frames, double sample_rate) { - sample_rate); - } - --static base::TimeDelta ExtractStartTime(AVStream* stream) { -+static base::TimeDelta ExtractStartTime(AVStream* stream, int64_t first_dts) { - // The default start time is zero. - base::TimeDelta start_time; - -@@ -107,12 +107,12 @@ static base::TimeDelta ExtractStartTime(AVStream* stream) { - - // Next try to use the first DTS value, for codecs where we know PTS == DTS - // (excludes all H26x codecs). The start time must be returned in PTS. -- if (av_stream_get_first_dts(stream) != kInvalidPTSMarker && -+ if (first_dts != AV_NOPTS_VALUE && - stream->codecpar->codec_id != AV_CODEC_ID_HEVC && - stream->codecpar->codec_id != AV_CODEC_ID_H264 && - stream->codecpar->codec_id != AV_CODEC_ID_MPEG4) { - const base::TimeDelta first_pts = -- ConvertFromTimeBase(stream->time_base, av_stream_get_first_dts(stream)); -+ ConvertFromTimeBase(stream->time_base, first_dts); - if (first_pts < start_time) - start_time = first_pts; - } -@@ -270,6 +270,7 @@ FFmpegDemuxerStream::FFmpegDemuxerStream( - fixup_negative_timestamps_(false), - fixup_chained_ogg_(false), - num_discarded_packet_warnings_(0), -+ first_dts_(AV_NOPTS_VALUE), - last_packet_pos_(AV_NOPTS_VALUE), - last_packet_dts_(AV_NOPTS_VALUE) { - DCHECK(demuxer_); -@@ -336,6 +337,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { - int64_t packet_dts = - packet->dts == AV_NOPTS_VALUE ? packet->pts : packet->dts; - -+ if (first_dts_ == AV_NOPTS_VALUE && packet->dts != AV_NOPTS_VALUE && -+ last_packet_dts_ != AV_NOPTS_VALUE) { -+ first_dts_ = packet->dts - (last_packet_dts_ + kRelativeTsBase); -+ } -+ - // Chained ogg files have non-monotonically increasing position and time stamp - // values, which prevents us from using them to determine if a packet should - // be dropped. Since chained ogg is only allowed on single track audio only -@@ -683,6 +689,7 @@ void FFmpegDemuxerStream::FlushBuffers(bool preserve_packet_position) { - ResetBitstreamConverter(); - - if (!preserve_packet_position) { -+ first_dts_ = AV_NOPTS_VALUE; - last_packet_pos_ = AV_NOPTS_VALUE; - last_packet_dts_ = AV_NOPTS_VALUE; - } -@@ -1452,7 +1459,8 @@ void FFmpegDemuxer::OnFindStreamInfoDone(int result) { - - max_duration = std::max(max_duration, streams_[i]->duration()); - -- base::TimeDelta start_time = ExtractStartTime(stream); -+ base::TimeDelta start_time = -+ ExtractStartTime(stream, streams_[i]->first_dts()); - - // Note: This value is used for seeking, so we must take the true value and - // not the one possibly clamped to zero below. -@@ -1609,7 +1617,7 @@ FFmpegDemuxerStream* FFmpegDemuxer::FindStreamWithLowestStartTimestamp( - for (const auto& stream : streams_) { - if (!stream || stream->IsEnabled() != enabled) - continue; -- if (av_stream_get_first_dts(stream->av_stream()) == kInvalidPTSMarker) -+ if (stream->first_dts() == AV_NOPTS_VALUE) - continue; - if (!lowest_start_time_stream || - stream->start_time() < lowest_start_time_stream->start_time()) { -@@ -1630,7 +1638,7 @@ FFmpegDemuxerStream* FFmpegDemuxer::FindPreferredStreamForSeeking( - if (stream->type() != DemuxerStream::VIDEO) - continue; - -- if (av_stream_get_first_dts(stream->av_stream()) == kInvalidPTSMarker) -+ if (stream->first_dts() == AV_NOPTS_VALUE) - continue; - - if (!stream->IsEnabled()) -diff --git a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.h b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.h -index 086a795..ba9c665 100644 ---- a/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.h -+++ b/src/3rdparty/chromium/media/filters/ffmpeg_demuxer.h -@@ -145,6 +145,8 @@ class MEDIA_EXPORT FFmpegDemuxerStream : public DemuxerStream { - base::TimeDelta start_time() const { return start_time_; } - void set_start_time(base::TimeDelta time) { start_time_ = time; } - -+ int64_t first_dts() const { return first_dts_; } -+ - private: - friend class FFmpegDemuxerTest; - -@@ -202,6 +204,7 @@ class MEDIA_EXPORT FFmpegDemuxerStream : public DemuxerStream { - bool fixup_chained_ogg_; - - int num_discarded_packet_warnings_; -+ int64_t first_dts_; - int64_t last_packet_pos_; - int64_t last_packet_dts_; - // Requested buffer count. The actual returned buffer count could be less diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-fix-build.patch b/base/qt6/qt6-qtwebengine/qtwebengine-fix-build.patch index be6a7bc..d9e3d01 100644 --- a/base/qt6/qt6-qtwebengine/qtwebengine-fix-build.patch +++ b/base/qt6/qt6-qtwebengine/qtwebengine-fix-build.patch @@ -1,75 +1,75 @@ diff --git a/src/3rdparty/chromium/base/debug/profiler.h b/src/3rdparty/chromium/base/debug/profiler.h -index 80c73feb9..d3921a6aa 100644 +index 035affc7c..d8e1a5346 100644 --- a/src/3rdparty/chromium/base/debug/profiler.h +++ b/src/3rdparty/chromium/base/debug/profiler.h @@ -5,6 +5,7 @@ #ifndef BASE_DEBUG_PROFILER_H_ #define BASE_DEBUG_PROFILER_H_ - + +#include #include - #include - + #include + diff --git a/src/3rdparty/chromium/cc/trees/target_property.cc b/src/3rdparty/chromium/cc/trees/target_property.cc -index 714bd5efe..cf0bb5fa9 100644 +index 7d73467a9..be4febd9a 100644 --- a/src/3rdparty/chromium/cc/trees/target_property.cc +++ b/src/3rdparty/chromium/cc/trees/target_property.cc @@ -8,6 +8,8 @@ - + #include "ui/gfx/animation/keyframe/target_property.h" - + +#include + namespace cc { - + static_assert(TargetProperty::LAST_TARGET_PROPERTY < diff --git a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc index c62a00ee0..af54520b7 100644 --- a/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc +++ b/src/3rdparty/chromium/device/base/synchronization/one_writer_seqlock.cc @@ -6,6 +6,8 @@ - + #include "base/threading/platform_thread.h" - + +#include + namespace device { - + OneWriterSeqLock::OneWriterSeqLock() : sequence_(0) {} diff --git a/src/3rdparty/chromium/extensions/common/constants.h b/src/3rdparty/chromium/extensions/common/constants.h -index 27adc05bf..a4839e859 100644 +index adbcfa540..5923bd2fe 100644 --- a/src/3rdparty/chromium/extensions/common/constants.h +++ b/src/3rdparty/chromium/extensions/common/constants.h -@@ -12,6 +12,8 @@ +@@ -13,6 +13,8 @@ #include "build/chromeos_buildflags.h" #include "extensions/common/extensions_export.h" - + +#include + namespace extensions { - + // Scheme we serve extension content from. diff --git a/src/3rdparty/chromium/gpu/config/gpu_util.h b/src/3rdparty/chromium/gpu/config/gpu_util.h -index 574aca1ff..fca32671c 100644 +index 8edbfbe7d..467ebd65e 100644 --- a/src/3rdparty/chromium/gpu/config/gpu_util.h +++ b/src/3rdparty/chromium/gpu/config/gpu_util.h @@ -5,6 +5,8 @@ #ifndef GPU_CONFIG_GPU_UTIL_H_ #define GPU_CONFIG_GPU_UTIL_H_ - + +#include + #include "build/build_config.h" #include "gpu/config/gpu_feature_info.h" #include "gpu/gpu_export.h" diff --git a/src/3rdparty/chromium/net/base/parse_number.h b/src/3rdparty/chromium/net/base/parse_number.h -index 091649590..a49ed9382 100644 +index f923b18a7..8f3c6ef78 100644 --- a/src/3rdparty/chromium/net/base/parse_number.h +++ b/src/3rdparty/chromium/net/base/parse_number.h @@ -10,6 +10,8 @@ #include "base/strings/string_piece.h" #include "net/base/net_export.h" - + +#include + // This file contains utility functions for parsing numbers, in the context of @@ -93,11 +93,11 @@ index 7c0dcdecb..97054d476 100644 @@ -67,8 +71,6 @@ class ThreadSafeThreadTraits { int32_t ref_; }; - + - typedef pp::Lock Lock; - typedef pp::AutoLock AutoLock; }; - + /// The non-thread-safe version of thread traits. Using this class as the diff --git a/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h b/src/3rdparty/chromium/third_party/dawn/src/dawn/native/CacheKey.h index 6cec3b6b8..541bba5b1 100644 @@ -106,73 +106,13 @@ index 6cec3b6b8..541bba5b1 100644 @@ -15,6 +15,7 @@ #ifndef SRC_DAWN_NATIVE_CACHEKEY_H_ #define SRC_DAWN_NATIVE_CACHEKEY_H_ - + +#include #include - + #include "dawn/native/stream/ByteVectorSink.h" -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h -index 90077421d..f303f9e8b 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/entry_point_info.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_ - #define SRC_TINT_READER_SPIRV_ENTRY_POINT_INFO_H_ - -+#include - #include - - #include "src/tint/ast/pipeline_stage.h" -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h -index 7a20e8738..655f69ce3 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/spirv/namer.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_SPIRV_NAMER_H_ - #define SRC_TINT_READER_SPIRV_NAMER_H_ - -+#include - #include - #include - #include -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h -index 8e0306b6a..0fc0cc2b0 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/lexer.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_WGSL_LEXER_H_ - #define SRC_TINT_READER_WGSL_LEXER_H_ - -+#include - #include - #include - -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h -index 222f28ef8..335c4c396 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/reader/wgsl/token.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_READER_WGSL_TOKEN_H_ - #define SRC_TINT_READER_WGSL_TOKEN_H_ - -+#include - #include - #include - #include -diff --git a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h -index 0601ca068..ac9dde64e 100644 ---- a/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h -+++ b/src/3rdparty/chromium/third_party/dawn/src/tint/writer/spirv/operand.h -@@ -15,6 +15,7 @@ - #ifndef SRC_TINT_WRITER_SPIRV_OPERAND_H_ - #define SRC_TINT_WRITER_SPIRV_OPERAND_H_ - -+#include - #include - #include - #include diff --git a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc -index a3099e15d..2e6f0eea7 100644 +index e171db6c7..dfbd126b4 100644 --- a/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc +++ b/src/3rdparty/chromium/third_party/libgav1/src/src/utils/threadpool.cc @@ -30,6 +30,7 @@ @@ -182,19 +122,19 @@ index a3099e15d..2e6f0eea7 100644 +#include #include #include - + diff --git a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -index 3ff56aa0b..a36388bb8 100644 +index cc2c3a2b3..8eb694e73 100644 --- a/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h +++ b/src/3rdparty/chromium/third_party/perfetto/src/trace_processor/importers/proto/proto_importer_module.h -@@ -21,6 +21,8 @@ - #include "perfetto/ext/base/optional.h" +@@ -22,6 +22,8 @@ + #include "perfetto/base/status.h" #include "src/trace_processor/importers/common/trace_parser.h" - + +#include + namespace perfetto { - + namespace protos { diff --git a/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp b/src/3rdparty/chromium/third_party/skia/src/utils/SkParseColor.cpp index 0101632c5..3f04a2dd2 100644 @@ -203,7 +143,7 @@ index 0101632c5..3f04a2dd2 100644 @@ -15,6 +15,10 @@ #include #include - + +#include +#include +#include @@ -212,13 +152,13 @@ index 0101632c5..3f04a2dd2 100644 "aliceblue", "antiquewhite", diff --git a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h -index 9e073d4e1..da96f327c 100644 +index b26de34cc..caa0df9f9 100644 --- a/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +++ b/src/3rdparty/chromium/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h @@ -105,6 +105,8 @@ Documentation of all members: vk_mem_alloc.h - [Source repository on GitHub](https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator) */ - + +#include + #ifdef __cplusplus @@ -229,59 +169,59 @@ index ab52508c2..050229a2f 100644 --- a/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h +++ b/src/3rdparty/chromium/third_party/webrtc/modules/portal/xdg_session_details.h @@ -13,6 +13,7 @@ - + #include - + +#include #include - + namespace webrtc { diff --git a/src/3rdparty/chromium/ui/events/gesture_event_details.h b/src/3rdparty/chromium/ui/events/gesture_event_details.h -index 41ff9906d..1864e9e21 100644 +index bdf840619..68f473f27 100644 --- a/src/3rdparty/chromium/ui/events/gesture_event_details.h +++ b/src/3rdparty/chromium/ui/events/gesture_event_details.h @@ -5,6 +5,7 @@ #ifndef UI_EVENTS_GESTURE_EVENT_DETAILS_H_ #define UI_EVENTS_GESTURE_EVENT_DETAILS_H_ - + +#include #include - + #include "base/check_op.h" diff --git a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -index ab0ce5808..9a9f187bb 100644 +index d32766283..18b8a85e1 100644 --- a/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h +++ b/src/3rdparty/chromium/ui/gfx/geometry/linear_gradient.h -@@ -5,6 +5,7 @@ - #ifndef UI_GFX_LINEAR_GRADIENT_H_ - #define UI_GFX_LINEAR_GRADIENT_H_ - +@@ -7,6 +7,7 @@ + + #include + +#include #include + #include #include - #include diff --git a/src/3rdparty/chromium/v8/src/base/macros.h b/src/3rdparty/chromium/v8/src/base/macros.h -index cd5b91f74..a74c0021f 100644 +index f81258363..ec7d67550 100644 --- a/src/3rdparty/chromium/v8/src/base/macros.h +++ b/src/3rdparty/chromium/v8/src/base/macros.h @@ -5,6 +5,7 @@ #ifndef V8_BASE_MACROS_H_ #define V8_BASE_MACROS_H_ - + +#include #include #include - + diff --git a/src/core/browsing_data_remover_delegate_qt.h b/src/core/browsing_data_remover_delegate_qt.h -index a611a710c..67743f52b 100644 +index d33af4acb..ce864b6bd 100644 --- a/src/core/browsing_data_remover_delegate_qt.h +++ b/src/core/browsing_data_remover_delegate_qt.h @@ -8,6 +8,8 @@ - + #include "content/public/browser/browsing_data_remover_delegate.h" - + +#include + namespace QtWebEngineCore { - + class BrowsingDataRemoverDelegateQt : public content::BrowsingDataRemoverDelegate { diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-icu-74.patch b/base/qt6/qt6-qtwebengine/qtwebengine-icu-74.patch deleted file mode 100644 index 74b3ee6..0000000 --- a/base/qt6/qt6-qtwebengine/qtwebengine-icu-74.patch +++ /dev/null @@ -1,20 +0,0 @@ -See ICU change https://github.com/unicode-org/icu/commit/2e45e6ec0e84a1c01812015a254ea31b286316fb - -Similar has happened in the past. See: -https://chromium.googlesource.com/chromium/src/+/e60b571faa3f14dd9119a6792dccf12f8bf80192 - -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc -index ddfbd51..247da06 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/text/text_break_iterator.cc -@@ -161,7 +161,9 @@ static const unsigned char kAsciiLineBreakTable[][(kAsciiLineBreakTableLastChar - }; - // clang-format on - --#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#if U_ICU_VERSION_MAJOR_NUM >= 74 -+#define BA_LB_COUNT (U_LB_COUNT - 8) -+#elif U_ICU_VERSION_MAJOR_NUM >= 58 - #define BA_LB_COUNT (U_LB_COUNT - 3) - #else - #define BA_LB_COUNT U_LB_COUNT diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-link-pipewire.patch b/base/qt6/qt6-qtwebengine/qtwebengine-link-pipewire.patch index e21f728..49d8aa2 100644 --- a/base/qt6/qt6-qtwebengine/qtwebengine-link-pipewire.patch +++ b/base/qt6/qt6-qtwebengine/qtwebengine-link-pipewire.patch @@ -1,13 +1,13 @@ diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -index a5da76c..9c5d358 100644 +index 5a1c43c..82870d2 100644 --- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -@@ -138,7 +138,7 @@ declare_args() { +@@ -150,7 +150,7 @@ declare_args() { rtc_use_pipewire = is_linux && use_sysroot - + # Set this to link PipeWire and required libraries directly instead of using the dlopen. - rtc_link_pipewire = false + rtc_link_pipewire = true - + # Enable to use the Mozilla internal settings. build_with_mozilla = false diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-media-system-openh264.patch b/base/qt6/qt6-qtwebengine/qtwebengine-media-system-openh264.patch new file mode 100644 index 0000000..36ffbea --- /dev/null +++ b/base/qt6/qt6-qtwebengine/qtwebengine-media-system-openh264.patch @@ -0,0 +1,36 @@ +diff --git a/src/3rdparty/chromium/media/video/BUILD.gn b/src/3rdparty/chromium/media/video/BUILD.gn +index ef5c9c6c0..7e439852d 100644 +--- a/src/3rdparty/chromium/media/video/BUILD.gn ++++ b/src/3rdparty/chromium/media/video/BUILD.gn +@@ -2,7 +2,17 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/linux/pkg_config.gni") + import("//media/media_options.gni") ++import("//third_party/webrtc/webrtc.gni") ++ ++if (rtc_use_h264 && rtc_use_system_openh264) { ++ pkg_config("openh264") { ++ packages = [ ++ "openh264", ++ ] ++ } ++} + + source_set("video") { + # Do not expand the visibility here without double-checking with OWNERS, this +@@ -114,7 +124,12 @@ source_set("video") { + "openh264_video_encoder.cc", + "openh264_video_encoder.h", + ] +- deps += [ "//third_party/openh264:encoder" ] ++ ++ if (rtc_use_system_openh264) { ++ configs += [":openh264"] ++ } else { ++ deps += [ "//third_party/openh264:encoder" ] ++ } + } + + if (is_apple) { diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-webrtc-dlopen-h264.patch b/base/qt6/qt6-qtwebengine/qtwebengine-webrtc-dlopen-h264.patch deleted file mode 100644 index 048e191..0000000 --- a/base/qt6/qt6-qtwebengine/qtwebengine-webrtc-dlopen-h264.patch +++ /dev/null @@ -1,159 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn -index 8e3529974..ca7370599 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn -@@ -7,6 +7,7 @@ - # be found in the AUTHORS file in the root of the source tree. - - import("//third_party/libaom/options.gni") -+import("//tools/generate_stubs/rules.gni") - import("../../webrtc.gni") - - rtc_library("encoded_frame") { -@@ -461,6 +462,17 @@ rtc_library("video_coding_utility") { - ] - } - -+if (rtc_use_h264 && rtc_dlopen_openh264) { -+ # When OpenH264 is not directly linked, use stubs to allow for dlopening of -+ # the binary. -+ generate_stubs("openh264_stubs") { -+ configs = [ "../../:common_config" ] -+ extra_header = "codecs/h264/openh264_stub_header.fragment" -+ output_name = "codecs/h264/openh264_stubs" -+ sigs = [ "codecs/h264/openh264.sigs" ] -+ } -+} -+ - rtc_library("webrtc_h264") { - visibility = [ "*" ] - sources = [ -@@ -507,10 +519,15 @@ rtc_library("webrtc_h264") { - ] - - if (rtc_use_h264) { -- deps += [ -- "//third_party/ffmpeg", -- "//third_party/openh264:encoder", -- ] -+ deps += [ "//third_party/ffmpeg" ] -+ -+ if (rtc_dlopen_openh264) { -+ defines = [ "WEBRTC_DLOPEN_OPENH264" ] -+ deps += [ ":openh264_stubs" ] -+ } else { -+ deps += [ "//third_party/openh264:encoder" ] -+ } -+ - if (!build_with_mozilla) { - deps += [ "../../media:rtc_media_base" ] - } -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc -index b6023ac50..228486870 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.cc -@@ -39,10 +39,22 @@ - #include "third_party/openh264/src/codec/api/wels/codec_def.h" - #include "third_party/openh264/src/codec/api/wels/codec_ver.h" - -+#if defined(WEBRTC_DLOPEN_OPENH264) -+#include "modules/video_coding/codecs/h264/openh264_stubs.h" -+#endif // defined(WEBRTC_DLOPEN_OPENH264) -+ - namespace webrtc { - - namespace { - -+#if defined(WEBRTC_DLOPEN_OPENH264) -+using third_party_webrtc_modules_video_coding_codecs_h264::InitializeStubs; -+using third_party_webrtc_modules_video_coding_codecs_h264::kModuleOpenh264; -+using third_party_webrtc_modules_video_coding_codecs_h264::StubPathMap; -+ -+static constexpr char kOpenH264Lib[] = "libopenh264.so.7"; -+#endif -+ - const bool kOpenH264EncoderDetailedLogging = false; - - // QP scaling thresholds. -@@ -198,6 +210,15 @@ H264EncoderImpl::~H264EncoderImpl() { - - int32_t H264EncoderImpl::InitEncode(const VideoCodec* inst, - const VideoEncoder::Settings& settings) { -+#if defined(WEBRTC_DLOPEN_OPENH264) -+ StubPathMap paths; -+ paths[kModuleOpenh264].push_back(kOpenH264Lib); -+ -+ static bool result = InitializeStubs(paths); -+ if (!result) -+ return WEBRTC_VIDEO_CODEC_UNINITIALIZED; -+#endif -+ - ReportInit(); - if (!inst || inst->codecType != kVideoCodecH264) { - ReportError(); -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264.sigs b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264.sigs -new file mode 100644 -index 000000000..4924f8e9a ---- /dev/null -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264.sigs -@@ -0,0 +1,14 @@ -+// Copyright 2022 The WebRTC project authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+//------------------------------------------------ -+// Functions from OpenH264. -+//------------------------------------------------ -+int WelsCreateSVCEncoder(ISVCEncoder **ppEncoder); -+void WelsDestroySVCEncoder(ISVCEncoder *pEncoder); -+int WelsGetDecoderCapability(SDecoderCapability *pDecCapability); -+long WelsCreateDecoder(ISVCDecoder **ppDecoder); -+void WelsDestroyDecoder(ISVCDecoder *pDecoder); -+OpenH264Version WelsGetCodecVersion(void); -+void WelsGetCodecVersionEx(OpenH264Version *pVersion); -diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264_stub_header.fragment b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264_stub_header.fragment -new file mode 100644 -index 000000000..9bc0a7cbe ---- /dev/null -+++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/codecs/h264/openh264_stub_header.fragment -@@ -0,0 +1,11 @@ -+// The extra include header needed in the generated stub file for defining -+// various OpenH264 types. -+ -+extern "C" { -+ -+#include "third_party/openh264/src/codec/api/wels/codec_api.h" -+#include "third_party/openh264/src/codec/api/wels/codec_app_def.h" -+#include "third_party/openh264/src/codec/api/wels/codec_def.h" -+#include "third_party/openh264/src/codec/api/wels/codec_ver.h" -+ -+} -diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -index 8dfcc9d24..0a27fd2d6 100644 ---- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -+++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni -@@ -181,6 +181,10 @@ declare_args() { - rtc_use_h264 = - proprietary_codecs && !is_android && !is_ios && !(is_win && !is_clang) - -+ # Allow to use OpenH264 on systems where OpenH264 cannot be installed by -+ # default due to licensing, but can be installed later from other sources. -+ rtc_dlopen_openh264 = false -+ - # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex. - rtc_use_absl_mutex = false - -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index 4153ce180..afaa9dcb1 100644 ---- a/src/core/CMakeLists.txt -+++ b/src/core/CMakeLists.txt -@@ -418,6 +418,9 @@ foreach(arch ${archs}) - use_udev=true - is_cfi=false - use_ozone=true -+ media_use_openh264=false -+ rtc_use_h264=true -+ rtc_dlopen_openh264=true - ozone_auto_platforms=false - ozone_platform_headless=false - ozone_platform_external=true diff --git a/base/qt6/qt6-qtwebengine/qtwebengine-webrtc-system-openh264.patch b/base/qt6/qt6-qtwebengine/qtwebengine-webrtc-system-openh264.patch new file mode 100644 index 0000000..963b9aa --- /dev/null +++ b/base/qt6/qt6-qtwebengine/qtwebengine-webrtc-system-openh264.patch @@ -0,0 +1,71 @@ +diff --git a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn +index 738d3d4ed..8344a19b0 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn ++++ b/src/3rdparty/chromium/third_party/webrtc/modules/video_coding/BUILD.gn +@@ -6,6 +6,7 @@ + # in the file PATENTS. All contributing project authors may + # be found in the AUTHORS file in the root of the source tree. + ++import("//build/config/linux/pkg_config.gni") + import("//third_party/libaom/options.gni") + import("../../webrtc.gni") + +@@ -453,6 +454,14 @@ rtc_library("video_coding_utility") { + ] + } + ++if (rtc_use_h264 && rtc_use_system_openh264) { ++ pkg_config("openh264") { ++ packages = [ ++ "openh264", ++ ] ++ } ++} ++ + rtc_library("webrtc_h264") { + visibility = [ "*" ] + sources = [ +@@ -501,8 +510,14 @@ rtc_library("webrtc_h264") { + if (rtc_use_h264) { + deps += [ + "//third_party/ffmpeg", +- "//third_party/openh264:encoder", + ] ++ ++ if (rtc_use_system_openh264) { ++ configs += [":openh264"] ++ } else { ++ deps += [ "//third_party/openh264:encoder" ] ++ } ++ + if (!build_with_mozilla) { + deps += [ "../../media:rtc_media_base" ] + } +diff --git a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +index 82870d2db..12231becc 100644 +--- a/src/3rdparty/chromium/third_party/webrtc/webrtc.gni ++++ b/src/3rdparty/chromium/third_party/webrtc/webrtc.gni +@@ -192,6 +192,9 @@ declare_args() { + # Enable to use H265 + rtc_use_h265 = proprietary_codecs + ++ # Allow to use system OpenH264 ++ rtc_use_system_openh264 = false ++ + # Enable this flag to make webrtc::Mutex be implemented by absl::Mutex. + rtc_use_absl_mutex = false + +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index e7432d0c7..394f05011 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -436,6 +436,9 @@ foreach(arch ${archs}) + use_udev=true + is_cfi=false + use_ozone=true ++ media_use_openh264=true ++ rtc_use_h264=true ++ rtc_use_system_openh264=true + ozone_auto_platforms=false + ozone_platform_headless=false + ozone_platform_external=true diff --git a/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec b/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec new file mode 100644 index 0000000..7ee1b85 --- /dev/null +++ b/base/qt6/qt6-qtwebsockets/qt6-qtwebsockets.spec @@ -0,0 +1,205 @@ + +%global qt_module qtwebsockets + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - WebSockets component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 +Url: http://qt-project.org/ +%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 + +# filter qml provides +%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ + +BuildRequires: cmake +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +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(openssl) + +%description +The QtWebSockets module implements the WebSocket protocol as specified in RFC +6455. It solely depends on Qt (no external dependencies). + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +# BuildRequires: qt6-qtwebsockets-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + +## .prl/.la file love +# nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs +pushd %{buildroot}%{_qt6_libdir} +for prl_file in libQt6*.prl ; do + sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" ${prl_file} + if [ -f "$(basename ${prl_file} .prl).so" ]; then + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} + fi +done +popd + + +%ldconfig_scriptlets + +%files +%license LICENSES/* +%{_qt6_libdir}/libQt6WebSockets.so.6* + +%files devel +%{_qt6_headerdir}/QtWebSockets/ +%{_qt6_libdir}/libQt6WebSockets.so +%{_qt6_libdir}/libQt6WebSockets.prl +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebSocketsTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6WebSockets/ +%{_qt6_libdir}/cmake/Qt6WebSockets/*.cmake +%{_qt6_libdir}/qt6/qml/QtWebSockets/ +%{_qt6_archdatadir}/mkspecs/modules/qt_lib_websockets*.pri +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Rebuild for qtbase private API version change + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-2 +- Rebuild for qtbase private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Tue Apr 04 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed May 25 2022 Jan Grulich - 6.3.0-2 +- Enable examples + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Fri Feb 25 2022 Jan Grulich - 6.2.3-2 +- Enable s390x builds + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Thu Sep 16 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc diff --git a/base/qt6/qt6-qtwebview/qt6-qtwebview.spec b/base/qt6/qt6-qtwebview/qt6-qtwebview.spec new file mode 100644 index 0000000..ef754b9 --- /dev/null +++ b/base/qt6/qt6-qtwebview/qt6-qtwebview.spec @@ -0,0 +1,142 @@ +%global qt_module qtwebview + +%global examples 1 + +Summary: Qt6 - WebView component +Name: qt6-%{qt_module} +Version: 6.7.0 +Release: 1%{?dist} + +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/%{qt_module}-everywhere-src-%{version}.tar.xz + +# FIXME use/update qt6_qtwebengine_arches +# 32-bit arches not supported (https://bugreports.qt.io/browse/QTBUG-102143) +ExclusiveArch: aarch64 x86_64 + +BuildRequires: gcc-toolset-13-gcc-c++ +BuildRequires: cmake +BuildRequires: ninja-build +BuildRequires: qt6-qtbase-devel >= %{version} +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 + +%description +Qt WebView provides a way to display web content in a QML application +without necessarily including a full web browser stack by using native +APIs where it makes sense. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Requires: qt6-qtdeclarative-devel%{?_isa} +%description devel +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{version}%{?unstable:-%{prerelease}} -p1 + + +%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} + +%cmake_build + + +%install +%cmake_install + + +%files +%license LICENSES/GPL* LICENSES/LGPL* +%{_qt6_libdir}/libQt6WebView.so.6{,.*} +%{_qt6_libdir}/libQt6WebViewQuick.so.6{,.*} +%{_qt6_qmldir}/QtWebView/ +%dir %{_qt6_plugindir}/webview/ +%{_qt6_plugindir}/webview/libqtwebview_webengine.so + +%files devel +%dir %{_qt6_headerdir}/QtWebView +%{_qt6_headerdir}/QtWebView/* +%dir %{_qt6_headerdir}/QtWebViewQuick +%{_qt6_headerdir}/QtWebViewQuick/* +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtWebViewTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6WebView +%{_qt6_libdir}/cmake/Qt6WebView/*.cmake +%dir %{_qt6_libdir}/cmake/Qt6WebViewQuick +%{_qt6_libdir}/cmake/Qt6WebViewQuick/*.cmake +%{_qt6_libdir}/libQt6WebView.so +%{_qt6_libdir}/libQt6WebView.prl +%{_qt6_libdir}/libQt6WebViewQuick.so +%{_qt6_libdir}/libQt6WebViewQuick.prl +%{_qt6_libdir}/pkgconfig/Qt6WebView.pc +%{_qt6_libdir}/pkgconfig/Qt6WebViewQuick.pc +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_libdir}/qt6/metatypes/*.json +%{_qt6_libdir}/qt6/modules/*.json + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + + +%changelog +* Wed May 8 2024 Raven - 6.7.0-1 +- update to 6.7.0 + +* Tue Nov 28 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Fri Oct 13 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- new version + +* Mon Jul 24 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 13 2023 František Zatloukal - 6.5.1-3 +- Rebuilt for ICU 73.2 + +* Thu Jul 13 2023 Jan Grulich - 6.5.1-2 +- Bump build for private API version change + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Wed Apr 05 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Mon Mar 27 2023 Jan Grulich - 6.4.3-1 +- 6.4.3 + +* Wed Jan 25 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 diff --git a/base/qt6/qt6/macros.qt6 b/base/qt6/qt6/macros.qt6 new file mode 100644 index 0000000..f37ed8e --- /dev/null +++ b/base/qt6/qt6/macros.qt6 @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: MIT + +%_qt6_build_type RelWithDebInfo +%_qt6_build_tool ninja + +%_qt6_prefix %{_prefix} +%_qt6_archdatadir %{_libdir}/qt6 +%_qt6_bindir %{_libdir}/qt6/bin +%_qt6_datadir %{_datadir}/qt6 +%_qt6_docdir %{_docdir}/qt6 +%_qt6_examplesdir %{_qt6_archdatadir}/examples +%_qt6_headerdir %{_includedir}/qt6 +%_qt6_includedir %{_includedir}/qt6 +%_qt6_importdir %{_qt6_archdatadir}/imports +%_qt6_libdir %{_libdir} +%_qt6_libexecdir %{_qt6_archdatadir}/libexec +%_qt6_mkspecsdir %{_qt6_archdatadir}/mkspecs +%_qt6_plugindir %{_qt6_archdatadir}/plugins +%_qt6_qmldir %{_qt6_archdatadir}/qml +%_qt6_qmake @@QMAKE@@ +%_qt6_settingsdir %{_sysconfdir}/xdg +%_qt6_sysconfdir %{_qt6_settingsdir} +%_qt6_translationdir %{_datadir}/qt6/translations + +%_qt6_cflags %{nil}@@QT6_CFLAGS@@ +%_qt6_cxxflags %{nil}@@QT6_CXXFLAGS@@ +%_qt6_ldflags %{nil}%{?__global_ldflags} @@QT6_RPM_LD_FLAGS@@ +%_qt6_optflags %{optflags} @@QT6_RPM_OPT_FLAGS@@ + +%_qt6_qmake_flags \\\ + QMAKE_CFLAGS_DEBUG="${CFLAGS:-%{_qt6_optflags} %{?_qt6_cflags}}" \\\ + QMAKE_CFLAGS_RELEASE="${CFLAGS:-%{_qt6_optflags} %{?_qt6_cflags}}" \\\ + QMAKE_CXXFLAGS_DEBUG="${CXXFLAGS:-%{_qt6_optflags} %{?_qt6_cxxflags}}" \\\ + QMAKE_CXXFLAGS_RELEASE="${CXXFLAGS:-%{_qt6_optflags} %{?_qt6_cxxflags}}" \\\ + QMAKE_LFLAGS_DEBUG="${LDFLAGS:-%{_qt6_ldflags}}" \\\ + QMAKE_LFLAGS_RELEASE="${LDFLAGS:-%{_qt6_ldflags}}" \\\ + QMAKE_STRIP= + +%qmake_qt6 %{_qt6_qmake} %{?_qt6_qmake_flags} + +%qmake_qt6_wrapper @@QMAKE_QT6_WRAPPER@@ + +%cmake_qt6 \ + %cmake -DCMAKE_BUILD_TYPE=%{_qt6_build_type} \\\ + -DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\ +%if "%_qt6_build_tool" == "ninja" \ + -GNinja \\\ +%else \ + -G"Unix Makefiles" \\\ +%endif \ + -DCMAKE_INSTALL_PREFIX=%{_qt6_prefix} \\\ + -DINSTALL_ARCHDATADIR=%{_qt6_archdatadir} \\\ + -DINSTALL_BINDIR=%{_qt6_bindir} \\\ + -DINSTALL_LIBDIR=%{_qt6_libdir} \\\ + -DINSTALL_LIBEXECDIR=%{_qt6_libexecdir} \\\ + -DINSTALL_DATADIR=%{_qt6_datadir} \\\ + -DINSTALL_DOCDIR=%{_qt6_docdir} \\\ + -DINSTALL_INCLUDEDIR=%{_qt6_headerdir} \\\ + -DINSTALL_EXAMPLESDIR=%{_qt6_examplesdir} \\\ + -DINSTALL_MKSPECSDIR=%{_qt6_mkspecsdir} \\\ + -DINSTALL_PLUGINSDIR=%{_qt6_plugindir} \\\ + -DINSTALL_QMLDIR=%{_qt6_qmldir} \\\ + -DINSTALL_SYSCONFDIR=%{_qt6_sysconfdir} \\\ + -DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\ + -DQT_DISABLE_RPATH=TRUE diff --git a/base/qt6/qt6/macros.qt6-srpm b/base/qt6/qt6/macros.qt6-srpm new file mode 100644 index 0000000..cab54c6 --- /dev/null +++ b/base/qt6/qt6/macros.qt6-srpm @@ -0,0 +1,9 @@ + +# # the architectures theoretically supported by the version of V8 used (#1298011) +# # You may need some minor patching to build on one of the secondary +# # architectures, e.g., to add to the Qt -> Chromium -> V8 arch translations. +# # If you cannot get this package to build on your secondary architecure, please: +# # * remove your architecture from this list AND +# # * put #1298011 onto your ExcludeArch tracker. +%qt6_qtwebengine_arches x86_64 aarch64 + diff --git a/base/qt6/qt6/qmake-qt6.sh b/base/qt6/qt6/qmake-qt6.sh new file mode 100755 index 0000000..beb29fe --- /dev/null +++ b/base/qt6/qt6/qmake-qt6.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# An attempt at providing a qmake wrapper for projects that +# lack native qmake support (ie, qmake is run by buildsystem +# instead of developer or fedora packager). + +QMAKE="$(rpm --eval %{_qt6_qmake})" +QMAKE_FLAGS="$(rpm --eval %{?_qt6_qmake_flags})" + +eval $QMAKE $QMAKE_FLAGS $@ diff --git a/base/qt6/qt6/qt6.spec b/base/qt6/qt6/qt6.spec new file mode 100644 index 0000000..f981ae4 --- /dev/null +++ b/base/qt6/qt6/qt6.spec @@ -0,0 +1,284 @@ + +Name: qt6 +Version: 6.7.0 +Release: 1%{?dist} +Summary: Qt6 meta package +License: GPL-3.0-only +URL: https://getfedora.org/ +Source0: macros.qt6 +Source1: macros.qt6-srpm +Source2: qmake-qt6.sh +Source3: qt6qml.attr +Source4: qt6qml.prov +BuildArch: noarch + +Requires: qt6-qt3d +Requires: qt6-qt5compat +Requires: qt6-qtbase +Requires: qt6-qtbase-gui +Requires: qt6-qtbase-mysql +Requires: qt6-qtbase-postgresql +Requires: qt6-qtcharts +Requires: qt6-qtconnectivity +Requires: qt6-qtdatavis3d +Requires: qt6-qtdeclarative +Requires: qt6-qtdoc +Requires: qt6-qtimageformats +Requires: qt6-qtlocation +Requires: qt6-qtlottie +Requires: qt6-qtmultimedia +Requires: qt6-qtnetworkauth +Requires: qt6-qtquick3d +Requires: qt6-qtquicktimeline +Requires: qt6-qtremoteobjects +Requires: qt6-qtscxml +Requires: qt6-qtsensors +Requires: qt6-qtserialbus +Requires: qt6-qtserialport +Requires: qt6-qtshadertools +Requires: qt6-qtsvg +Requires: qt6-qttools +Requires: qt6-qtvirtualkeyboard +Requires: qt6-qtwayland +Requires: qt6-qtwebchannel +Requires: qt6-qtwebsockets + + +%description +%{summary}. + +%package devel +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 +Requires: qt6-qtbase-devel +Requires: qt6-qtbase-static +Requires: qt6-qtcharts-devel +Requires: qt6-qtconnectivity-devel +Requires: qt6-qtdatavis3d-devel +Requires: qt6-qtdeclarative-devel +Requires: qt6-qtdeclarative-static +Requires: qt6-qtimageformats-devel +Requires: qt6-qtlocation-devel +Requires: qt6-qtlottie-devel +Requires: qt6-qtmultimedia-devel +Requires: qt6-qtnetworkauth-devel +Requires: qt6-qtquick3d-devel +Requires: qt6-qtquicktimeline-devel +Requires: qt6-qtremoteobjects-devel +Requires: qt6-qtscxml-devel +Requires: qt6-qtsensors-devel +Requires: qt6-qtserialbus-devel +Requires: qt6-qtserialport-devel +Requires: qt6-qtshadertools-devel +Requires: qt6-qtsvg-devel +Requires: qt6-qttools-devel +Requires: qt6-qttools-static +Requires: qt6-qtvirtualkeyboard-devel +Requires: qt6-qtwayland-devel +Requires: qt6-qtwebchannel-devel +Requires: qt6-qtwebsockets-devel +Requires: qt6-rpm-macros + +%description devel +%{summary}. + +%package rpm-macros +Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages +Requires: cmake >= 3.29 +Requires: gcc-toolset-13-gcc-c++ gcc-toolset-13-gcc-plugin-annobin +%description rpm-macros +%{summary}. + +%package srpm-macros +Summary: RPM macros for source Qt6 packages +%description srpm-macros +%{summary}. + + +%install +install -Dpm644 %{SOURCE0} %{buildroot}%{_rpmmacrodir}/macros.qt6 +install -Dpm644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.qt6-srpm +install -Dpm755 %{SOURCE2} %{buildroot}%{_bindir}/qmake-qt6.sh +install -Dpm644 %{SOURCE3} %{buildroot}%{_fileattrsdir}/qt6qml.attr +install -Dpm755 %{SOURCE4} %{buildroot}%{_rpmconfigdir}/qt6qml.prov +mkdir -p %{buildroot}%{_datadir}/qt6/wrappers +ln -s %{_bindir}/qmake-qt6.sh %{buildroot}%{_datadir}/qt6/wrappers/qmake-qt6 +ln -s %{_bindir}/qmake-qt6.sh %{buildroot}%{_datadir}/qt6/wrappers/qmake + +# substitute custom flags, and the path to binaries: binaries referenced from +# macros should not change if an application is built with a different prefix. +# %_libdir is left as /usr/%{_lib} (e.g.) so that the resulting macros are +# architecture independent, and don't hardcode /usr/lib or /usr/lib64. +sed -i \ + -e "s|@@QT6_CFLAGS@@|%{?qt6_cflags}|g" \ + -e "s|@@QT6_CXXFLAGS@@|%{?qt6_cxxflags}|g" \ + -e "s|@@QT6_RPM_LD_FLAGS@@|%{?qt6_rpm_ld_flags}|g" \ + -e "s|@@QT6_RPM_OPT_FLAGS@@|%{?qt6_rpm_opt_flags}|g" \ + -e "s|@@QMAKE@@|%{_prefix}/%%{_lib}/qt6/bin/qmake|g" \ + -e "s|@@QMAKE_QT6_WRAPPER@@|%{_bindir}/qmake-qt6.sh|g" \ + %{buildroot}%{_rpmconfigdir}/macros.d/macros.qt6 + +%if 0%{?metapackage} +mkdir -p %{buildroot}%{_docdir}/qt6 +mkdir -p %{buildroot}%{_docdir}/qt6-devel +echo "- Qt6 meta package" > %{buildroot}%{_docdir}/qt6/README +echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README + +%files +%{_docdir}/qt6/README + +%files devel +%{_docdir}/qt6-devel/README +%endif + +%files rpm-macros +%{_fileattrsdir}/qt6qml.attr +%{_rpmconfigdir}/qt6qml.prov +%{_rpmmacrodir}/macros.qt6 +%{_bindir}/qmake-qt6.sh +%{_datadir}/qt6/wrappers/ + +%files srpm-macros +%{_rpmmacrodir}/macros.qt6-srpm + + +%changelog +* Tue Apr 02 2024 Jan Grulich - 6.7.0-1 +- 6.7.0 + +* Sun Jan 28 2024 Jan Grulich - 6.6.2-1 +- 6.6.2 + +* Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jan 03 2024 Alessandro Astone - 6.6.1-3 +- Make qml dependency generator script executable + +* Tue Dec 05 2023 Yaakov Selkowitz - 6.6.1-2 +- Auto-generate qt6qml() virtual provides + +* Mon Nov 27 2023 Jan Grulich - 6.6.1-1 +- 6.6.1 + +* Tue Oct 10 2023 Jan Grulich - 6.6.0-1 +- 6.6.0 + +* Sun Oct 01 2023 Justin Zobel - 6.5.3-1 +- Update to 6.5.3 + +* Tue Sep 05 2023 Yaakov Selkowitz - 6.5.2-3 +- Fix %%qt6_qtwebengine_arches + +* Fri Jul 21 2023 Fedora Release Engineering - 6.5.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Mon May 22 2023 Jan Grulich - 6.5.1-1 +- 6.5.1 + +* Mon Apr 03 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + +* Thu Mar 23 2023 Jan Grulich - 6.4.2-4 +- 6.4.3 + +* Tue Jan 31 2023 Jan Grulich - 6.4.2-3 +- migrated to SPDX license + +* Fri Jan 20 2023 Fedora Release Engineering - 6.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Jan Grulich - 6.4.2-1 +- 6.4.2 + +* Wed Nov 23 2022 Jan Grulich - 6.4.1-1 +- 6.4.1 + +* Mon Oct 31 2022 Jan Grulich - 6.4.0-1 +- 6.4.0 + +* Sat Jul 23 2022 Fedora Release Engineering - 6.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jul 13 2022 Jan Grulich - 6.3.1-1 +- 6.3.1 + +* Wed Apr 13 2022 Jan Grulich - 6.3.0-1 +- 6.3.0 + +* Mon Jan 31 2022 Jan Grulich - 6.2.3-1 +- 6.2.3 + +* Fri Jan 21 2022 Fedora Release Engineering - 6.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Dec 14 2021 Jan Grulich - 6.2.2-1 +- 6.2.2 + +* Fri Oct 29 2021 Jan Grulich - 6.2.1-1 +- 6.2.1 + +* Fri Oct 29 2021 Jan Grulich - 6.2.0-2 +- 6.2.1 + +* Thu Sep 30 2021 Jan Grulich - 6.2.0-1 +- 6.2.0 + +* Mon Sep 27 2021 Jan Grulich - 6.2.0~rc2-1 +- 6.2.0 - rc2 + +* Tue Sep 21 2021 Jan Grulich - 6.2.0~rc-2 +- Drop qt6-qtquickcontrols2 from required packages + +* Sat Sep 18 2021 Jan Grulich - 6.2.0~rc-1 +- 6.2.0 - rc + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-3 +- Drop qt6_exclude_arch macro + +* Mon Sep 13 2021 Jan Grulich - 6.2.0~beta4-2 +- Add qt6_exclude_arch macro + +* Fri Sep 10 2021 Jan Grulich - 6.2.0~beta4-1 +- 6.2.0 - beta4 + +* Mon Aug 30 2021 Jan Grulich - 6.2.0~beta3-1 +- 6.2.0 - beta3 + +* Thu Aug 12 2021 Jan Grulich - 6.1.2-1 +- 6.1.2 + +* Fri Jul 23 2021 Fedora Release Engineering - 6.1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Jun 07 2021 Jan Grulich - 6.1.1-1 +- 6.1.1 + +* Mon May 24 2021 Jan Grulich - 6.1.0-2 +- Fix path to libexecdir + +* Thu May 06 2021 Jan Grulich - 6.1.0-1 +- 6.1.0 + +* Mon Apr 05 2021 Jan Grulich - 6.0.3-1 +- 6.0.3 + +* Thu Feb 04 2021 Jan Grulich - 6.0.1-1 +- 6.0.1 + +* Wed Jan 27 2021 Fedora Release Engineering - 6.0.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 06 2021 Jan Grulich - 6.0.0-1 +- 6.0.0 diff --git a/base/qt6/qt6/qt6qml.attr b/base/qt6/qt6/qt6qml.attr new file mode 100644 index 0000000..567c298 --- /dev/null +++ b/base/qt6/qt6/qt6qml.attr @@ -0,0 +1,2 @@ +%__qt6qml_path ^%{_qt6_qmldir}(/[^/]+)+/qmldir$ +%__qt6qml_provides %{_rpmconfigdir}/qt6qml.prov diff --git a/base/qt6/qt6/qt6qml.prov b/base/qt6/qt6/qt6qml.prov new file mode 100755 index 0000000..cce4b50 --- /dev/null +++ b/base/qt6/qt6/qt6qml.prov @@ -0,0 +1,6 @@ +#! /bin/sh + +grep '/qt6/qml/.*/qmldir$' | +while read fn; do + sed -ne "s/^module \(.*\)/qt6qml(\1)/p" "${fn}" +done