Hello community,
here is the log from the commit of package libqt5-qtbase for openSUSE:Factory
checked in at 2018-03-04 11:54:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtbase (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtbase.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtbase"
Sun Mar 4 11:54:46 2018 rev:77 rq:581853 version:5.10.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtbase/libqt5-qtbase.changes
2018-02-28 19:59:40.474601151 +0100
+++ /work/SRC/openSUSE:Factory/.libqt5-qtbase.new/libqt5-qtbase.changes
2018-03-04 11:54:51.033291000 +0100
@@ -1,0 +2,8 @@
+Thu Mar 1 12:14:13 UTC 2018 - alarr...@suse.com
+
+- Rework 0001-Add-remote-print-queue-support.patch so now the remote
+ print queue discovery is disabled by default and is only enabled when
+ the QT_ENABLE_PRINTER_DISCOVERY environment variable is set
+ (QT_DISABLE_PRINTER_DISCOVERY is no longer used).
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0001-Add-remote-print-queue-support.patch ++++++
--- /var/tmp/diff_new_pack.Z9ZIa0/_old 2018-03-04 11:54:52.717230382 +0100
+++ /var/tmp/diff_new_pack.Z9ZIa0/_new 2018-03-04 11:54:52.721230238 +0100
@@ -5,12 +5,12 @@
Cups servers which announce themselves on avahi will be shown in
the printer dialog. This adds a delay the first time the print dialog
-is opened in order to search for print queues . If you don't have any
-network printer queue and you find the delay too annoying, it can be
-disabled by setting the QT_DISABLE_PRINTER_DISCOVERY environment variable
-to 1
+is opened in order to search for print queues . Because of this delay,
+the remote print queue discovery is disabled by default and can be enabled
+by setting the QT_ENABLE_PRINTER_DISCOVERY environment variable to 1.
-Change-Id: Ib70715d331e8f380a3c9039011bb8521986652aa
+The commit to Qt (which enabled the discovery by default) has
+a Change-Id: Ib70715d331e8f380a3c9039011bb8521986652aa
---
src/plugins/printsupport/cups/qcupsprintengine.cpp | 35 +++++++-
.../printsupport/cups/qcupsprintersupport.cpp | 95 ++++++++++++++++++++--
@@ -39,7 +39,7 @@
+ bool fallbackToLocal = false;
+ cups_dest_t *cupsDest = NULL;
+
-+ if (qEnvironmentVariableIsSet("QT_DISABLE_PRINTER_DISCOVERY")) {
++ if (!qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY")) {
+ fallbackToLocal = true;
+ } else {
+ cupsDest = cupsGetDest(printerName.toLocal8Bit(), NULL,
QCupsPrinterSupport::cupsPrintersCount(), QCupsPrinterSupport::cupsPrinters());
@@ -128,8 +128,8 @@
- int count = cupsGetDests(&dests);
- list.reserve(count);
- for (int i = 0; i < count; ++i) {
-+ bool disablePrinterDiscovery =
qEnvironmentVariableIsSet("QT_DISABLE_PRINTER_DISCOVERY");
-+ if (disablePrinterDiscovery) {
++ bool enablePrinterDiscovery =
qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY");
++ if (!enablePrinterDiscovery) {
+ qt_cups_num_printers = cupsGetDests(&dests);
+ } else {
+ if (qt_cups_num_printers == 0)
@@ -146,7 +146,7 @@
list.append(printerId);
}
- cupsFreeDests(count, dests);
-+ if (disablePrinterDiscovery) {
++ if (!enablePrinterDiscovery) {
+ cupsFreeDests(qt_cups_num_printers, dests);
+ }
+
@@ -160,8 +160,8 @@
- int count = cupsGetDests(&dests);
- for (int i = 0; i < count; ++i) {
+
-+ bool disablePrinterDiscovery =
qEnvironmentVariableIsSet("QT_DISABLE_PRINTER_DISCOVERY");
-+ if (disablePrinterDiscovery) {
++ bool enablePrinterDiscovery =
qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY");
++ if (!enablePrinterDiscovery) {
+ qt_cups_num_printers = cupsGetDests(&dests);
+ } else {
+ if (qt_cups_num_printers == 0)
@@ -179,7 +179,7 @@
}
}
- cupsFreeDests(count, dests);
-+ if (disablePrinterDiscovery) {
++ if (!enablePrinterDiscovery) {
+ cupsFreeDests(qt_cups_num_printers, dests);
+ }
return printerId;
@@ -250,12 +250,12 @@
m_cupsDest = 0;
}
-+ bool disablePrinterDiscovery =
qEnvironmentVariableIsSet("QT_DISABLE_PRINTER_DISCOVERY");
++ bool enablePrinterDiscovery =
qEnvironmentVariableIsSet("QT_ENABLE_PRINTER_DISCOVERY");
+
// Get the print instance and PPD file
- m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName,
m_cupsInstance);
+
-+ if (disablePrinterDiscovery) {
++ if (!enablePrinterDiscovery) {
+ m_cupsDest = cupsGetNamedDest(CUPS_HTTP_DEFAULT, m_cupsName,
m_cupsInstance);
+ } else {
+ cups_dest_t *cupsDest = cupsGetDest( m_cupsName,
@@ -270,7 +270,7 @@
+ http_t *http = NULL;
+ const char *ppdFile = NULL;
+
-+ if (!disablePrinterDiscovery) {
++ if (enablePrinterDiscovery) {
+ http = cupsConnectDest (m_cupsDest, 0, -1, 0,
+ resource, sizeof (resource),
+ 0, 0);
