From b2c73d660c3007f5b8e81a96d06fb7857aee6deb Mon Sep 17 00:00:00 2001 From: tigro Date: Sat, 18 Nov 2023 21:22:02 +0300 Subject: [PATCH] import qt6-qtdeclarative-6.5.2-1.el9 --- .gitignore | 1 + .qt6-qtdeclarative.metadata | 1 + SOURCES/qv4global_p-multilib.h | 23 ++ SPECS/qt6-qtdeclarative.spec | 445 +++++++++++++++++++++++++++++++++ 4 files changed, 470 insertions(+) create mode 100644 .gitignore create mode 100644 .qt6-qtdeclarative.metadata create mode 100644 SOURCES/qv4global_p-multilib.h create mode 100644 SPECS/qt6-qtdeclarative.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..18fa7eb --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/qtdeclarative-everywhere-src-6.5.2.tar.xz diff --git a/.qt6-qtdeclarative.metadata b/.qt6-qtdeclarative.metadata new file mode 100644 index 0000000..94a6f12 --- /dev/null +++ b/.qt6-qtdeclarative.metadata @@ -0,0 +1 @@ +5e94add0fc44b7d99b3a7007fa66ea5026914a4b SOURCES/qtdeclarative-everywhere-src-6.5.2.tar.xz diff --git a/SOURCES/qv4global_p-multilib.h b/SOURCES/qv4global_p-multilib.h new file mode 100644 index 0000000..09d61d6 --- /dev/null +++ b/SOURCES/qv4global_p-multilib.h @@ -0,0 +1,23 @@ +/* qvglobal_p.h */ +/* This file is here to prevent a file conflict on multiarch systems. A + * conflict will occur because qconfig.h has arch-specific definitions. + * + * DO NOT INCLUDE THE NEW FILE DIRECTLY -- ALWAYS INCLUDE THIS ONE INSTEAD. */ + +#ifndef MULTILIB_QV4GLOBAL_H +#define MULTILIB_QV4GLOBAL_H + +#ifndef __WORDSIZE +#include +#endif + +#if __WORDSIZE == 32 +#include +#elif __WORDSIZE == 64 +#include +#else +#error "unexpected value for __WORDSIZE macro" +#endif + +#endif + diff --git a/SPECS/qt6-qtdeclarative.spec b/SPECS/qt6-qtdeclarative.spec new file mode 100644 index 0000000..5dc2cc7 --- /dev/null +++ b/SPECS/qt6-qtdeclarative.spec @@ -0,0 +1,445 @@ + +%global qt_module qtdeclarative + +%define _lto_cflags %{nil} + +# definition borrowed from qtbase +%global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9 + +#global unstable 1 +%if 0%{?unstable} +%global prerelease rc2 +%endif + +%global examples 1 + +Summary: Qt6 - QtDeclarative component +Name: qt6-%{qt_module} +Version: 6.5.2 +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 + +# header file to workaround multilib issue +# https://bugzilla.redhat.com/show_bug.cgi?id=1441343 +Source5: qv4global_p-multilib.h + +## upstream patches + +## upstreamable patches + +# filter qml provides +%global __provides_exclude_from ^%{_qt6_archdatadir}/qml/.*\\.so$ + +BuildRequires: cmake +BuildRequires: gcc-c++ +BuildRequires: ninja-build +BuildRequires: qt6-rpm-macros +BuildRequires: qt6-qtbase-devel >= %{version} +BuildRequires: qt6-qtbase-private-devel +BuildRequires: qt6-qtlanguageserver-devel >= %{version} +BuildRequires: qt6-qtshadertools-devel >= %{version} +%{?_qt6:Requires: %{_qt6}%{?_isa} = %{_qt6_version}} +BuildRequires: python%{python3_pkgversion} +BuildRequires: pkgconfig(xkbcommon) >= 0.4.1 + +%if 0%{?tests} +BuildRequires: dbus-x11 +BuildRequires: mesa-dri-drivers +BuildRequires: time +BuildRequires: xorg-x11-server-Xvfb +%endif + +Obsoletes: qt6-qtquickcontrols2 < 6.2.0~beta3-1 +Provides: qt6-qtquickcontrols2 = %{version}-%{release} + +%description +%{summary}. + +%package devel +Summary: Development files for %{name} +Provides: %{name}-private-devel = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: qt6-qtbase-devel%{?_isa} +Obsoletes: qt6-qtquickcontrols2-devel < 6.2.0~beta3-1 +Provides: qt6-qtquickcontrols2-devel = %{version}-%{release} +%description devel +%{summary}. + +%package static +Summary: Static library files for %{name} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} +%description static +%{summary}. + +%if 0%{?examples} +%package examples +Summary: Programming examples for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: qt6-qtquickcontrols2-examples < 6.2.0~beta3-1 +Provides: qt6-qtquickcontrols2-examples = %{version}-%{release} +# BuildRequires: qt6-qtdeclarative-devel >= %{version} +%description examples +%{summary}. +%endif + +%prep +%autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 + + +%build + +# HACK so calls to "python" get what we want +ln -s %{__python3} python +export PATH=`pwd`:$PATH + +%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} + +%cmake_build + + +%install +%cmake_install + +%ifarch %{multilib_archs} +# multilib: qv4global_p.h + mv %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h \ + %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p-%{__isa_bits}.h + install -p -m644 -D %{SOURCE5} %{buildroot}%{_qt6_headerdir}/QtQml/%{qt_version}/QtQml/private/qv4global_p.h +%endif + +# hardlink files to %{_bindir}, add -qt6 postfix to not conflict +mkdir %{buildroot}%{_bindir} +pushd %{buildroot}%{_qt6_bindir} +for i in * ; do + case "${i}" in + qmlcachegen|qmlleasing|qmlformat|qmleasing|qmlimportscanner|qmllint| \ + qmlpreview|qmlscene|qmltestrunner|qmltyperegistrar|qmlplugindump| \ + qmlprofiler|qml|qmlbundle|qmlmin|qmltime) + 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} + rm -fv "$(basename ${prl_file} .prl).la" + sed -i -e "/^QMAKE_PRL_LIBS/d" ${prl_file} +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} +export CTEST_OUTPUT_ON_FAILURE=1 +export PATH=%{buildroot}%{_qt6_bindir}:$PATH +export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir} +make sub-tests-all %{?_smp_mflags} +xvfb-run -a \ +dbus-launch --exit-with-session \ +time \ +make check -k -C tests ||: +%endif + + +%ldconfig_scriptlets + +%files +%license LICENSES/LGPL* +%{_qt6_libdir}/libQt6LabsAnimation.so.6* +%{_qt6_libdir}/libQt6LabsFolderListModel.so.6* +%{_qt6_libdir}/libQt6LabsQmlModels.so.6* +%{_qt6_libdir}/libQt6LabsSettings.so.6* +%{_qt6_libdir}/libQt6LabsSharedImage.so.6* +%{_qt6_libdir}/libQt6LabsWavefrontMesh.so.6* +%{_qt6_libdir}/libQt6QmlLocalStorage.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}/libQt6QuickControls2.so.6* +%{_qt6_libdir}/libQt6QuickControls2Impl.so.6* +%{_qt6_libdir}/libQt6QuickDialogs2.so.6* +%{_qt6_libdir}/libQt6QuickDialogs2QuickImpl.so.6* +%{_qt6_libdir}/libQt6QuickDialogs2Utils.so.6* +%{_qt6_libdir}/libQt6QuickEffects.so.6* +%{_qt6_libdir}/libQt6QuickLayouts.so.6* +%{_qt6_libdir}/libQt6QuickWidgets.so.6* +%{_qt6_libdir}/libQt6QuickParticles.so.6* +%{_qt6_libdir}/libQt6QuickShapes.so.6* +%{_qt6_libdir}/libQt6QuickTest.so.6* +%{_qt6_libdir}/libQt6QuickTemplates2.so.6* +%{_qt6_libdir}/libQt6QmlXmlListModel.so.6* +%{_qt6_plugindir}/qmltooling/ +%{_qt6_plugindir}/qmllint/ +%{_qt6_archdatadir}/qml/ + +%files devel +%dir %{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate +%dir %{_qt6_libdir}/cmake/Qt6Qml +%dir %{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins +%dir %{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate +%dir %{_qt6_libdir}/cmake/Qt6QmlCore +%dir %{_qt6_libdir}/cmake/Qt6QmlDebugPrivate +%dir %{_qt6_libdir}/cmake/Qt6QmlIntegration +%dir %{_qt6_libdir}/cmake/Qt6QmlImportScanner +%dir %{_qt6_libdir}/cmake/Qt6LabsAnimation +%dir %{_qt6_libdir}/cmake/Qt6LabsFolderListModel +%dir %{_qt6_libdir}/cmake/Qt6LabsQmlModels +%dir %{_qt6_libdir}/cmake/Qt6LabsSettings +%dir %{_qt6_libdir}/cmake/Qt6LabsSharedImage +%dir %{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh +%dir %{_qt6_libdir}/cmake/Qt6QmlDomPrivate +%dir %{_qt6_libdir}/cmake/Qt6QmlLocalStorage +%dir %{_qt6_libdir}/cmake/Qt6QmlModels +%dir %{_qt6_libdir}/cmake/Qt6QmlTools +%dir %{_qt6_libdir}/cmake/Qt6QmlWorkerScript +%dir %{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate +%dir %{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate +%dir %{_qt6_libdir}/cmake/Qt6Quick +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2 +%dir %{_qt6_libdir}/cmake/Qt6QuickControls2Impl +%dir %{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate +%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2 +%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2QuickImpl +%dir %{_qt6_libdir}/cmake/Qt6QuickDialogs2Utils +%dir %{_qt6_libdir}/cmake/Qt6QuickLayouts +%dir %{_qt6_libdir}/cmake/Qt6QuickParticlesPrivate +%dir %{_qt6_libdir}/cmake/Qt6QuickShapesPrivate +%dir %{_qt6_libdir}/cmake/Qt6QuickTest +%dir %{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate +%dir %{_qt6_libdir}/cmake/Qt6QuickTemplates2 +%dir %{_qt6_libdir}/cmake/Qt6QmlXmlListModel +%{_bindir}/qml* +%{_qt6_bindir}/qml* +%{_qt6_libexecdir}/qmlcachegen +%{_qt6_libexecdir}/qmlimportscanner +%{_qt6_libexecdir}/qmltyperegistrar +%{_qt6_headerdir}/Qt*/ +%{_qt6_libdir}/libQt6LabsAnimation.so +%{_qt6_libdir}/libQt6LabsFolderListModel.so +%{_qt6_libdir}/libQt6LabsQmlModels.so +%{_qt6_libdir}/libQt6LabsSettings.so +%{_qt6_libdir}/libQt6LabsSharedImage.so +%{_qt6_libdir}/libQt6LabsWavefrontMesh.so +%{_qt6_libdir}/libQt6QmlLocalStorage.so +%{_qt6_libdir}/libQt6Qml.so +%{_qt6_libdir}/libQt6QmlCompiler.so +%{_qt6_libdir}/libQt6QmlCore.so +%{_qt6_libdir}/libQt6QmlModels.so +%{_qt6_libdir}/libQt6QmlWorkerScript.so +%{_qt6_libdir}/libQt6Quick*.so +%{_qt6_libdir}/libQt6QmlXmlListModel.so +%{_qt6_libdir}/qt6/metatypes/qt6*_metatypes.json +%{_qt6_archdatadir}/mkspecs/modules/*.pri +%{_qt6_archdatadir}/mkspecs/features/*.prf +%{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtDeclarativeTestsConfig.cmake +%{_qt6_libdir}/cmake/Qt6PacketProtocolPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6Qml/*.cmake* +%{_qt6_libdir}/cmake/Qt6Qml/*.cpp.in +%{_qt6_libdir}/cmake/Qt6Qml/*.qrc.in +%{_qt6_libdir}/cmake/Qt6Qml/QmlPlugins/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlCompilerPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlCore/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlDebugPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlIntegration/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlImportScanner/*.cmake +%{_qt6_libdir}/cmake/Qt6LabsAnimation/*.cmake +%{_qt6_libdir}/cmake/Qt6LabsFolderListModel/*.cmake +%{_qt6_libdir}/cmake/Qt6LabsQmlModels/*.cmake +%{_qt6_libdir}/cmake/Qt6LabsSettings/*.cmake +%{_qt6_libdir}/cmake/Qt6LabsSharedImage/*.cmake +%{_qt6_libdir}/cmake/Qt6LabsWavefrontMesh/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlDomPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlLocalStorage/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlModels/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlTools/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlWorkerScript/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlTypeRegistrarPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickEffectsPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6Quick/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickControls2/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickControls2Impl/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickControlsTestUtilsPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickDialogs2/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickDialogs2QuickImpl/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickDialogs2Utils/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickLayouts/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickParticlesPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickShapesPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickTest/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickTestUtilsPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickTemplates2/*.cmake +%{_qt6_libdir}/cmake/Qt6QmlXmlListModel/*.cmake +%{_qt6_libdir}/cmake/Qt6QuickWidgets/*.cmake +%{_qt6_libdir}/qt6/modules/*.json +%{_qt6_libdir}/pkgconfig/*.pc + +%files static +%{_qt6_libdir}/libQt6LabsAnimation.prl +%{_qt6_libdir}/libQt6LabsFolderListModel.prl +%{_qt6_libdir}/libQt6LabsQmlModels.prl +%{_qt6_libdir}/libQt6LabsSettings.prl +%{_qt6_libdir}/libQt6LabsSharedImage.prl +%{_qt6_libdir}/libQt6LabsWavefrontMesh.prl +%{_qt6_libdir}/libQt6QmlCore.prl +%{_qt6_libdir}/libQt6QmlDom.a +%{_qt6_libdir}/libQt6QmlDom.prl +%{_qt6_libdir}/libQt6QmlLocalStorage.prl +%{_qt6_libdir}/libQt6Quick*.prl +%{_qt6_libdir}/libQt6QmlWorkerScript.prl +%{_qt6_libdir}/libQt6QmlModels.prl +%{_qt6_libdir}/libQt6Qml.prl +%{_qt6_libdir}/libQt6QmlCompiler.prl +%{_qt6_libdir}/libQt6QmlTypeRegistrar.prl +%{_qt6_libdir}/libQt6QmlTypeRegistrar.a +%{_qt6_libdir}/libQt6PacketProtocol.a +%{_qt6_libdir}/libQt6PacketProtocol.prl +%{_qt6_libdir}/libQt6QuickControlsTestUtils.a +%{_qt6_libdir}/libQt6QuickTestUtils.a +%{_qt6_libdir}/libQt6QmlDebug.a +%{_qt6_libdir}/libQt6QmlDebug.prl +%{_qt6_libdir}/libQt6QmlXmlListModel.prl + +%if 0%{?examples} +%files examples +%{_qt6_examplesdir}/ +%endif + +%changelog +* Sat Nov 18 2023 Arkady L. Shane - 6.5.2-1 +- Rebuilt for MSVSphere 9.2 + +* Fri Jul 21 2023 Jan Grulich - 6.5.2-1 +- 6.5.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-4 +- Rebuild for qtlanguageserver private API version change + +* 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 Yaakov Selkowitz - 6.5.0-2 +- Enable qmlls + +* 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 + +* Wed Mar 15 2023 Neal Gompa - 6.4.2-5 +- Backport fix for crashes in V4 JIT (#2177696) + +* Fri Mar 03 2023 Jan Grulich - 6.4.2-4 +- Fix directory ownership + +* 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 +- Obsoletes: qt6-qtquickcontrols2 + +* 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 + +* Mon Jan 11 2021 Jan Grulich - 6.0.0-1 +- 6.0.0