Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2018-12-14 20:50:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Fri Dec 14 20:50:53 2018 rev:90 rq:656557 version:5.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2018-10-15 09:17:51.592797746 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.28833/libqt5-qtbase.changes 2018-12-14 20:54:47.252920143 +0100 @@ -1,0 +2,82 @@ +Thu Dec 6 13:35:10 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0: + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.12.0/?h=v5.12.0 + +------------------------------------------------------------------- +Mon Dec 3 08:16:17 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-rc2: + * New bugfix release + * Only important bugfixes +- Changelog for Qt 5.12.0: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.12.0/?h=5.12.0 +- Remove patches, now upstream: + * 0001-Fix-build-with-OpenSSL-1.1.0.patch + +------------------------------------------------------------------- +Tue Nov 27 08:12:10 UTC 2018 - Fabian Vogt <fab...@ritter-vogt.de> + +- Remove uikit qmake spec to avoid automatic dep on python2 + +------------------------------------------------------------------- +Thu Nov 22 13:38:47 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-rc: + * New bugfix release + * No changelog available +- Add patch to fix build with OpenSSL 1.1.0: + * 0001-Fix-build-with-OpenSSL-1.1.0.patch + +------------------------------------------------------------------- +Thu Nov 8 15:24:22 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-beta4: + * New bugfix release + * No changelog available +- Remove patches, now upstream: + * 0001-xcb-Don-t-get-initial-screen-rotation.patch + +------------------------------------------------------------------- +Fri Oct 26 07:20:17 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-beta3: + * New bugfix release + * No changelog available +- Refresh 0001-Sanitize-QXcbScreen-s-pixelDensity-values.patch + +------------------------------------------------------------------- +Wed Oct 17 08:22:23 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-beta2: + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Fri Oct 5 18:54:41 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-beta1: + * New bugfix release + * No changelog available +- Remove patches, now upstream: + * Export-qt_open64-from-QtCore.patch + +------------------------------------------------------------------- +Tue Oct 2 07:33:10 UTC 2018 - fab...@ritter-vogt.de + +- Update to 5.12.0-alpha: + * New feature release + * For more details please see: + * http://wiki.qt.io/New_Features_in_Qt_5.12 +- Refresh patches: + * 0001-Add-remote-print-queue-support.patch + * 0001-xcb-Don-t-get-initial-screen-rotation.patch +- Remove patches, now upstream: + * 0001-Hack-together-a-way-to-get-fallback-from-xcb-working.patch + * 0001-Unix-print-dialog-Properly-initialize-duplex.patch +- Rename -platformtheme-flatpak to platformtheme-xdgdesktopportal +- Adjust libQt5PrintSupport-private-headers-devel Requires + +------------------------------------------------------------------- Old: ---- 0001-Hack-together-a-way-to-get-fallback-from-xcb-working.patch 0001-Unix-print-dialog-Properly-initialize-duplex.patch 0001-xcb-Don-t-get-initial-screen-rotation.patch Export-qt_open64-from-QtCore.patch qtbase-everywhere-src-5.11.2.tar.xz New: ---- qtbase-everywhere-src-5.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.AOzjJv/_old 2018-12-14 20:54:58.904905683 +0100 +++ /var/tmp/diff_new_pack.AOzjJv/_new 2018-12-14 20:54:58.912905673 +0100 @@ -36,17 +36,17 @@ %endif Name: libqt5-qtbase -Version: 5.11.2 +Version: 5.12.0 Release: 0 Summary: C++ Program Library, Core Components License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-only Group: System/Libraries Url: https://www.qt.io %define base_name libqt5 -%define real_version 5.11.2 -%define so_version 5.11.2 -%define tar_version qtbase-everywhere-src-5.11.2 -Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.12.0 +%define so_version 5.12.0 +%define tar_version qtbase-everywhere-src-5.12.0 +Source: https://download.qt.io/official_releases/qt/5.12/%{real_version}/submodules/%{tar_version}.tar.xz # to get mtime of file: Source1: libqt5-qtbase.changes Source2: macros.qt5 @@ -65,16 +65,12 @@ # PATCH-FIX-OPENSUSE Patch13: 0001-Revert-QWidgetWindow-Immediately-forward-close-event.patch # PATCH-FIX-OPENSUSE -Patch16: 0001-Hack-together-a-way-to-get-fallback-from-xcb-working.patch Patch17: 0001-Sanitize-QXcbScreen-s-pixelDensity-values.patch Patch18: 0002-xcb-Use-the-screen-s-physical-DPI-as-logical-DPI-unl.patch # PATCH-FIX-UPSTREAM Patch19: qapplication-emit-palettechanged.patch -# patches 1000- 2000 and above from upstream 5.11 branch # -Patch1000: Export-qt_open64-from-QtCore.patch -Patch1001: 0001-xcb-Don-t-get-initial-screen-rotation.patch -# patches 2000-3000 and above from upstream 5.12/dev branch # -Patch2000: 0001-Unix-print-dialog-Properly-initialize-duplex.patch +# patches 1000-2000 and above from upstream 5.12 branch # +# patches 2000-3000 and above from upstream 5.13/dev branch # BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel @@ -420,6 +416,8 @@ Requires: libQt5Gui-private-headers-devel = %{version} Requires: libQt5PrintSupport-devel = %{version} Requires: libQt5Widgets-private-headers-devel = %{version} +# Includes <cups/ppd.h> in qprint_p.h +Requires: cups-devel %description -n libQt5PrintSupport-private-headers-devel This package provides private headers of libQt5PrintSupport that are @@ -604,13 +602,15 @@ %description platformtheme-gtk3 Qt 5 plugin for better integration with gtk3-based desktop enviroments. -%package platformtheme-flatpak -Summary: Qt 5 Flatpak plugin +%package platformtheme-xdgdesktopportal +Summary: Qt 5 XDG Desktop Portal Plugin Group: Development/Libraries/C and C++ Requires: libQt5Gui5 = %{version} +Obsoletes: %{name}-platformtheme-flatpak < %{version} +Provides: %{name}-platformtheme-flatpak = %{version} -%description platformtheme-flatpak -Qt 5 plugin for integration with flatpak. +%description platformtheme-xdgdesktopportal +Qt 5 plugin for integration with flatpak and snap. %package -n libQt5Gui-devel Summary: Development files for the Qt5 GUI library @@ -943,6 +943,9 @@ # rm -fv %{buildroot}%{libqt5_libdir}/cmake/Qt5*/Q*Plugin.cmake +# This is only for Apple platforms and has a python2 dep +rm -r %{buildroot}%{libqt5_archdatadir}/mkspecs/features/uikit + mkdir -p %{buildroot}%{libqt5_plugindir}/sqldrivers # put all the binaries to %{_bindir}, add -qt5 suffix, and symlink them back to %_qt5_bindir @@ -1210,11 +1213,11 @@ %dir %{libqt5_plugindir}/platformthemes %{libqt5_plugindir}/platformthemes/libqgtk3.so -%files platformtheme-flatpak +%files platformtheme-xdgdesktopportal %defattr(-,root,root,755) %doc *.txt LICENSE.* %dir %{libqt5_plugindir}/platformthemes -%{libqt5_plugindir}/platformthemes/libqflatpak.so +%{libqt5_plugindir}/platformthemes/libqxdgdesktopportal.so %files -n libQt5Gui-devel %defattr(-,root,root,755) ++++++ 0001-Add-remote-print-queue-support.patch ++++++ --- /var/tmp/diff_new_pack.AOzjJv/_old 2018-12-14 20:54:58.944905633 +0100 +++ /var/tmp/diff_new_pack.AOzjJv/_new 2018-12-14 20:54:58.944905633 +0100 @@ -18,10 +18,10 @@ src/plugins/printsupport/cups/qppdprintdevice.cpp | 33 +++++++- 4 files changed, 160 insertions(+), 11 deletions(-) -Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintengine.cpp +Index: qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qcupsprintengine.cpp =================================================================== ---- qtbase-everywhere-src-5.11.0-beta1.orig/src/plugins/printsupport/cups/qcupsprintengine.cpp -+++ qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintengine.cpp +--- qtbase-everywhere-src-5.12.0-alpha.orig/src/plugins/printsupport/cups/qcupsprintengine.cpp ++++ qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qcupsprintengine.cpp @@ -48,6 +48,7 @@ #include <qbuffer.h> #include "private/qcups_p.h" // Only needed for PPK_CupsOptions @@ -30,7 +30,7 @@ #include <cups/cups.h> -@@ -243,8 +244,40 @@ void QCupsPrintEnginePrivate::closePrint +@@ -252,8 +253,40 @@ void QCupsPrintEnginePrivate::closePrint const auto parts = printerName.splitRef(QLatin1Char('/')); const auto printerOriginalName = parts.at(0); cups_option_t* optPtr = cupsOptStruct.size() ? &cupsOptStruct.first() : 0; @@ -72,11 +72,11 @@ QFile::remove(tempFile); } -Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintersupport.cpp +Index: qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qcupsprintersupport.cpp =================================================================== ---- qtbase-everywhere-src-5.11.0-beta1.orig/src/plugins/printsupport/cups/qcupsprintersupport.cpp -+++ qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintersupport.cpp -@@ -52,6 +52,35 @@ +--- qtbase-everywhere-src-5.12.0-alpha.orig/src/plugins/printsupport/cups/qcupsprintersupport.cpp ++++ qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qcupsprintersupport.cpp +@@ -61,6 +61,35 @@ # include <cups/language.h> #endif @@ -111,8 +111,8 @@ + QT_BEGIN_NAMESPACE - QCupsPrinterSupport::QCupsPrinterSupport() -@@ -81,17 +110,35 @@ QPrintDevice QCupsPrinterSupport::create + #if QT_CONFIG(dialogbuttonbox) +@@ -159,17 +188,35 @@ QPrintDevice QCupsPrinterSupport::create QStringList QCupsPrinterSupport::availablePrintDeviceIds() const { @@ -153,7 +153,7 @@ return list; } -@@ -99,8 +146,18 @@ QString QCupsPrinterSupport::defaultPrin +@@ -177,8 +224,18 @@ QString QCupsPrinterSupport::defaultPrin { QString printerId; cups_dest_t *dests; @@ -174,7 +174,7 @@ if (dests[i].is_default) { printerId = QString::fromLocal8Bit(dests[i].name); if (dests[i].instance) { -@@ -109,8 +166,30 @@ QString QCupsPrinterSupport::defaultPrin +@@ -187,8 +244,30 @@ QString QCupsPrinterSupport::defaultPrin } } } @@ -206,10 +206,10 @@ + + QT_END_NAMESPACE -Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintersupport_p.h +Index: qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qcupsprintersupport_p.h =================================================================== ---- qtbase-everywhere-src-5.11.0-beta1.orig/src/plugins/printsupport/cups/qcupsprintersupport_p.h -+++ qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintersupport_p.h +--- qtbase-everywhere-src-5.12.0-alpha.orig/src/plugins/printsupport/cups/qcupsprintersupport_p.h ++++ qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qcupsprintersupport_p.h @@ -56,6 +56,8 @@ #include <QtCore/qstringlist.h> @@ -234,10 +234,10 @@ }; QT_END_NAMESPACE -Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qppdprintdevice.cpp +Index: qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qppdprintdevice.cpp =================================================================== ---- qtbase-everywhere-src-5.11.0-beta1.orig/src/plugins/printsupport/cups/qppdprintdevice.cpp -+++ qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qppdprintdevice.cpp +--- qtbase-everywhere-src-5.12.0-alpha.orig/src/plugins/printsupport/cups/qppdprintdevice.cpp ++++ qtbase-everywhere-src-5.12.0-alpha/src/plugins/printsupport/cups/qppdprintdevice.cpp @@ -39,6 +39,7 @@ #include "qppdprintdevice.h" @@ -246,44 +246,42 @@ #include <QtCore/QMimeDatabase> #include <qdebug.h> -@@ -493,10 +494,38 @@ void QPpdPrintDevice::loadPrinter() - m_cupsDest = 0; - } - -+ bool enablePrinterDiscovery = qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY"); -+ - // Get the print instance and PPD file -- m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName, m_cupsInstance.isNull() ? nullptr : m_cupsInstance.constData()); -+ -+ if (!enablePrinterDiscovery) { -+ m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName, m_cupsInstance.isNull() ? nullptr : m_cupsInstance.constData()); -+ } else { -+ cups_dest_t *cupsDest = cupsGetDest( m_cupsName, -+ (m_cupsInstance.isEmpty() ? nullptr : m_cupsInstance.data()), -+ QCupsPrinterSupport::cupsPrintersCount(), -+ QCupsPrinterSupport::cupsPrinters() ); -+ cupsCopyDest(cupsDest, 0, &m_cupsDest); -+ } - if (m_cupsDest) { -- const char *ppdFile = cupsGetPPD(m_cupsName); -+ char resource[HTTP_MAX_URI]; -+ http_t *http = NULL; -+ const char *ppdFile = NULL; -+ -+ if (enablePrinterDiscovery) { -+ http = cupsConnectDest (m_cupsDest, 0, -1, 0, -+ resource, sizeof (resource), -+ 0, 0); -+ } -+ if (http) { -+ char *name = strrchr (resource, '/'); -+ if (name) -+ ppdFile = cupsGetPPD2 (http, ++name); -+ httpClose(http); +@@ -63,10 +64,36 @@ QPpdPrintDevice::QPpdPrintDevice(const Q + if (parts.size() > 1) + m_cupsInstance = parts.at(1).toUtf8(); + ++ bool enablePrinterDiscovery = qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY"); ++ + // Get the print instance and PPD file +- m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName, m_cupsInstance.isNull() ? nullptr : m_cupsInstance.constData()); ++ if (!enablePrinterDiscovery) { ++ m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName, m_cupsInstance.isNull() ? nullptr : m_cupsInstance.constData()); + } else { -+ ppdFile = cupsGetPPD(m_cupsName); ++ cups_dest_t *cupsDest = cupsGetDest( m_cupsName, ++ (m_cupsInstance.isEmpty() ? nullptr : m_cupsInstance.data()), ++ QCupsPrinterSupport::cupsPrintersCount(), ++ QCupsPrinterSupport::cupsPrinters() ); ++ cupsCopyDest(cupsDest, 0, &m_cupsDest); + } + if (m_cupsDest) { +- const char *ppdFile = cupsGetPPD(m_cupsName); ++ char resource[HTTP_MAX_URI]; ++ http_t *http = NULL; ++ const char *ppdFile = NULL; + - if (ppdFile) { - m_ppd = ppdOpenFile(ppdFile); - unlink(ppdFile); ++ if (enablePrinterDiscovery) { ++ http = cupsConnectDest (m_cupsDest, 0, -1, 0, ++ resource, sizeof (resource), ++ 0, 0); ++ } ++ if (http) { ++ char *name = strrchr (resource, '/'); ++ if (name) ++ ppdFile = cupsGetPPD2 (http, ++name); ++ httpClose(http); ++ } else { ++ ppdFile = cupsGetPPD(m_cupsName); ++ } + if (ppdFile) { + m_ppd = ppdOpenFile(ppdFile); + unlink(ppdFile); ++++++ 0001-Sanitize-QXcbScreen-s-pixelDensity-values.patch ++++++ --- /var/tmp/diff_new_pack.AOzjJv/_old 2018-12-14 20:54:58.956905619 +0100 +++ /var/tmp/diff_new_pack.AOzjJv/_new 2018-12-14 20:54:58.956905619 +0100 @@ -9,14 +9,14 @@ src/plugins/platforms/xcb/qxcbscreen.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp -index df458e85d7..7e898db17c 100644 ---- a/src/plugins/platforms/xcb/qxcbscreen.cpp -+++ b/src/plugins/platforms/xcb/qxcbscreen.cpp -@@ -751,6 +751,16 @@ void QXcbScreen::updateGeometry(const QRect &geometry, uint8_t rotation) +Index: qtbase-everywhere-src-5.12.0-beta3/src/plugins/platforms/xcb/qxcbscreen.cpp +=================================================================== +--- qtbase-everywhere-src-5.12.0-beta3.orig/src/plugins/platforms/xcb/qxcbscreen.cpp ++++ qtbase-everywhere-src-5.12.0-beta3/src/plugins/platforms/xcb/qxcbscreen.cpp +@@ -752,6 +752,16 @@ void QXcbScreen::updateGeometry(const QR + qreal referenceDpi = physicalSize().width() <= 320 ? 128 : 96; - qreal dpi = geometry.width() / physicalSize().width() * qreal(25.4); - m_pixelDensity = qMax(1, qRound(dpi/96)); + m_pixelDensity = qMax(1, qRound(dpi/referenceDpi)); + + if(m_pixelDensity > 1 && qEnvironmentVariableIsEmpty("QT_XCB_FORCE_ACCEPT_DPI")) { + // If we have no physical size or the resolution is untypical, fall back to 1x @@ -30,6 +30,3 @@ m_geometry = geometry; m_availableGeometry = geometry & m_virtualDesktop->workArea(); QWindowSystemInterface::handleScreenGeometryChange(QPlatformScreen::screen(), m_geometry, m_availableGeometry); --- -2.17.1 - ++++++ qtbase-everywhere-src-5.11.2.tar.xz -> qtbase-everywhere-src-5.12.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-everywhere-src-5.11.2.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new.28833/qtbase-everywhere-src-5.12.0.tar.xz differ: char 26, line 1
