diff --git a/.gitignore b/.gitignore index 4053fc4..342c5dc 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /qtbase-everywhere-src-5.11.2.tar.xz /qtbase-everywhere-src-5.11.3.tar.xz /qtbase-everywhere-src-5.12.3.tar.xz +/qtbase-everywhere-src-5.12.4.tar.xz diff --git a/0001-Add-support-for-SPNEGO-Negotiate-authentication.patch b/0001-Add-support-for-SPNEGO-Negotiate-authentication.patch index 0ce258f..c197ed7 100644 --- a/0001-Add-support-for-SPNEGO-Negotiate-authentication.patch +++ b/0001-Add-support-for-SPNEGO-Negotiate-authentication.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/src/network/access/qhttpnetworkconnection.cpp qtbase-everywhere-src-5.12.3-new/src/network/access/qhttpnetworkconnection.cpp ---- qtbase-everywhere-src-5.12.3/src/network/access/qhttpnetworkconnection.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/access/qhttpnetworkconnection.cpp 2019-04-17 14:04:17.821525892 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/network/access/qhttpnetworkconnection.cpp qtbase-everywhere-src-5.12.4-new/src/network/access/qhttpnetworkconnection.cpp +--- qtbase-everywhere-src-5.12.4/src/network/access/qhttpnetworkconnection.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/access/qhttpnetworkconnection.cpp 2019-06-28 21:33:14.818617915 +0200 @@ -398,11 +398,12 @@ void QHttpNetworkConnectionPrivate::copy { Q_ASSERT(auth); @@ -36,9 +36,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/access/qhttpnetworkconnectio request.setHeaderField("Proxy-Authorization", response); channels[i].proxyCredentialsSent = true; } -diff -rupN qtbase-everywhere-src-5.12.3/src/network/access/qhttpnetworkreply.cpp qtbase-everywhere-src-5.12.3-new/src/network/access/qhttpnetworkreply.cpp ---- qtbase-everywhere-src-5.12.3/src/network/access/qhttpnetworkreply.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/access/qhttpnetworkreply.cpp 2019-04-17 14:04:17.822525888 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/network/access/qhttpnetworkreply.cpp qtbase-everywhere-src-5.12.4-new/src/network/access/qhttpnetworkreply.cpp +--- qtbase-everywhere-src-5.12.4/src/network/access/qhttpnetworkreply.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/access/qhttpnetworkreply.cpp 2019-06-28 21:33:14.819618056 +0200 @@ -444,6 +444,9 @@ QAuthenticatorPrivate::Method QHttpNetwo } else if (method < QAuthenticatorPrivate::DigestMd5 && line.startsWith("digest")) { @@ -49,9 +49,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/access/qhttpnetworkreply.cpp } } return method; -diff -rupN qtbase-everywhere-src-5.12.3/src/network/configure.json qtbase-everywhere-src-5.12.3-new/src/network/configure.json ---- qtbase-everywhere-src-5.12.3/src/network/configure.json 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/configure.json 2019-04-17 14:04:17.822525888 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/network/configure.json qtbase-everywhere-src-5.12.4-new/src/network/configure.json +--- qtbase-everywhere-src-5.12.4/src/network/configure.json 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/configure.json 2019-06-28 21:33:14.819618056 +0200 @@ -184,6 +184,15 @@ ] }, @@ -99,10 +99,10 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/configure.json qtbase-everyw ] } ] -diff -rupN qtbase-everywhere-src-5.12.3/src/network/kernel/kernel.pri qtbase-everywhere-src-5.12.3-new/src/network/kernel/kernel.pri ---- qtbase-everywhere-src-5.12.3/src/network/kernel/kernel.pri 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/kernel/kernel.pri 2019-04-17 14:04:17.822525888 +0200 -@@ -68,6 +68,8 @@ mac { +diff -rupN qtbase-everywhere-src-5.12.4/src/network/kernel/kernel.pri qtbase-everywhere-src-5.12.4-new/src/network/kernel/kernel.pri +--- qtbase-everywhere-src-5.12.4/src/network/kernel/kernel.pri 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/kernel/kernel.pri 2019-06-28 21:33:14.819618056 +0200 +@@ -71,6 +71,8 @@ mac { !uikit: LIBS_PRIVATE += -framework CoreServices -framework SystemConfiguration } @@ -111,9 +111,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/kernel/kernel.pri qtbase-eve uikit:HEADERS += kernel/qnetworkinterface_uikit_p.h osx:SOURCES += kernel/qnetworkproxy_mac.cpp else:win32:!winrt: SOURCES += kernel/qnetworkproxy_win.cpp -diff -rupN qtbase-everywhere-src-5.12.3/src/network/kernel/qauthenticator.cpp qtbase-everywhere-src-5.12.3-new/src/network/kernel/qauthenticator.cpp ---- qtbase-everywhere-src-5.12.3/src/network/kernel/qauthenticator.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/kernel/qauthenticator.cpp 2019-04-17 14:04:17.823525884 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/network/kernel/qauthenticator.cpp qtbase-everywhere-src-5.12.4-new/src/network/kernel/qauthenticator.cpp +--- qtbase-everywhere-src-5.12.4/src/network/kernel/qauthenticator.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/kernel/qauthenticator.cpp 2019-06-28 21:33:14.819618056 +0200 @@ -54,20 +54,29 @@ #include #include @@ -703,9 +703,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/kernel/qauthenticator.cpp qt +#endif // gssapi QT_END_NAMESPACE -diff -rupN qtbase-everywhere-src-5.12.3/src/network/kernel/qauthenticator_p.h qtbase-everywhere-src-5.12.3-new/src/network/kernel/qauthenticator_p.h ---- qtbase-everywhere-src-5.12.3/src/network/kernel/qauthenticator_p.h 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/kernel/qauthenticator_p.h 2019-04-17 14:04:17.823525884 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/network/kernel/qauthenticator_p.h qtbase-everywhere-src-5.12.4-new/src/network/kernel/qauthenticator_p.h +--- qtbase-everywhere-src-5.12.4/src/network/kernel/qauthenticator_p.h 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/kernel/qauthenticator_p.h 2019-06-28 21:33:14.820618196 +0200 @@ -54,6 +54,7 @@ #include #include @@ -758,9 +758,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/kernel/qauthenticator_p.h qt inline static QAuthenticatorPrivate *getPrivate(QAuthenticator &auth) { return auth.d; } inline static const QAuthenticatorPrivate *getPrivate(const QAuthenticator &auth) { return auth.d; } -diff -rupN qtbase-everywhere-src-5.12.3/src/network/socket/qhttpsocketengine.cpp qtbase-everywhere-src-5.12.3-new/src/network/socket/qhttpsocketengine.cpp ---- qtbase-everywhere-src-5.12.3/src/network/socket/qhttpsocketengine.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/network/socket/qhttpsocketengine.cpp 2019-04-17 14:04:17.823525884 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/network/socket/qhttpsocketengine.cpp qtbase-everywhere-src-5.12.4-new/src/network/socket/qhttpsocketengine.cpp +--- qtbase-everywhere-src-5.12.4/src/network/socket/qhttpsocketengine.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/network/socket/qhttpsocketengine.cpp 2019-06-28 21:33:14.820618196 +0200 @@ -524,7 +524,7 @@ void QHttpSocketEngine::slotSocketConnec //qDebug() << "slotSocketConnected: priv=" << priv << (priv ? (int)priv->method : -1); if (priv && priv->method != QAuthenticatorPrivate::None) { @@ -770,9 +770,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/network/socket/qhttpsocketengine.cpp data += "\r\n"; } data += "\r\n"; -diff -rupN qtbase-everywhere-src-5.12.3/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp qtbase-everywhere-src-5.12.3-new/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp ---- qtbase-everywhere-src-5.12.3/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp 2019-04-17 14:04:17.824525880 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp qtbase-everywhere-src-5.12.4-new/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp +--- qtbase-everywhere-src-5.12.4/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/tests/auto/network/kernel/qauthenticator/tst_qauthenticator.cpp 2019-06-28 21:33:14.820618196 +0200 @@ -93,7 +93,7 @@ void tst_QAuthenticator::basicAuth() QCOMPARE(priv->phase, QAuthenticatorPrivate::Start); diff --git a/mingw-qt5-qtbase.spec b/mingw-qt5-qtbase.spec index 369f350..71f1e11 100644 --- a/mingw-qt5-qtbase.spec +++ b/mingw-qt5-qtbase.spec @@ -24,8 +24,8 @@ %global release_version %(echo %{version} | awk -F. '{print $1"."$2}') Name: mingw-qt5-qtbase -Version: 5.12.3 -Release: 2%{?pre:.%pre}%{?dist} +Version: 5.12.4 +Release: 1%{?pre:.%pre}%{?dist} Summary: Qt5 for Windows - QtBase component # See LGPL_EXCEPTIONS.txt, for exception details @@ -83,6 +83,9 @@ Patch12: qt5-qtbase-static-linking.patch # Fix installing pkg-config files (fixes silent errors resulting in empty pkg-config files) Patch13: qt5-qtbase-fix-installing-pc-files.patch +# Fix shared module build wanting to link against static libraries of other modules +Patch14: qt5-qtbase-fix-module-lib.patch + # Backport proposed SSPI/Negotiate authentication support # https://codereview.qt-project.org/#/c/234387/ Patch100: 0001-Add-support-for-SPNEGO-Negotiate-authentication.patch @@ -409,8 +412,6 @@ make install -C ../build_%{name}_shared_win64 INSTALL_ROOT=%{buildroot} # Drop unneeded files find %{buildroot} -name '*.prl' -delete find %{buildroot} -name '*.la' -delete -rm -rf %{buildroot}%{_prefix}/%{mingw32_target}/lib/pkgconfig -rm -rf %{buildroot}%{_prefix}/%{mingw64_target}/lib/pkgconfig rm -f %{buildroot}%{_prefix}/%{mingw32_target}/lib/libQt5Bootstrap.a rm -f %{buildroot}%{_prefix}/%{mingw32_target}/lib/libQt5BootstrapDBus.a @@ -728,6 +729,9 @@ ln -s %{mingw64_target}-qmake-qt5 %{buildroot}%{_bindir}/mingw64-qmake-qt5 %changelog +* Tue Jul 16 2019 Sandro Mani - 5.12.4-1 +- Update to 5.12.4 + * Wed May 01 2019 Sandro Mani - 5.12.3-2 - Own %%{mingw32,64_libdir}/qt5/mkspecs/features diff --git a/qt5-qtbase-build-tools-rpath.patch b/qt5-qtbase-build-tools-rpath.patch index 18cb964..6e607d7 100644 --- a/qt5-qtbase-build-tools-rpath.patch +++ b/qt5-qtbase-build-tools-rpath.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/qt_app.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/qt_app.prf 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/qt_app.prf 2019-04-17 14:04:07.649569099 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/qt_app.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt_app.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/qt_app.prf 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt_app.prf 2019-06-28 21:33:07.448585717 +0200 @@ -21,6 +21,7 @@ isEmpty(QMAKE_TARGET_DESCRIPTION): \ isEmpty(QMAKE_INFO_PLIST): CONFIG -= app_bundle diff --git a/qt5-qtbase-cmake-macros.patch b/qt5-qtbase-cmake-macros.patch index 216ef7a..cee4439 100644 --- a/qt5-qtbase-cmake-macros.patch +++ b/qt5-qtbase-cmake-macros.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/src/corelib/Qt5CoreMacros.cmake qtbase-everywhere-src-5.12.3-new/src/corelib/Qt5CoreMacros.cmake ---- qtbase-everywhere-src-5.12.3/src/corelib/Qt5CoreMacros.cmake 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/corelib/Qt5CoreMacros.cmake 2019-04-17 14:04:09.898559032 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/corelib/Qt5CoreMacros.cmake qtbase-everywhere-src-5.12.4-new/src/corelib/Qt5CoreMacros.cmake +--- qtbase-everywhere-src-5.12.4/src/corelib/Qt5CoreMacros.cmake 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/corelib/Qt5CoreMacros.cmake 2019-06-28 21:33:09.082813735 +0200 @@ -132,8 +132,9 @@ function(QT5_CREATE_MOC_COMMAND infile o endif() @@ -34,9 +34,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/corelib/Qt5CoreMacros.cmake qtbase-e ARGS ${rcc_options} --name ${outfilename} --output ${outfile} ${infile} MAIN_DEPENDENCY ${infile} DEPENDS ${_rc_depends} "${_out_depends}" VERBATIM) -diff -rupN qtbase-everywhere-src-5.12.3/src/widgets/Qt5WidgetsMacros.cmake qtbase-everywhere-src-5.12.3-new/src/widgets/Qt5WidgetsMacros.cmake ---- qtbase-everywhere-src-5.12.3/src/widgets/Qt5WidgetsMacros.cmake 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/widgets/Qt5WidgetsMacros.cmake 2019-04-17 14:04:09.898559032 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/widgets/Qt5WidgetsMacros.cmake qtbase-everywhere-src-5.12.4-new/src/widgets/Qt5WidgetsMacros.cmake +--- qtbase-everywhere-src-5.12.4/src/widgets/Qt5WidgetsMacros.cmake 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/widgets/Qt5WidgetsMacros.cmake 2019-06-28 21:33:09.082813735 +0200 @@ -55,8 +55,9 @@ function(QT5_WRAP_UI outfiles ) get_filename_component(outfile ${it} NAME_WE) get_filename_component(infile ${it} ABSOLUTE) diff --git a/qt5-qtbase-dynamic-hostlib.patch b/qt5-qtbase-dynamic-hostlib.patch index dff6683..37de149 100644 --- a/qt5-qtbase-dynamic-hostlib.patch +++ b/qt5-qtbase-dynamic-hostlib.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/qt_module.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/qt_module.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/qt_module.prf 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/qt_module.prf 2019-04-17 14:04:06.593573925 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/qt_module.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt_module.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/qt_module.prf 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt_module.prf 2019-06-28 21:33:06.634472301 +0200 @@ -25,7 +25,7 @@ requires(!$$skip) # Compile as shared/DLL or static according to the option given to configure @@ -10,9 +10,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/qt_module.prf qtbase-ev host_build { QT -= gui # no host module will ever use gui -diff -rupN qtbase-everywhere-src-5.12.3/src/tools/bootstrap-dbus/bootstrap-dbus.pro qtbase-everywhere-src-5.12.3-new/src/tools/bootstrap-dbus/bootstrap-dbus.pro ---- qtbase-everywhere-src-5.12.3/src/tools/bootstrap-dbus/bootstrap-dbus.pro 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/tools/bootstrap-dbus/bootstrap-dbus.pro 2019-04-17 14:04:06.594573921 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/tools/bootstrap-dbus/bootstrap-dbus.pro qtbase-everywhere-src-5.12.4-new/src/tools/bootstrap-dbus/bootstrap-dbus.pro +--- qtbase-everywhere-src-5.12.4/src/tools/bootstrap-dbus/bootstrap-dbus.pro 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/tools/bootstrap-dbus/bootstrap-dbus.pro 2019-06-28 21:33:06.635472440 +0200 @@ -27,4 +27,4 @@ SOURCES = \ load(qt_module) diff --git a/qt5-qtbase-external-angle.patch b/qt5-qtbase-external-angle.patch index 20bf006..acfe8fb 100644 --- a/qt5-qtbase-external-angle.patch +++ b/qt5-qtbase-external-angle.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/src/gui/gui.pro qtbase-everywhere-src-5.12.3-new/src/gui/gui.pro ---- qtbase-everywhere-src-5.12.3/src/gui/gui.pro 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/gui/gui.pro 2019-04-17 14:04:04.208585060 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/gui/gui.pro qtbase-everywhere-src-5.12.4-new/src/gui/gui.pro +--- qtbase-everywhere-src-5.12.4/src/gui/gui.pro 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/gui/gui.pro 2019-06-28 21:33:04.989243460 +0200 @@ -18,12 +18,6 @@ MODULE_PLUGIN_TYPES = \ imageformats \ egldeviceintegrations @@ -23,9 +23,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/gui/gui.pro qtbase-everywhere-src-5. CONFIG += simd optimize_full include(accessible/accessible.pri) -diff -rupN qtbase-everywhere-src-5.12.3/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.3-new/src/gui/Qt5GuiConfigExtras.cmake.in ---- qtbase-everywhere-src-5.12.3/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-17 14:04:04.209585056 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/gui/Qt5GuiConfigExtras.cmake.in qtbase-everywhere-src-5.12.4-new/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.4/src/gui/Qt5GuiConfigExtras.cmake.in 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/gui/Qt5GuiConfigExtras.cmake.in 2019-06-28 21:33:04.990243599 +0200 @@ -2,9 +2,9 @@ !!IF !isEmpty(CMAKE_ANGLE_EGL_DLL_RELEASE) @@ -38,9 +38,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/gui/Qt5GuiConfigExtras.cmake.in qtba !!ENDIF _qt5_Gui_check_file_exists(${Qt5Gui_EGL_INCLUDE_DIRS}) -diff -rupN qtbase-everywhere-src-5.12.3/src/opengl/opengl.pro qtbase-everywhere-src-5.12.3-new/src/opengl/opengl.pro ---- qtbase-everywhere-src-5.12.3/src/opengl/opengl.pro 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/opengl/opengl.pro 2019-04-17 14:04:04.209585056 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/opengl/opengl.pro qtbase-everywhere-src-5.12.4-new/src/opengl/opengl.pro +--- qtbase-everywhere-src-5.12.4/src/opengl/opengl.pro 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/opengl/opengl.pro 2019-06-28 21:33:04.990243599 +0200 @@ -10,6 +10,7 @@ QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf qtConfig(opengl): CONFIG += opengl @@ -49,9 +49,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/opengl/opengl.pro qtbase-everywhere- HEADERS += qgl.h \ qgl_p.h \ -diff -rupN qtbase-everywhere-src-5.12.3/src/plugins/platforms/windows/windows.pri qtbase-everywhere-src-5.12.3-new/src/plugins/platforms/windows/windows.pri ---- qtbase-everywhere-src-5.12.3/src/plugins/platforms/windows/windows.pri 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/plugins/platforms/windows/windows.pri 2019-04-17 14:04:04.210585051 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/plugins/platforms/windows/windows.pri qtbase-everywhere-src-5.12.4-new/src/plugins/platforms/windows/windows.pri +--- qtbase-everywhere-src-5.12.4/src/plugins/platforms/windows/windows.pri 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/plugins/platforms/windows/windows.pri 2019-06-28 21:33:04.990243599 +0200 @@ -4,6 +4,7 @@ LIBS += -lole32 -luser32 -lwinspool -lim QT_FOR_CONFIG += gui @@ -60,9 +60,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/plugins/platforms/windows/windows.pr mingw: LIBS *= -luuid # For the dialog helpers: -diff -rupN qtbase-everywhere-src-5.12.3/src/src.pro qtbase-everywhere-src-5.12.3-new/src/src.pro ---- qtbase-everywhere-src-5.12.3/src/src.pro 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/src.pro 2019-04-17 14:04:04.210585051 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/src.pro qtbase-everywhere-src-5.12.4-new/src/src.pro +--- qtbase-everywhere-src-5.12.4/src/src.pro 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/src.pro 2019-06-28 21:33:04.990243599 +0200 @@ -199,10 +199,6 @@ qtConfig(gui) { SUBDIRS += src_3rdparty_harfbuzzng src_gui.depends += src_3rdparty_harfbuzzng diff --git a/qt5-qtbase-fix-installing-pc-files.patch b/qt5-qtbase-fix-installing-pc-files.patch index 4d4c07a..e07c420 100644 --- a/qt5-qtbase-fix-installing-pc-files.patch +++ b/qt5-qtbase-fix-installing-pc-files.patch @@ -1,7 +1,7 @@ -diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/makefile.cpp qtbase-everywhere-src-5.12.3-new/qmake/generators/makefile.cpp ---- qtbase-everywhere-src-5.12.3/qmake/generators/makefile.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/qmake/generators/makefile.cpp 2019-04-17 14:04:16.810529922 +0200 -@@ -3230,7 +3230,7 @@ MakefileGenerator::openOutput(QFile &fil +diff -rupN qtbase-everywhere-src-5.12.4/qmake/generators/makefile.cpp qtbase-everywhere-src-5.12.4-new/qmake/generators/makefile.cpp +--- qtbase-everywhere-src-5.12.4/qmake/generators/makefile.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/qmake/generators/makefile.cpp 2019-06-28 21:33:13.991501578 +0200 +@@ -3224,7 +3224,7 @@ MakefileGenerator::openOutput(QFile &fil } QString @@ -10,7 +10,7 @@ diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/makefile.cpp qtbase-eve { QString ret = project->first("QMAKE_PKGCONFIG_FILE").toQString(); if (ret.isEmpty()) { -@@ -3255,7 +3255,11 @@ MakefileGenerator::pkgConfigFileName(boo +@@ -3249,7 +3249,11 @@ MakefileGenerator::pkgConfigFileName(boo if(fixify) { if(QDir::isRelativePath(ret) && !project->isEmpty("DESTDIR")) ret.prepend(project->first("DESTDIR").toQString()); @@ -23,9 +23,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/makefile.cpp qtbase-eve } return ret; } -diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/makefile.h qtbase-everywhere-src-5.12.3-new/qmake/generators/makefile.h ---- qtbase-everywhere-src-5.12.3/qmake/generators/makefile.h 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/qmake/generators/makefile.h 2019-04-17 14:04:16.810529922 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/qmake/generators/makefile.h qtbase-everywhere-src-5.12.4-new/qmake/generators/makefile.h +--- qtbase-everywhere-src-5.12.4/qmake/generators/makefile.h 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/qmake/generators/makefile.h 2019-06-28 21:33:13.991501578 +0200 @@ -92,7 +92,7 @@ protected: virtual void writeDefaultVariables(QTextStream &t); @@ -35,9 +35,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/makefile.h qtbase-every QString pkgConfigFixPath(QString) const; void writePkgConfigFile(); // for pkg-config -diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.12.3-new/qmake/generators/win32/winmakefile.cpp ---- qtbase-everywhere-src-5.12.3/qmake/generators/win32/winmakefile.cpp 2019-04-17 14:04:09.894559049 +0200 -+++ qtbase-everywhere-src-5.12.3-new/qmake/generators/win32/winmakefile.cpp 2019-04-17 14:04:16.810529922 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.12.4-new/qmake/generators/win32/winmakefile.cpp +--- qtbase-everywhere-src-5.12.4/qmake/generators/win32/winmakefile.cpp 2019-06-28 21:33:09.080813455 +0200 ++++ qtbase-everywhere-src-5.12.4-new/qmake/generators/win32/winmakefile.cpp 2019-06-28 21:33:13.991501578 +0200 @@ -760,7 +760,7 @@ QString Win32MakefileGenerator::defaultI } if(!ret.isEmpty()) diff --git a/qt5-qtbase-fix-module-lib.patch b/qt5-qtbase-fix-module-lib.patch new file mode 100644 index 0000000..37cb062 --- /dev/null +++ b/qt5-qtbase-fix-module-lib.patch @@ -0,0 +1,12 @@ +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/qt.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/qt.prf 2019-06-28 21:33:13.989501297 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt.prf 2019-07-16 17:51:22.113166487 +0200 +@@ -213,7 +213,7 @@ for(ever) { + LIBS$$var_sfx += -framework $$framework + } else { + lib = $$MODULE_MODULE$$qtPlatformTargetSuffix() +- win32|contains(MODULE_CONFIG, staticlib) { ++ contains(MODULE_CONFIG, staticlib) { + lib = $$MODULE_LIBS/$$QMAKE_PREFIX_STATICLIB$${lib}.$$QMAKE_EXTENSION_STATICLIB + PRE_TARGETDEPS += $$lib + } else { diff --git a/qt5-qtbase-iconv.patch b/qt5-qtbase-iconv.patch index 7b5a5c2..bbae776 100644 --- a/qt5-qtbase-iconv.patch +++ b/qt5-qtbase-iconv.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/src/corelib/configure.json qtbase-everywhere-src-5.12.3-new/src/corelib/configure.json ---- qtbase-everywhere-src-5.12.3/src/corelib/configure.json 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/corelib/configure.json 2019-04-17 14:04:13.583543176 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/corelib/configure.json qtbase-everywhere-src-5.12.4-new/src/corelib/configure.json +--- qtbase-everywhere-src-5.12.4/src/corelib/configure.json 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/corelib/configure.json 2019-06-28 21:33:11.524155313 +0200 @@ -633,7 +633,7 @@ "label": "GNU iconv", "enable": "input.iconv == 'gnu'", diff --git a/qt5-qtbase-importlib-ext.patch b/qt5-qtbase-importlib-ext.patch index 863a956..b0a5bd6 100644 --- a/qt5-qtbase-importlib-ext.patch +++ b/qt5-qtbase-importlib-ext.patch @@ -1,7 +1,7 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/create_cmake.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/create_cmake.prf 2019-04-17 14:04:06.591573934 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/create_cmake.prf 2019-04-17 14:04:08.581564894 +0200 -@@ -240,8 +240,9 @@ mac { +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/create_cmake.prf 2019-06-28 21:33:06.632472022 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/create_cmake.prf 2019-06-28 21:33:08.266699807 +0200 +@@ -245,8 +245,9 @@ mac { CMAKE_PRL_FILE_LOCATION_DEBUG = lib$${CMAKE_QT_STEM}d.prl CMAKE_PRL_FILE_LOCATION_RELEASE = lib$${CMAKE_QT_STEM}.prl } else { @@ -13,9 +13,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/create_cmake.prf qtbase } } else { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = qtmain$${QT_LIBINFIX}d.lib -diff -rupN qtbase-everywhere-src-5.12.3/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.12.3-new/qmake/generators/win32/winmakefile.cpp ---- qtbase-everywhere-src-5.12.3/qmake/generators/win32/winmakefile.cpp 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/qmake/generators/win32/winmakefile.cpp 2019-04-17 14:04:08.581564894 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/qmake/generators/win32/winmakefile.cpp qtbase-everywhere-src-5.12.4-new/qmake/generators/win32/winmakefile.cpp +--- qtbase-everywhere-src-5.12.4/qmake/generators/win32/winmakefile.cpp 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/qmake/generators/win32/winmakefile.cpp 2019-06-28 21:33:08.266699807 +0200 @@ -80,9 +80,13 @@ Win32MakefileGenerator::parseLibFlag(con bool Win32MakefileGenerator::findLibraries(bool linkPrl, bool mergeLflags) diff --git a/qt5-qtbase-mingw-profile.patch b/qt5-qtbase-mingw-profile.patch index d116bd0..5b6bf0b 100644 --- a/qt5-qtbase-mingw-profile.patch +++ b/qt5-qtbase-mingw-profile.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/mingw-w64-g++/qmake.conf qtbase-everywhere-src-5.12.3-new/mkspecs/mingw-w64-g++/qmake.conf ---- qtbase-everywhere-src-5.12.3/mkspecs/mingw-w64-g++/qmake.conf 1970-01-01 01:00:00.000000000 +0100 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/mingw-w64-g++/qmake.conf 2019-04-17 14:04:02.842591587 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/mingw-w64-g++/qmake.conf qtbase-everywhere-src-5.12.4-new/mkspecs/mingw-w64-g++/qmake.conf +--- qtbase-everywhere-src-5.12.4/mkspecs/mingw-w64-g++/qmake.conf 1970-01-01 01:00:00.000000000 +0100 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/mingw-w64-g++/qmake.conf 2019-06-28 21:33:04.144126129 +0200 @@ -0,0 +1,126 @@ +# +# qmake configuration for i686-w64-mingw32-g++ and x86_64-w64-mingw32-g++ @@ -128,9 +128,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/mingw-w64-g++/qmake.conf qtbase- +QMAKE_LIBS_VULKAN = + +load(qt_config) -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/mingw-w64-g++/qplatformdefs.h qtbase-everywhere-src-5.12.3-new/mkspecs/mingw-w64-g++/qplatformdefs.h ---- qtbase-everywhere-src-5.12.3/mkspecs/mingw-w64-g++/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/mingw-w64-g++/qplatformdefs.h 2019-04-17 14:04:02.843591582 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/mingw-w64-g++/qplatformdefs.h qtbase-everywhere-src-5.12.4-new/mkspecs/mingw-w64-g++/qplatformdefs.h +--- qtbase-everywhere-src-5.12.4/mkspecs/mingw-w64-g++/qplatformdefs.h 1970-01-01 01:00:00.000000000 +0100 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/mingw-w64-g++/qplatformdefs.h 2019-06-28 21:33:04.145126267 +0200 @@ -0,0 +1,155 @@ +/**************************************************************************** +** diff --git a/qt5-qtbase-pkgconfig.patch b/qt5-qtbase-pkgconfig.patch index f06a4c7..03cabfe 100644 --- a/qt5-qtbase-pkgconfig.patch +++ b/qt5-qtbase-pkgconfig.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/configure.pri qtbase-everywhere-src-5.12.3-new/configure.pri ---- qtbase-everywhere-src-5.12.3/configure.pri 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/configure.pri 2019-04-17 14:04:12.540547586 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/configure.pri qtbase-everywhere-src-5.12.4-new/configure.pri +--- qtbase-everywhere-src-5.12.4/configure.pri 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/configure.pri 2019-06-28 21:33:10.707040869 +0200 @@ -328,8 +328,11 @@ defineTest(qtConfTest_detectPkgConfig) { qtLog("Found pkg-config from path: $$pkgConfig") } diff --git a/qt5-qtbase-python3.patch b/qt5-qtbase-python3.patch index 277cc5a..e8bb173 100644 --- a/qt5-qtbase-python3.patch +++ b/qt5-qtbase-python3.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/uikit/devices.py qtbase-everywhere-src-5.12.3-new/mkspecs/features/uikit/devices.py ---- qtbase-everywhere-src-5.12.3/mkspecs/features/uikit/devices.py 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/uikit/devices.py 2019-04-17 14:04:11.175553449 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/uikit/devices.py qtbase-everywhere-src-5.12.4-new/mkspecs/features/uikit/devices.py +--- qtbase-everywhere-src-5.12.4/mkspecs/features/uikit/devices.py 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/uikit/devices.py 2019-06-28 21:33:09.893927098 +0200 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 diff --git a/qt5-qtbase-qt5main.patch b/qt5-qtbase-qt5main.patch index af2b87d..c04bc9f 100644 --- a/qt5-qtbase-qt5main.patch +++ b/qt5-qtbase-qt5main.patch @@ -1,7 +1,7 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/create_cmake.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/create_cmake.prf 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/create_cmake.prf 2019-04-17 14:04:05.269580066 +0200 -@@ -229,8 +229,8 @@ mac { +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/create_cmake.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/create_cmake.prf 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/create_cmake.prf 2019-06-28 21:33:05.817358584 +0200 +@@ -234,8 +234,8 @@ mac { CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll mingw { @@ -12,21 +12,21 @@ diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/create_cmake.prf qtbase !isEmpty(CMAKE_STATIC_TYPE) { CMAKE_STATIC_WINDOWS_BUILD = "true" -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/win32/windows.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/win32/windows.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/win32/windows.prf 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/win32/windows.prf 2019-04-17 14:04:05.269580066 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/win32/windows.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/win32/windows.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/win32/windows.prf 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/win32/windows.prf 2019-06-28 21:33:05.817358584 +0200 @@ -5,7 +5,7 @@ contains(TEMPLATE, ".*app") { mingw:DEFINES += QT_NEEDS_QMAIN qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { - isEqual(entryLib, -lqtmain) { -+ isEqual(entryLib, -lqt5main): { - !contains(QMAKE_DEFAULT_LIBDIRS, $$QT.core.libs): \ - QMAKE_LIBS += -L$$QT.core.libs - CONFIG(debug, debug|release): QMAKE_LIBS += $${entryLib}$${QT_LIBINFIX}d -diff -rupN qtbase-everywhere-src-5.12.3/src/winmain/winmain.pro qtbase-everywhere-src-5.12.3-new/src/winmain/winmain.pro ---- qtbase-everywhere-src-5.12.3/src/winmain/winmain.pro 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/winmain/winmain.pro 2019-04-17 14:04:05.269580066 +0200 ++ isEqual(entryLib, -lqt5main) { + lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB + PRE_TARGETDEPS += $$lib + QMAKE_LIBS += $$lib +diff -rupN qtbase-everywhere-src-5.12.4/src/winmain/winmain.pro qtbase-everywhere-src-5.12.4-new/src/winmain/winmain.pro +--- qtbase-everywhere-src-5.12.4/src/winmain/winmain.pro 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/winmain/winmain.pro 2019-06-28 21:33:05.817358584 +0200 @@ -2,7 +2,7 @@ !win32:error("$$_FILE_ is intended only for Windows!") diff --git a/qt5-qtbase-static-linking.patch b/qt5-qtbase-static-linking.patch index d128a78..04fb14a 100644 --- a/qt5-qtbase-static-linking.patch +++ b/qt5-qtbase-static-linking.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/default_post.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/default_post.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/default_post.prf 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/default_post.prf 2019-04-17 14:04:15.767534141 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/default_post.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/default_post.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/default_post.prf 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/default_post.prf 2019-06-28 21:33:13.172386509 +0200 @@ -1,5 +1,14 @@ # This file is loaded by qmake right after loading the actual project file. @@ -36,10 +36,10 @@ diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/default_post.prf qtbase # Check if we should disable compiler extensions or not isEmpty(QMAKE_CXXFLAGS_GNU$$cxxstd) { -diff -rupN qtbase-everywhere-src-5.12.3/mkspecs/features/qt.prf qtbase-everywhere-src-5.12.3-new/mkspecs/features/qt.prf ---- qtbase-everywhere-src-5.12.3/mkspecs/features/qt.prf 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/mkspecs/features/qt.prf 2019-04-17 14:04:15.767534141 +0200 -@@ -238,6 +238,21 @@ for(ever) { +diff -rupN qtbase-everywhere-src-5.12.4/mkspecs/features/qt.prf qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt.prf +--- qtbase-everywhere-src-5.12.4/mkspecs/features/qt.prf 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/mkspecs/features/qt.prf 2019-06-28 21:33:13.172386509 +0200 +@@ -232,6 +232,21 @@ for(ever) { !isEmpty(MODULE_WINRT_CAPABILITIES_DEVICE): \ WINRT_MANIFEST.capabilities_device_default += $$MODULE_WINRT_CAPABILITIES_DEVICE } diff --git a/qt5-qtbase-zlib-cross.patch b/qt5-qtbase-zlib-cross.patch index ad1055c..77946b9 100644 --- a/qt5-qtbase-zlib-cross.patch +++ b/qt5-qtbase-zlib-cross.patch @@ -1,6 +1,6 @@ -diff -rupN qtbase-everywhere-src-5.12.3/src/src.pro qtbase-everywhere-src-5.12.3-new/src/src.pro ---- qtbase-everywhere-src-5.12.3/src/src.pro 2019-04-17 14:04:05.267580075 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/src.pro 2019-04-17 14:04:14.734538380 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/src.pro qtbase-everywhere-src-5.12.4-new/src/src.pro +--- qtbase-everywhere-src-5.12.4/src/src.pro 2019-06-28 21:33:05.815358307 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/src.pro 2019-06-28 21:33:12.349270994 +0200 @@ -148,7 +148,7 @@ src_plugins.target = sub-plugins src_android.subdir = $$PWD/android @@ -10,9 +10,9 @@ diff -rupN qtbase-everywhere-src-5.12.3/src/src.pro qtbase-everywhere-src-5.12.3 SUBDIRS += src_qtzlib !qtConfig(system-zlib) { src_3rdparty_libpng.depends += src_corelib -diff -rupN qtbase-everywhere-src-5.12.3/src/tools/bootstrap/bootstrap.pro qtbase-everywhere-src-5.12.3-new/src/tools/bootstrap/bootstrap.pro ---- qtbase-everywhere-src-5.12.3/src/tools/bootstrap/bootstrap.pro 2019-04-09 11:51:26.000000000 +0200 -+++ qtbase-everywhere-src-5.12.3-new/src/tools/bootstrap/bootstrap.pro 2019-04-17 14:04:14.734538380 +0200 +diff -rupN qtbase-everywhere-src-5.12.4/src/tools/bootstrap/bootstrap.pro qtbase-everywhere-src-5.12.4-new/src/tools/bootstrap/bootstrap.pro +--- qtbase-everywhere-src-5.12.4/src/tools/bootstrap/bootstrap.pro 2019-06-12 22:59:14.000000000 +0200 ++++ qtbase-everywhere-src-5.12.4-new/src/tools/bootstrap/bootstrap.pro 2019-06-28 21:33:12.349270994 +0200 @@ -135,7 +135,9 @@ macx { ../../corelib/io/qstandardpaths_win.cpp } diff --git a/sources b/sources index fa2cd2e..b8d8876 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (qtbase-everywhere-src-5.12.3.tar.xz) = 1dab927573eb22b1ae772de3a418f7d3999ea78d6e667a7f2494390dd1f0981ea93f4f892cb6e124ac18812c780ee71da3021b485c61eaf1ef2234a5c12b7fe2 +SHA512 (qtbase-everywhere-src-5.12.4.tar.xz) = 28b029a0d3621477f625d474b8bc38ddcc7173df6adb274b438e290b6c50bd0891e5b62c04b566a281781acee3a353a6a3b0bc88228e996994f92900448d7946