Hello community, here is the log from the commit of package libqt5-qtbase for openSUSE:Factory checked in at 2018-06-02 11:52:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase" Sat Jun 2 11:52:22 2018 rev:81 rq:611696 version:5.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes 2018-04-30 22:50:54.898027170 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes 2018-06-02 11:52:23.899449900 +0200 @@ -1,0 +2,20 @@ +Tue May 22 15:06:56 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.11.0/?h=v5.11.0 +- Remove patches, now upstream: + * 0001-Do-a-static_cast-in-bit-blasts-that-are-UB.patch + * 0001-sqlite-Check-that-there-are-values-to-be-set-when-bi.patch + * 0002-sqlite-Bind-duplicated-named-placeholders-correctly.patch + * 0003-sqlite-Prevent-a-crash-when-sqlite-does-not-detect-a.patch + +------------------------------------------------------------------- +Tue May 8 10:59:01 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0-rc + * New bugfix release + * No changelog available + +------------------------------------------------------------------- @@ -9,0 +30,25 @@ +Mon Apr 23 08:55:13 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0-beta4 + * New bugfix release + * No changelog available +- Refresh patches: + * force-cmake-private-headers.patch +- Remove patches, now upstream: + * 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch + +------------------------------------------------------------------- +Wed Apr 11 09:13:30 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0-beta3 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- +Wed Mar 28 09:17:05 CEST 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0-beta2 + * New bugfix release + * No changelog available + +------------------------------------------------------------------- @@ -15,0 +61,5 @@ +Tue Mar 13 13:40:37 UTC 2018 - christo...@krop.fr + +- Fix the license tag. + +------------------------------------------------------------------- @@ -40,0 +91,13 @@ +Thu Mar 1 09:54:43 CET 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0-beta1 + * New feature release + * For more details please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.11.0-beta1/?h=v5.11.0-beta1 +- Remove patches, now upstream: + * libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch + * opengl-Bail-if-cached-shader-fails-to-load.patch + * 0001-Revert-QHeaderView-properly-restore-section-data-aft.patch + * 0002-Revert-QHeaderView-Simplify-and-fix-layoutChange-han.patch + +------------------------------------------------------------------- @@ -43,0 +107,69 @@ + +------------------------------------------------------------------- +Tue Feb 20 14:27:51 CET 2018 - fab...@ritter-vogt.de + +- Update to 5.11.0-alpha + * New feature release + * For more details please see: + * https://wiki.qt.io/New_Features_in_Qt_5.11 +- Refresh patches: + * 0001-Add-remote-print-queue-support.patch + * 0001-Revert-QHeaderView-properly-restore-section-data-aft.patch +- Remove patches, now upstream: + * 0001-QSimpleDrag-Fix-mouse-release-coords-for-delayed-eve.patch + * 0001-Remove-QPrintDialogPrivate-applyPrinterProperties-no.patch + * 0002-CUPS-Use-default-cups-job-priority-instead-of-50.patch + * 0002-Remove-QUnixPrintWidgetPrivate-applyPrinterPropertie.patch + * 0003-QPageSetupWidget-setPrinter-Use-printdevice-default-paper-size.patch + * 0003-Remove-QPrintPropertiesDialog-applyPrinterProperties.patch + * 0004-Fix-custom-page-size-handling-in-the-Unix-print-dial.patch + * 0004-Remove-QCupsJobWidget-setPrinter.patch + * 0005-CUPS-Refactor-the-code-a-bit.patch + * 0005-Remove-QPrintPropertiesDialog-selectPrinter.patch + * 0006-Refactor-QPPDOptionsModel-a-bit.patch + * 0006-Remove-QPageSetupWidget-selectPrinter.patch + * 0007-CUPS-Fix-advanced-options-cancel-of-the-print-properties-dialog.patch + * 0007-Introduce-QPrintDevice-property-setProperty.patch + * 0008-Allow-access-to-ppd-file-and-ppdMarkOption-via-QPpdP.patch + * 0008-CUPS-Fix-conflict-handling.patch + * 0009-CUPS-Use-printer-job-sheets-as-default-instead-of-none-none.patch + * 0009-QPlatformPrintDevice-use-QVector-not-QList-in-the-AP.patch + * 0010-CUPS-Use-printer-job-billing-as-default-instead-of-the-empty-string.patch + * 0010-Reintroduce-the-Advanced-tab-in-the-QPrintProperties.patch + * 0011-CUPS-Use-printer-job-hold-until-as-default-instead-of-the-nohold.patch + * 0011-QtPrintSupport-Fix-build.patch + * 0012-Unix-Fix-usability-of-the-print-properties-dialog.patch + * 0013-cups-Dont-show-InstallableOptions-in-the-advanced-properties-tab.patch + * 0014-CUPS-Enable-printing-arbitrary-pages-and-page-ranges.patch + * 0015-CUPS-Dont-show-choices-that-conflict-with-the-printer-installed-options.patch + * 0016-CUPS-Rework-set-clearCupsOption-API.patch + * 0017-Cups-Print-Dialog-Change-the-message-box-titles-to-C.patch + * 0018-Fix-build-due-to-missing-QDebug-include.patch + +------------------------------------------------------------------- +Mon Feb 19 08:45:27 UTC 2018 - fab...@ritter-vogt.de + +- Revert upstream commits to make saving of header sections work again: + * 0001-Revert-QHeaderView-properly-restore-section-data-aft.patch + * 0002-Revert-QHeaderView-Simplify-and-fix-layoutChange-han.patch + +------------------------------------------------------------------- +Wed Feb 14 15:44:11 CET 2018 - fab...@ritter-vogt.de + +- Update to 5.10.1 + * New bugfix release + * For more details please see: + * http://code.qt.io/cgit/qt/qtbase.git/plain/dist/changes-5.10.1/?h=v5.10.1 +- Drop patches, now upstream: + * 0001-xcb-verify-if-xrandr-present-before-using-xcb_randr-.patch + * 0001-Avoid-providing-bad-pixelDeltas-on-X11.patch +- Refresh patches: + * 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch + * 0003-Remove-QPrintPropertiesDialog-applyPrinterProperties.patch + * 0004-Remove-QCupsJobWidget-setPrinter.patch + * 0005-Remove-QPrintPropertiesDialog-selectPrinter.patch + * 0006-Remove-QPageSetupWidget-selectPrinter.patch + * 0003-QPageSetupWidget-setPrinter-Use-printdevice-default-paper-size.patch + * 0004-Fix-custom-page-size-handling-in-the-Unix-print-dial.patch + * 0011-CUPS-Use-printer-job-hold-until-as-default-instead-of-the-nohold.patch + * 0012-Unix-Fix-usability-of-the-print-properties-dialog.patch Old: ---- 0001-Avoid-providing-bad-pixelDeltas-on-X11.patch 0001-Do-a-static_cast-in-bit-blasts-that-are-UB.patch 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch 0001-QSimpleDrag-Fix-mouse-release-coords-for-delayed-eve.patch 0001-Remove-QPrintDialogPrivate-applyPrinterProperties-no.patch 0001-sqlite-Check-that-there-are-values-to-be-set-when-bi.patch 0001-xcb-verify-if-xrandr-present-before-using-xcb_randr-.patch 0002-CUPS-Use-default-cups-job-priority-instead-of-50.patch 0002-Remove-QUnixPrintWidgetPrivate-applyPrinterPropertie.patch 0002-sqlite-Bind-duplicated-named-placeholders-correctly.patch 0003-QPageSetupWidget-setPrinter-Use-printdevice-default-paper-size.patch 0003-Remove-QPrintPropertiesDialog-applyPrinterProperties.patch 0003-sqlite-Prevent-a-crash-when-sqlite-does-not-detect-a.patch 0004-Fix-custom-page-size-handling-in-the-Unix-print-dial.patch 0004-Remove-QCupsJobWidget-setPrinter.patch 0005-CUPS-Refactor-the-code-a-bit.patch 0005-Remove-QPrintPropertiesDialog-selectPrinter.patch 0006-Refactor-QPPDOptionsModel-a-bit.patch 0006-Remove-QPageSetupWidget-selectPrinter.patch 0007-CUPS-Fix-advanced-options-cancel-of-the-print-properties-dialog.patch 0007-Introduce-QPrintDevice-property-setProperty.patch 0008-Allow-access-to-ppd-file-and-ppdMarkOption-via-QPpdP.patch 0008-CUPS-Fix-conflict-handling.patch 0009-CUPS-Use-printer-job-sheets-as-default-instead-of-none-none.patch 0009-QPlatformPrintDevice-use-QVector-not-QList-in-the-AP.patch 0010-CUPS-Use-printer-job-billing-as-default-instead-of-the-empty-string.patch 0010-Reintroduce-the-Advanced-tab-in-the-QPrintProperties.patch 0011-CUPS-Use-printer-job-hold-until-as-default-instead-of-the-nohold.patch 0011-QtPrintSupport-Fix-build.patch 0012-Unix-Fix-usability-of-the-print-properties-dialog.patch 0013-cups-Dont-show-InstallableOptions-in-the-advanced-properties-tab.patch 0014-CUPS-Enable-printing-arbitrary-pages-and-page-ranges.patch 0015-CUPS-Dont-show-choices-that-conflict-with-the-printer-installed-options.patch 0016-CUPS-Rework-set-clearCupsOption-API.patch 0017-Cups-Print-Dialog-Change-the-message-box-titles-to-C.patch 0018-Fix-build-due-to-missing-QDebug-include.patch libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch opengl-Bail-if-cached-shader-fails-to-load.patch qtbase-everywhere-src-5.10.0.tar.xz New: ---- qtbase-everywhere-src-5.11.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtbase.spec ++++++ --- /var/tmp/diff_new_pack.wYCq5r/_old 2018-06-02 11:52:28.119295121 +0200 +++ /var/tmp/diff_new_pack.wYCq5r/_new 2018-06-02 11:52:28.123294974 +0200 @@ -27,23 +27,26 @@ %if 0%{?suse_version} >= 1330 %global vulkan 1 +%bcond_without harfbuzz %else +# Harfbuzz too old +%bcond_with harfbuzz # Vulkan headers too old %global vulkan 0 %endif Name: libqt5-qtbase -Version: 5.10.0 +Version: 5.11.0 Release: 0 Summary: C++ Program Library, Core Components -License: LGPL-2.1-with-Qt-Company-Qt-exception-1.1 or LGPL-3.0-with-Qt-Company-Qt-exception-1.1 +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.10.0 -%define so_version 5.10.0 -%define tar_version qtbase-everywhere-src-5.10.0 -Source: https://download.qt.io/official_releases/qt/5.10/%{real_version}/submodules/%{tar_version}.tar.xz +%define real_version 5.11.0 +%define so_version 5.11.0 +%define tar_version qtbase-everywhere-src-5.11.0 +Source: https://download.qt.io/official_releases/qt/5.11/%{real_version}/submodules/%{tar_version}.tar.xz # to get mtime of file: Source1: libqt5-qtbase.changes Source2: macros.qt5 @@ -52,8 +55,6 @@ # patches 0-1000 are openSUSE and/or non-upstream(able) patches # # PATCH-FIX-SUSE libqt5-Fix-Gujarati-font.patch bnc#878292 fix broken Gujarati font rendering Patch3: libqt5-Fix-Gujarati-font.patch -# Patch-FIX-SUSE libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch -- bnc#888858 -Patch5: libqt5-do-not-use-shm-if-display-name-doesnt-look-local.patch # PATCH-FIX-OPENSUSE disable-rc4-ciphers-bnc865241.diff bnc#865241-- Exclude rc4 ciphers from being used by default Patch6: disable-rc4-ciphers-bnc865241.diff Patch8: tell-the-truth-about-private-api.patch @@ -65,46 +66,8 @@ Patch15: force-cmake-private-headers.patch # PATCH-FIX-UPSTREAM Patch17: qapplication-emit-palettechanged.patch -# PATCH-FIX-UPSTREAM -Patch18: opengl-Bail-if-cached-shader-fails-to-load.patch -# patches 1000- 2000 and above from upstream 5.10 branch # -Patch1000: 0001-xcb-verify-if-xrandr-present-before-using-xcb_randr-.patch -Patch1001: 0001-Avoid-providing-bad-pixelDeltas-on-X11.patch -Patch1002: 0001-QSimpleDrag-Fix-mouse-release-coords-for-delayed-eve.patch -Patch1003: 0001-Extend-the-MariaDB-define-check-to-cover-the-later-v.patch -# patches 2000-3000 and above from upstream 5.11/dev branch # -Patch2000: 0001-Remove-QPrintDialogPrivate-applyPrinterProperties-no.patch -Patch2001: 0002-Remove-QUnixPrintWidgetPrivate-applyPrinterPropertie.patch -Patch2002: 0003-Remove-QPrintPropertiesDialog-applyPrinterProperties.patch -Patch2003: 0004-Remove-QCupsJobWidget-setPrinter.patch -Patch2004: 0005-Remove-QPrintPropertiesDialog-selectPrinter.patch -Patch2005: 0006-Remove-QPageSetupWidget-selectPrinter.patch -Patch2006: 0007-Introduce-QPrintDevice-property-setProperty.patch -Patch2007: 0008-Allow-access-to-ppd-file-and-ppdMarkOption-via-QPpdP.patch -Patch2008: 0009-QPlatformPrintDevice-use-QVector-not-QList-in-the-AP.patch -Patch2009: 0010-Reintroduce-the-Advanced-tab-in-the-QPrintProperties.patch -Patch2010: 0011-QtPrintSupport-Fix-build.patch -Patch2012: 0002-CUPS-Use-default-cups-job-priority-instead-of-50.patch -Patch2013: 0003-QPageSetupWidget-setPrinter-Use-printdevice-default-paper-size.patch -Patch2014: 0004-Fix-custom-page-size-handling-in-the-Unix-print-dial.patch -Patch2015: 0005-CUPS-Refactor-the-code-a-bit.patch -Patch2016: 0006-Refactor-QPPDOptionsModel-a-bit.patch -Patch2017: 0007-CUPS-Fix-advanced-options-cancel-of-the-print-properties-dialog.patch -Patch2018: 0008-CUPS-Fix-conflict-handling.patch -Patch2019: 0009-CUPS-Use-printer-job-sheets-as-default-instead-of-none-none.patch -Patch2020: 0010-CUPS-Use-printer-job-billing-as-default-instead-of-the-empty-string.patch -Patch2021: 0011-CUPS-Use-printer-job-hold-until-as-default-instead-of-the-nohold.patch -Patch2022: 0012-Unix-Fix-usability-of-the-print-properties-dialog.patch -Patch2023: 0013-cups-Dont-show-InstallableOptions-in-the-advanced-properties-tab.patch -Patch2024: 0014-CUPS-Enable-printing-arbitrary-pages-and-page-ranges.patch -Patch2025: 0015-CUPS-Dont-show-choices-that-conflict-with-the-printer-installed-options.patch -Patch2026: 0016-CUPS-Rework-set-clearCupsOption-API.patch -Patch2027: 0017-Cups-Print-Dialog-Change-the-message-box-titles-to-C.patch -Patch2028: 0018-Fix-build-due-to-missing-QDebug-include.patch -Patch2029: 0001-Do-a-static_cast-in-bit-blasts-that-are-UB.patch -Patch2030: 0001-sqlite-Check-that-there-are-values-to-be-set-when-bi.patch -Patch2031: 0002-sqlite-Bind-duplicated-named-placeholders-correctly.patch -Patch2032: 0003-sqlite-Prevent-a-crash-when-sqlite-does-not-detect-a.patch +# patches 1000- 2000 and above from upstream 5.11 branch # +# patches 2000-3000 and above from upstream 5.12/dev branch # BuildRequires: alsa-devel BuildRequires: cups-devel BuildRequires: double-conversion-devel @@ -166,7 +129,9 @@ BuildRequires: xz BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-3.0) +%if %{with harfbuzz} BuildRequires: pkgconfig(harfbuzz) +%endif BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(libudev) @@ -632,6 +597,14 @@ %description platformtheme-gtk3 Qt 5 plugin for better integration with gtk3-based desktop enviroments. +%package platformtheme-flatpak +Summary: Qt 5 Flatpak plugin +Group: Development/Libraries/C and C++ +Requires: libQt5Gui5 = %{version} + +%description platformtheme-flatpak +Qt 5 plugin for integration with flatpak. + %package -n libQt5Gui-devel Summary: Development files for the Qt5 GUI library Group: Development/Libraries/C and C++ @@ -893,7 +866,9 @@ -system-libjpeg \ -openssl-linked \ -system-libpng \ +%if %{with harfbuzz} -system-harfbuzz \ +%endif -fontconfig \ -system-freetype \ -cups \ @@ -1224,6 +1199,12 @@ %dir %{libqt5_plugindir}/platformthemes %{libqt5_plugindir}/platformthemes/libqgtk3.so +%files platformtheme-flatpak +%defattr(-,root,root,755) +%doc *.txt LICENSE.* +%dir %{libqt5_plugindir}/platformthemes +%{libqt5_plugindir}/platformthemes/libqflatpak.so + %files -n libQt5Gui-devel %defattr(-,root,root,755) %doc *.txt LICENSE.* ++++++ 0001-Add-remote-print-queue-support.patch ++++++ --- /var/tmp/diff_new_pack.wYCq5r/_old 2018-06-02 11:52:28.163293507 +0200 +++ /var/tmp/diff_new_pack.wYCq5r/_new 2018-06-02 11:52:28.163293507 +0200 @@ -18,10 +18,10 @@ src/plugins/printsupport/cups/qppdprintdevice.cpp | 33 +++++++- 4 files changed, 160 insertions(+), 11 deletions(-) -Index: qtbase-everywhere-src-5.10.0/src/plugins/printsupport/cups/qcupsprintengine.cpp +Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintengine.cpp =================================================================== ---- qtbase-everywhere-src-5.10.0.orig/src/plugins/printsupport/cups/qcupsprintengine.cpp -+++ qtbase-everywhere-src-5.10.0/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 @@ -48,6 +48,7 @@ #include <qbuffer.h> #include "private/qcups_p.h" // Only needed for PPK_CupsOptions @@ -30,11 +30,11 @@ #include <cups/cups.h> -@@ -241,8 +242,40 @@ void QCupsPrintEnginePrivate::closePrint - - // Print the file. +@@ -243,8 +244,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; -- cupsPrintFile(printerName.toLocal8Bit().constData(), tempFile.toLocal8Bit().constData(), +- cupsPrintFile(printerOriginalName.toLocal8Bit().constData(), tempFile.toLocal8Bit().constData(), + + bool fallbackToLocal = false; + cups_dest_t *cupsDest = NULL; @@ -42,7 +42,7 @@ + if (!qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY")) { + fallbackToLocal = true; + } else { -+ cupsDest = cupsGetDest(printerName.toLocal8Bit(), NULL, QCupsPrinterSupport::cupsPrintersCount(), QCupsPrinterSupport::cupsPrinters()); ++ cupsDest = cupsGetDest(printerOriginalName.toLocal8Bit(), NULL, QCupsPrinterSupport::cupsPrintersCount(), QCupsPrinterSupport::cupsPrinters()); + } + + if (cupsDest) { @@ -66,16 +66,16 @@ + } + + if (fallbackToLocal) { -+ cupsPrintFile(printerName.toLocal8Bit().constData(), tempFile.toLocal8Bit().constData(), ++ cupsPrintFile(printerOriginalName.toLocal8Bit().constData(), tempFile.toLocal8Bit().constData(), + title.toLocal8Bit().constData(), cupsOptStruct.size(), optPtr); + } QFile::remove(tempFile); } -Index: qtbase-everywhere-src-5.10.0/src/plugins/printsupport/cups/qcupsprintersupport.cpp +Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintersupport.cpp =================================================================== ---- qtbase-everywhere-src-5.10.0.orig/src/plugins/printsupport/cups/qcupsprintersupport.cpp -+++ qtbase-everywhere-src-5.10.0/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 @@ # include <cups/language.h> #endif @@ -206,10 +206,10 @@ + + QT_END_NAMESPACE -Index: qtbase-everywhere-src-5.10.0/src/plugins/printsupport/cups/qcupsprintersupport_p.h +Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qcupsprintersupport_p.h =================================================================== ---- qtbase-everywhere-src-5.10.0.orig/src/plugins/printsupport/cups/qcupsprintersupport_p.h -+++ qtbase-everywhere-src-5.10.0/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 @@ -56,6 +56,8 @@ #include <QtCore/qstringlist.h> @@ -220,8 +220,8 @@ class QCupsPrinterSupport : public QPlatformPrinterSupport @@ -71,8 +73,14 @@ public: - QStringList availablePrintDeviceIds() const Q_DECL_OVERRIDE; - QString defaultPrintDeviceId() const Q_DECL_OVERRIDE; + QStringList availablePrintDeviceIds() const override; + QString defaultPrintDeviceId() const override; + static void fillCupsPrinters(); + static cups_dest_t *cupsPrinters() { return qt_cups_printers; }; @@ -234,10 +234,10 @@ }; QT_END_NAMESPACE -Index: qtbase-everywhere-src-5.10.0/src/plugins/printsupport/cups/qppdprintdevice.cpp +Index: qtbase-everywhere-src-5.11.0-beta1/src/plugins/printsupport/cups/qppdprintdevice.cpp =================================================================== ---- qtbase-everywhere-src-5.10.0.orig/src/plugins/printsupport/cups/qppdprintdevice.cpp -+++ qtbase-everywhere-src-5.10.0/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 @@ -39,6 +39,7 @@ #include "qppdprintdevice.h" @@ -246,20 +246,20 @@ #include <QtCore/QMimeDatabase> #include <qdebug.h> -@@ -451,10 +452,38 @@ void QPpdPrintDevice::loadPrinter() +@@ -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); +- 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); ++ 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() ? NULL : m_cupsInstance.data()), ++ (m_cupsInstance.isEmpty() ? nullptr : m_cupsInstance.data()), + QCupsPrinterSupport::cupsPrintersCount(), + QCupsPrinterSupport::cupsPrinters() ); + cupsCopyDest(cupsDest, 0, &m_cupsDest); ++++++ force-cmake-private-headers.patch ++++++ --- /var/tmp/diff_new_pack.wYCq5r/_old 2018-06-02 11:52:28.199292187 +0200 +++ /var/tmp/diff_new_pack.wYCq5r/_new 2018-06-02 11:52:28.203292040 +0200 @@ -4,10 +4,10 @@ This is broken for shadow builds otherwise. -Index: qtbase-opensource-src-5.9.1/mkspecs/features/create_cmake.prf +Index: qtbase-everywhere-src-5.11.0-beta4/mkspecs/features/create_cmake.prf =================================================================== ---- qtbase-opensource-src-5.9.1.orig/mkspecs/features/create_cmake.prf -+++ qtbase-opensource-src-5.9.1/mkspecs/features/create_cmake.prf +--- qtbase-everywhere-src-5.11.0-beta4.orig/mkspecs/features/create_cmake.prf ++++ qtbase-everywhere-src-5.11.0-beta4/mkspecs/features/create_cmake.prf @@ -30,7 +30,6 @@ CMAKE_MODULE_NAME = $$cmakeModuleName($$ split_incpath { @@ -16,11 +16,13 @@ CMAKE_SOURCE_INCLUDES = \ $$cmakeTargetPaths($$QT_MODULE_INCLUDE_BASE $$QT_MODULE_INCLUDE_BASE/Qt$${CMAKE_MODULE_NAME}) CMAKE_SOURCE_PRIVATE_INCLUDES = \ -@@ -53,8 +52,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*" +@@ -53,10 +52,6 @@ contains(CMAKE_INCLUDE_DIR, "^\\.\\./.*" CMAKE_INCLUDE_DIR_IS_ABSOLUTE = True } --!exists($$first(QT.$${MODULE}_private.includes)): CMAKE_NO_PRIVATE_INCLUDES = true +-isEmpty(QT.$${MODULE}_private.includes)| \ +- !exists($$first(QT.$${MODULE}_private.includes)): \ +- CMAKE_NO_PRIVATE_INCLUDES = true - CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX]) contains(CMAKE_LIB_DIR,"^\\.\\./.*") { ++++++ qtbase-everywhere-src-5.10.0.tar.xz -> qtbase-everywhere-src-5.11.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-qtbase/qtbase-everywhere-src-5.10.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/qtbase-everywhere-src-5.11.0.tar.xz differ: char 25, line 1
