diff --git a/.gitignore b/.gitignore index b90940e..f96fe9b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,6 @@ /qtbase-everywhere-src-6.4.1.tar.xz /qtbase-everywhere-src-6.4.2.tar.xz /qtbase-everywhere-src-6.4.3.tar.xz +/qtbase-everywhere-src-6.5.0.tar.xz +/qtbase-everywhere-src-6.5.1.tar.xz +/qtbase-everywhere-src-6.5.2.tar.xz diff --git a/qt6-qtbase.spec b/qt6-qtbase.spec index 51ac929..6a8b26c 100644 --- a/qt6-qtbase.spec +++ b/qt6-qtbase.spec @@ -1,4 +1,3 @@ - # See http://bugzilla.redhat.com/223663 %global multilib_archs x86_64 %{ix86} %{?mips} ppc64 ppc s390x s390 sparc64 sparcv9 %global multilib_basearchs x86_64 %{?mips64} ppc64 s390x sparc64 @@ -38,8 +37,8 @@ BuildRequires: pkgconfig(libsystemd) Name: qt6-qtbase Summary: Qt6 - QtBase components -Version: 6.4.3 -Release: 2%{?dist} +Version: 6.5.2 +Release: 5%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://qt-project.org/ @@ -66,12 +65,8 @@ Source6: 10-qt6-check-opengl2.sh # macros Source10: macros.qt6-qtbase -# borrowed from opensuse -# track private api via properly versioned symbols -# downside: binaries produced with these differently-versioned symbols are no longer -# compatible with qt-project.org's Qt binary releases. -Patch1: qtbase-tell-truth-about-private-api.patch -Patch2: qtbase-use-qgnomeplatform-as-default-platform-theme-on-gnome.patch +Patch1: qtbase-tell-the-truth-about-private-API.patch +Patch2: qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch # upstreamable patches # namespace QT_VERSION_CHECK to workaround major/minor being pre-defined (#1396755) @@ -86,9 +81,6 @@ Patch51: qtbase-moc-macros.patch # drop -O3 and make -O2 by default Patch54: qtbase-cxxflag.patch -# support firebird version 3.x -Patch55: qtbase-firebird.patch - # fix for new mariadb Patch56: qtbase-mysql.patch @@ -98,6 +90,11 @@ Patch58: qtbase-libglvnd.patch # gcc-11 Patch90: qtbase-gcc11.patch +%if 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 # Do not check any files in %%{_qt6_plugindir}/platformthemes/ for requires. @@ -120,11 +117,16 @@ 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 BuildRequires: tslib-devel BuildRequires: pkgconfig(alsa) # required for -accessibility @@ -138,6 +140,7 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libproxy-1.0) +BuildRequires: pkgconfig(libsctp) # xcb-sm BuildRequires: pkgconfig(ice) pkgconfig(sm) BuildRequires: pkgconfig(libpng) @@ -158,16 +161,17 @@ BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(gbm) BuildRequires: pkgconfig(libglvnd) BuildRequires: pkgconfig(x11) +# only needed for GLES2 and GLES3 builds +#BuildRequires: pkgconfig(glesv2) %global sqlite 1 BuildRequires: pkgconfig(sqlite3) >= 3.7 BuildRequires: pkgconfig(harfbuzz) >= 0.9.42 BuildRequires: pkgconfig(icu-i18n) -BuildRequires: pkgconfig(libpcre2-posix) >= 10.20 -BuildRequires: pkgconfig(libpcre) >= 8.0 +BuildRequires: pkgconfig(libpcre2-16) >= 10.20 %global pcre 1 BuildRequires: pkgconfig(xcb-xkb) -BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) +BuildRequires: pkgconfig(xcb) pkgconfig(xcb-glx) pkgconfig(xcb-icccm) pkgconfig(xcb-image) pkgconfig(xcb-keysyms) pkgconfig(xcb-renderutil) pkgconfig(xcb-cursor) BuildRequires: pkgconfig(zlib) BuildRequires: perl BuildRequires: perl-generators @@ -185,18 +189,10 @@ BuildRequires: xorg-x11-server-Xvfb Requires: %{name}-common = %{version}-%{release} ## Sql drivers -# FIXME: disable for now, they don't seem to be implemented in Qt 6.0.0 -# if rhel -%global no_ibase 1 -%global no_tds 1 -# endif - -# workaround gold linker bug(s) by not using it -# https://bugzilla.redhat.com/1458003 -# https://sourceware.org/bugzilla/show_bug.cgi?id=21074 -# reportedly fixed or worked-around, re-enable if there's evidence of problems -- rex -# https://bugzilla.redhat.com/show_bug.cgi?id=1635973 -%global use_gold_linker 0 +%if 0%{?fedora} || 0%{?epel} +%global ibase 1 +%endif + %description Qt is a software toolkit for developing applications. @@ -226,15 +222,12 @@ Requires: qt6-rpm-macros %if 0%{?use_clang} Requires: clang >= 3.7.0 %endif -%if 0%{?no_ibase} == 0 +%if 0%{?ibase} Requires: %{name}-ibase%{?_isa} = %{version}-%{release} %endif Requires: %{name}-mysql%{?_isa} = %{version}-%{release} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-postgresql%{?_isa} = %{version}-%{release} -%if 0%{?no_tds} == 0 -Requires: %{name}-tds%{?_isa} = %{version}-%{release} -%endif %description devel %{summary}. @@ -265,7 +258,7 @@ Requires: pkgconfig(zlib) %description static %{summary}. -%if 0%{?no_ibase} == 0 +%if 0%{?ibase} %package ibase Summary: IBase driver for Qt6's SQL classes BuildRequires: firebird-devel @@ -299,22 +292,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description postgresql %{summary}. -%if 0%{?no_tds} == 0 -%package tds -Summary: TDS driver for Qt6's SQL classes -BuildRequires: freetds-devel -Requires: %{name}%{?_isa} = %{version}-%{release} -%description tds -%{summary}. -%endif - # debating whether to do 1 subpkg per library or not -- rex %package gui Summary: Qt6 GUI-related libraries Requires: %{name}%{?_isa} = %{version}-%{release} -%if 0%{?fedora} > 20 Recommends: mesa-dri-drivers -%endif # for Source6: 10-qt6-check-opengl2.sh: # glxinfo Requires: glx-utils @@ -336,10 +318,6 @@ popd # check to ensure that can't happen -- rex test -x configure || chmod +x configure -# use proper perl interpretter so autodeps work as expected -sed -i -e "s|^#!/usr/bin/env perl$|#!%{__perl}|" \ - mkspecs/features/data/unix/findclasslist.pl - %build # QT is known not to work properly with LTO at this point. Some of the issues @@ -376,12 +354,15 @@ export MAKEFLAGS="%{?_smp_mflags}" -DQT_FEATURE_enable_new_dtags=ON \ -DQT_FEATURE_journald=%{?journald:ON}%{!?journald:OFF} \ -DQT_FEATURE_openssl_linked=ON \ + -DQT_FEATURE_libproxy=ON \ + -DQT_FEATURE_sctp=ON \ -DQT_FEATURE_separate_debug_info=OFF \ -DQT_FEATURE_reduce_relocations=OFF \ -DQT_FEATURE_relocatable=OFF \ -DQT_FEATURE_system_jpeg=ON \ -DQT_FEATURE_system_png=ON \ -DQT_FEATURE_system_zlib=ON \ + %{?ibase:-DQT_FEATURE_sql_ibase=ON} \ -DQT_FEATURE_sql_odbc=ON \ -DQT_FEATURE_sql_mysql=ON \ -DQT_FEATURE_sql_psql=ON \ @@ -391,9 +372,6 @@ export MAKEFLAGS="%{?_smp_mflags}" %{?dbus_linked:-DQT_FEATURE_dbus_linked=ON} \ %{?pcre:-DQT_FEATURE_system_pcre2=ON} \ %{?sqlite:-DQT_FEATURE_system_sqlite=ON} \ - %{?no_tds:-DQT_FEATURE_sql_tds=OFF}%{!?no_tds:-DQT_FEATURE_sql_tds=ON} \ - %{?no_ibase:-DQT_FEATURE_sql_ibase=OFF}%{!?no_ibase:-DQT_FEATURE_sql_ibase=ON} \ - %{?use_gold_linker:-DQT_FEATURE_use_gold_linker=OFF} \ -DBUILD_SHARED_LIBS=ON \ -DQT_BUILD_EXAMPLES=%{?examples:ON}%{!?examples:OFF} \ -DQT_BUILD_TESTS=%{?tests:ON}%{!?tests:OFF} \ @@ -433,7 +411,7 @@ translationdir=%{_qt6_translationdir} Name: Qt6 Description: Qt6 Configuration -Version: 6.4.3 +Version: 6.5.2 EOF # rpm macros @@ -491,7 +469,7 @@ install -p -m755 -D %{SOURCE6} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/10 mkdir -p %{buildroot}%{_qt6_headerdir}/QtXcb install -m 644 src/plugins/platforms/xcb/*.h %{buildroot}%{_qt6_headerdir}/QtXcb/ -rm %{buildroot}/%{_bindir}/qt-cmake-private-install.cmake +rm %{buildroot}/%{_qt6_libexecdir}/qt-cmake-private-install.cmake # Use better location for some new scripts in qtbase-6.0.1 mv %{buildroot}/%{_qt6_libexecdir}/ensure_pro_file.cmake %{buildroot}/%{_qt6_libdir}/cmake/Qt6/ensure_pro_file.cmake @@ -563,8 +541,8 @@ make check -k ||: %{_rpmmacrodir}/macros.qt6-qtbase %files devel -%dir %{_qt6_datadir}/modules -%dir %{_qt6_libdir}/metatypes +%dir %{_qt6_libdir}/qt6/modules +%dir %{_qt6_libdir}/qt6/metatypes %dir %{_qt6_libdir}/cmake/Qt6 %dir %{_qt6_libdir}/cmake/Qt6/platforms %dir %{_qt6_libdir}/cmake/Qt6/platforms/Platform @@ -582,18 +560,17 @@ make check -k ||: %dir %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate +%dir %{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate %dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6Gui %dir %{_qt6_libdir}/cmake/Qt6GuiTools %dir %{_qt6_libdir}/cmake/Qt6HostInfo -%dir %{_qt6_libdir}/cmake/Qt6FbSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6KmsSupportPrivate %dir %{_qt6_libdir}/cmake/Qt6Network %dir %{_qt6_libdir}/cmake/Qt6OpenGL %dir %{_qt6_libdir}/cmake/Qt6OpenGLWidgets %dir %{_qt6_libdir}/cmake/Qt6PrintSupport %dir %{_qt6_libdir}/cmake/Qt6Sql -%dir %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate %dir %{_qt6_libdir}/cmake/Qt6Test %dir %{_qt6_libdir}/cmake/Qt6Widgets %dir %{_qt6_libdir}/cmake/Qt6WidgetsTools @@ -602,40 +579,40 @@ make check -k ||: %dir %{_qt6_bindir} %endif %{_bindir}/androiddeployqt +%{_bindir}/androiddeployqt6 %{_bindir}/androidtestrunner %{_bindir}/qdbuscpp2xml* %{_bindir}/qdbusxml2cpp* %{_bindir}/qmake* %{_bindir}/qtpaths* %{_bindir}/qt-cmake -%{_bindir}/qt-cmake-private -%{_bindir}/qt-cmake-standalone-test %{_bindir}/qt-configure-module %{_libdir}/qt6/bin/qmake6 %{_qt6_bindir}/androiddeployqt +%{_qt6_bindir}/androiddeployqt6 %{_qt6_bindir}/androidtestrunner %{_qt6_bindir}/qdbuscpp2xml %{_qt6_bindir}/qdbusxml2cpp %{_qt6_bindir}/qmake %{_qt6_bindir}/qtpaths* %{_qt6_bindir}/qt-cmake -%{_qt6_bindir}/qt-cmake-private -%{_qt6_bindir}/qt-cmake-private-install.cmake -%{_qt6_bindir}/qt-cmake-standalone-test %{_qt6_bindir}/qt-configure-module +%{_qt6_libexecdir}/qt-cmake-private +%{_qt6_libexecdir}/qt-cmake-standalone-test %{_qt6_libexecdir}/cmake_automoc_parser %{_qt6_libexecdir}/qt-internal-configure-tests -%{_qt6_libexecdir}/syncqt.pl +%{_qt6_libexecdir}/sanitizer-testrunner.py +%{_qt6_libexecdir}/syncqt %{_qt6_libexecdir}/android_emulator_launcher.sh %{_qt6_libexecdir}/moc %{_qt6_libexecdir}/tracegen +%{_qt6_libexecdir}/tracepointgen %{_qt6_libexecdir}/qlalr -%{_qt6_libexecdir}/qt-internal-configure-tests %{_qt6_libexecdir}/qvkgen %{_qt6_libexecdir}/rcc %{_qt6_libexecdir}/uic %{_qt6_libexecdir}/qt-testrunner.py -%{_qt6_datadir}/modules/*.json +%{_qt6_libdir}/qt6/modules/*.json %if "%{_qt6_headerdir}" != "%{_includedir}" %dir %{_qt6_headerdir} %endif @@ -643,6 +620,7 @@ make check -k ||: %{_qt6_headerdir}/QtCore/ %{_qt6_headerdir}/QtDBus/ %{_qt6_headerdir}/QtInputSupport +%{_qt6_headerdir}/QtExampleIcons %{_qt6_headerdir}/QtGui/ %{_qt6_headerdir}/QtNetwork/ %{_qt6_headerdir}/QtOpenGL/ @@ -680,7 +658,7 @@ make check -k ||: %{_qt6_libdir}/libQt6Widgets.prl %{_qt6_libdir}/libQt6Widgets.so %{_qt6_libdir}/libQt6XcbQpa.prl -%{_qt6_libdir}/libQt6XcbQpa.so +%{_qt6_libdir}/libQt6XcbQpa.so %{_qt6_libdir}/libQt6Xml.prl %{_qt6_libdir}/libQt6Xml.so %{_qt6_libdir}/libQt6EglFSDeviceIntegration.prl @@ -695,8 +673,10 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6/libexec/* %{_qt6_libdir}/cmake/Qt6/platforms/*.cmake %{_qt6_libdir}/cmake/Qt6/platforms/Platform/*.cmake +%{_qt6_libdir}/cmake/Qt6/qbatchedtestrunner.in.cpp %{_qt6_libdir}/cmake/Qt6/ModuleDescription.json.in %{_qt6_libdir}/cmake/Qt6/QtFileConfigure.txt.in +%{_qt6_libdir}/cmake/Qt6/QtConfigureTimeExecutableCMakeLists.txt.in %{_qt6_libdir}/cmake/Qt6/QtSeparateDebugInfo.Info.plist.in %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/COPYING-CMAKE-SCRIPTS %{_qt6_libdir}/cmake/Qt6/3rdparty/extra-cmake-modules/find-modules/*.cmake @@ -719,6 +699,7 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6EglFSDeviceIntegrationPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6EglFsKmsGbmSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6EglFsKmsSupportPrivate/*.cmake +%{_qt6_libdir}/cmake/Qt6ExampleIconsPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6FbSupportPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Gui/*.cmake %{_qt6_libdir}/cmake/Qt6GuiTools/*.cmake @@ -729,14 +710,15 @@ make check -k ||: %{_qt6_libdir}/cmake/Qt6OpenGL/*.cmake %{_qt6_libdir}/cmake/Qt6OpenGLWidgets/*.cmake %{_qt6_libdir}/cmake/Qt6PrintSupport/*.cmake -%{_qt6_libdir}/cmake/Qt6Sql/*.cmake +%{_qt6_libdir}/cmake/Qt6Sql/Qt6Sql*.cmake %{_qt6_libdir}/cmake/Qt6Sql/Qt6QSQLiteDriverPlugin*.cmake %{_qt6_libdir}/cmake/Qt6Test/*.cmake %{_qt6_libdir}/cmake/Qt6Widgets/*.cmake %{_qt6_libdir}/cmake/Qt6WidgetsTools/*.cmake %{_qt6_libdir}/cmake/Qt6XcbQpaPrivate/*.cmake %{_qt6_libdir}/cmake/Qt6Xml/*.cmake -%{_qt6_libdir}/metatypes/*.json +%{_qt6_libdir}/qt6/metatypes/*.json +%{_qt6_libdir}/qt6/objects-RelWithDebInfo/ExampleIconsPrivate_resources_1/.rcc/qrc_example_icons.cpp.o %{_qt6_libdir}/pkgconfig/*.pc %if 0%{?egl} @@ -753,6 +735,8 @@ make check -k ||: %{_qt6_headerdir}/QtDeviceDiscoverySupport %{_qt6_libdir}/libQt6DeviceDiscoverySupport.*a %{_qt6_libdir}/libQt6DeviceDiscoverySupport.prl +%{_qt6_libdir}/libQt6ExampleIcons.a +%{_qt6_libdir}/libQt6ExampleIcons.prl %{_qt6_headerdir}/QtFbSupport %{_qt6_libdir}/libQt6FbSupport.*a %{_qt6_libdir}/libQt6FbSupport.prl @@ -766,10 +750,10 @@ make check -k ||: %{_qt6_examplesdir}/ %endif -%if 0%{?no_ibase} == 0 +%if 0%{?ibase} %files ibase %{_qt6_plugindir}/sqldrivers/libqsqlibase.so - +%{_qt6_libdir}/cmake/Qt6Sql/Qt6QIBaseDriverPlugin*.cmake %endif %files mysql @@ -784,11 +768,6 @@ make check -k ||: %{_qt6_plugindir}/sqldrivers/libqsqlpsql.so %{_qt6_libdir}/cmake/Qt6Sql/Qt6QPSQLDriverPlugin*.cmake -%if 0%{?no_tds} == 0 -%files tds -%{_qt6_plugindir}/sqldrivers/libqsqltds.so -%endif - %ldconfig_scriptlets gui %files gui @@ -845,6 +824,40 @@ make check -k ||: %changelog +* Sun Sep 03 2023 LuK1337 - 6.5.2-5 +- Unbreak CMake Qt6::ExampleIconsPrivate package + +* Mon Aug 28 2023 Yaakov Selkowitz - 6.5.2-4 +- Use bundled libb2 in RHEL builds + +* Fri Aug 11 2023 Jan Grulich - 6.5.2-3 +- Don't use QGnomePlatform by default on F39+ + +* 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 František Zatloukal - 6.5.1-4 +- Rebuilt for ICU 73.2 + +* Wed Jul 12 2023 Jan Grulich - 6.5.1-3 +- Bump build for 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 + +* Fri Apr 7 2023 Marie Loise Nolden - 6.5.0-2 +- fix xcb plugin with new dependency xcb-cursor instead of Xcursor + introduction with qt 6.5, add firebird sql plugin cleanly, clean up spec file + +* Mon Apr 03 2023 Jan Grulich - 6.5.0-1 +- 6.5.0 + * Mon Apr 03 2023 Jan Grulich - 6.4.3-2 - Enable zstd support diff --git a/qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch b/qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch new file mode 100644 index 0000000..5d7bc91 --- /dev/null +++ b/qtbase-CMake-Install-objects-files-into-ARCHDATADIR.patch @@ -0,0 +1,51 @@ +From 4e517492a03b6c0b710a2d9a3df05922ac233992 Mon Sep 17 00:00:00 2001 +From: Christophe Marin +Date: Wed, 24 May 2023 11:23:39 +0200 +Subject: [PATCH] CMake: Install objects files into 'ARCHDATADIR' + +Change-Id: I917a9ef4d83f93eb5c3e47964bf1814d1b53fdab +--- + cmake/QtResourceHelpers.cmake | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/cmake/QtResourceHelpers.cmake b/cmake/QtResourceHelpers.cmake +index 2df1fed50f..e4f34b5ff1 100644 +--- a/cmake/QtResourceHelpers.cmake ++++ b/cmake/QtResourceHelpers.cmake +@@ -38,7 +38,7 @@ function(qt_internal_add_resource target resourceName) + if (out_targets) + qt_install(TARGETS ${out_targets} + EXPORT "${INSTALL_CMAKE_NAMESPACE}${target}Targets" +- DESTINATION "${INSTALL_LIBDIR}" ++ DESTINATION "${INSTALL_ARCHDATADIR}" + ) + qt_internal_add_targets_to_additional_targets_export_file( + TARGETS ${out_targets} +@@ -47,7 +47,7 @@ function(qt_internal_add_resource target resourceName) + + qt_internal_install_resource_pdb_files("${out_targets}") + qt_internal_record_rcc_object_files("${target}" "${out_targets}" +- INSTALL_DIRECTORY "${INSTALL_LIBDIR}") ++ INSTALL_DIRECTORY "${INSTALL_ARCHDATADIR}") + endif() + + if (arg_OUTPUT_TARGETS) +@@ -77,7 +77,7 @@ function(qt_internal_record_rcc_object_files target resource_targets) + # It's comprised of thee following path parts: + # + # part (1) INSTALL_DIRECTORY. +- # A usual value is '${INSTALL_LIBDIR}/' for libraries ++ # A usual value is '${INSTALL_ARCHDATADIR}/' for libraries + # and '${INSTALL_QMLDIR}/foo/bar/' for qml plugin resources. + # + # part (2) the value computed by CMake's computeInstallObjectDir comprised of an +@@ -128,6 +128,6 @@ function(qt_internal_install_resource_pdb_files objlib_targets) + _qt_resource_generated_cpp_relative_path) + get_filename_component(rel_obj_file_dir "${generated_cpp_file_relative_path}" DIRECTORY) + qt_internal_install_pdb_files(${target} +- "${INSTALL_LIBDIR}/objects-$/${target}/${rel_obj_file_dir}") ++ "${INSTALL_ARCHDATADIR}/objects-$/${target}/${rel_obj_file_dir}") + endforeach() + endfunction() +-- +2.40.1 diff --git a/qtbase-tell-the-truth-about-private-API.patch b/qtbase-tell-the-truth-about-private-API.patch new file mode 100644 index 0000000..fd2ac7a --- /dev/null +++ b/qtbase-tell-the-truth-about-private-API.patch @@ -0,0 +1,28 @@ +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 +--- 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") + if(arg_PRIVATE_HEADERS) + foreach(ph ${arg_PRIVATE_HEADERS}) + string(APPEND contents " @FILE:${ph}@\n") +-- +2.40.0 diff --git a/qtbase-tell-truth-about-private-api.patch b/qtbase-tell-truth-about-private-api.patch deleted file mode 100644 index 33e48ad..0000000 --- a/qtbase-tell-truth-about-private-api.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf -index 3cacc8df..469e6f50 100644 ---- a/mkspecs/features/qt_module.prf -+++ b/mkspecs/features/qt_module.prf -@@ -218,9 +218,9 @@ android: CONFIG += qt_android_deps no_linker_version_script - QMAKE_LFLAGS += $${QMAKE_LFLAGS_VERSION_SCRIPT}$$verscript - - internal_module { -- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API { *; };" -+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API { *; };" - } else { -- verscript_content = "Qt_$${QT_MAJOR_VERSION}_PRIVATE_API {" \ -+ verscript_content = "Qt_$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}_PRIVATE_API {" \ - " qt_private_api_tag*;" - - private_api_headers = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.QPA_HEADER_FILES diff --git a/qtbase-version-check.patch b/qtbase-version-check.patch index d9c62b8..9343ade 100644 --- a/qtbase-version-check.patch +++ b/qtbase-version-check.patch @@ -1,13 +1,13 @@ -diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h -index 6e83b78f..6a18cc19 100644 ---- a/src/corelib/global/qglobal.h -+++ b/src/corelib/global/qglobal.h -@@ -59,7 +59,7 @@ +diff --git a/src/corelib/global/qtversionchecks.h b/src/corelib/global/qtversionchecks.h +index d3b7a7b0..a8b9c6f3 100644 +--- a/src/corelib/global/qtversionchecks.h ++++ b/src/corelib/global/qtversionchecks.h +@@ -26,7 +26,7 @@ /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(6, 4, 0)) */ -#define QT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) +#define QT_VERSION_CHECK(qt_version_check_major, qt_version_check_minor, qt_version_check_patch) ((qt_version_check_major<<16)|(qt_version_check_minor<<8)|(qt_version_check_patch)) - - #ifdef QT_BOOTSTRAPPED - #include + + /* + Helper macros to make some simple code active in Qt 6 or Qt 7 only, diff --git a/sources b/sources index 4888dc5..5151a6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-6.4.3.tar.xz) = a2d0779ba7ee8b8b78f5dc8db06177d04d50463fea7cad0b7785721acfc33dbbbaa1a7bfc052edb90ba1d11b488c30004daa43b6924a97126b9b8f82ad1a7f43 +SHA512 (qtbase-everywhere-src-6.5.2.tar.xz) = 8d97029aae5b73a3e03624c9a8495dbf2fe54a4f5e992071c06f3d93935e64c80f2121b33eeb60a92d96ceb288cb25d74906a5bf47b45bb018d859d4a2d13f20