Hello community, here is the log from the commit of package kde-print-manager for openSUSE:Factory checked in at 2016-08-31 00:11:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde-print-manager (Old) and /work/SRC/openSUSE:Factory/.kde-print-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kde-print-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/kde-print-manager/kde-print-manager.changes 2016-07-24 19:45:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kde-print-manager.new/kde-print-manager.changes 2016-08-31 00:12:22.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Aug 30 08:56:28 UTC 2016 - [email protected] + +- Adjust filelist for the plasmoid appdata, installed with KF >= 5.25.0 + +------------------------------------------------------------------- +Fri Aug 12 10:12:57 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.0 + * KDE Applications 16.08.0 + * https://www.kde.org/announcements/announce-applications-16.08.0.php + + +------------------------------------------------------------------- +Mon Aug 8 14:51:32 UTC 2016 - [email protected] + +- Update to KDE Applications 16.07.90 + * KDE Applications 16.07.90 (16.08-RC) + * https://www.kde.org/announcements/announce-applications-16.07.90.php + + +------------------------------------------------------------------- Old: ---- print-manager-16.04.3.tar.xz New: ---- print-manager-16.08.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde-print-manager.spec ++++++ --- /var/tmp/diff_new_pack.2T4VtP/_old 2016-08-31 00:12:23.000000000 +0200 +++ /var/tmp/diff_new_pack.2T4VtP/_new 2016-08-31 00:12:23.000000000 +0200 @@ -21,7 +21,7 @@ Summary: A new print manager for KDE License: GPL-2.0+ Group: System/GUI/KDE -Version: 16.04.3 +Version: 16.08.0 Release: 0 Source: print-manager-%{version}.tar.xz BuildRequires: cups @@ -107,5 +107,6 @@ %{_kf5_applicationsdir}/org.kde.PrintQueue.desktop %{_kf5_qmldir}/org/kde/plasma/printmanager/ %{_kf5_notifydir}/printmanager.notifyrc +%{_kf5_appstreamdir}/org.kde.plasma.printmanager.appdata.xml %changelog ++++++ print-manager-16.04.3.tar.xz -> print-manager-16.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/CMakeLists.txt new/print-manager-16.08.0/CMakeLists.txt --- old/print-manager-16.04.3/CMakeLists.txt 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/CMakeLists.txt 2016-06-25 11:57:29.000000000 +0200 @@ -35,7 +35,9 @@ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0) add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) -remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) +add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + +remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) # Generate config.h configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseSamba.cpp new/print-manager-16.08.0/add-printer/ChooseSamba.cpp --- old/print-manager-16.04.3/add-printer/ChooseSamba.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseSamba.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -60,19 +60,19 @@ QString address = ui->addressLE->text().trimmed(); QUrl url; if (address.startsWith(QLatin1String("//"))) { - url = QLatin1String("smb:") % address; + url = QUrl(QLatin1String("smb:") % address); } else if (address.startsWith(QLatin1String("/"))) { - url = QLatin1String("smb:/") % address; + url = QUrl(QLatin1String("smb:/") % address); } else if (address.startsWith(QLatin1String("://"))) { - url = QLatin1String("smb") % address; + url = QUrl(QLatin1String("smb") % address); } else if (address.startsWith(QLatin1String("smb://"))) { - url = address; + url = QUrl(address); } else if (!QUrl::fromUserInput(address).scheme().isEmpty() && QUrl::fromUserInput(address).scheme() != QStringLiteral("smb")) { url = QUrl::fromUserInput(address); url.setScheme(QStringLiteral("smb")); } else { - url = QStringLiteral("smb://") % address; + url = QUrl(QStringLiteral("smb://") % address); } qDebug() << 1 << url; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseSocket.cpp new/print-manager-16.08.0/add-printer/ChooseSocket.cpp --- old/print-manager-16.04.3/add-printer/ChooseSocket.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseSocket.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -53,7 +53,7 @@ ui->addressLE->clear(); ui->portISB->setValue(9100); QString deviceUri = args[KCUPS_DEVICE_URI].toString(); - QUrl url = deviceUri; + QUrl url(deviceUri); if (url.scheme() == QStringLiteral("socket")) { ui->addressLE->setText(url.host()); ui->portISB->setValue(url.port(9100)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/ChooseUri.cpp new/print-manager-16.08.0/add-printer/ChooseUri.cpp --- old/print-manager-16.04.3/add-printer/ChooseUri.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/ChooseUri.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -51,7 +51,7 @@ { m_args = args; bool visible = false; - QUrl url = args[KCUPS_DEVICE_URI].toString(); + QUrl url(args[KCUPS_DEVICE_URI].toString()); if (url.url() == QLatin1String("other")) { ui->addressLE->clear(); visible = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/PageChoosePPD.cpp new/print-manager-16.08.0/add-printer/PageChoosePPD.cpp --- old/print-manager-16.04.3/add-printer/PageChoosePPD.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/PageChoosePPD.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -93,7 +93,7 @@ } qDebug() << deviceURI << url; KJob *job = KIO::file_copy(url, - tempFile->fileName(), + QUrl::fromLocalFile(tempFile->fileName()), -1, KIO::Overwrite | KIO::HideProgressInfo); job->setProperty("URI", deviceURI); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/add-printer/PageDestinations.cpp new/print-manager-16.08.0/add-printer/PageDestinations.cpp --- old/print-manager-16.04.3/add-printer/PageDestinations.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/add-printer/PageDestinations.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -301,7 +301,7 @@ } else { QVariant aux = ui->connectionsCB->itemData(ui->connectionsCB->currentIndex()); KCupsPrinter printer = aux.value<KCupsPrinter>(); - QUrl url = uri.toString(); + QUrl url(uri.toString()); url.setPath(QLatin1String("printers/") % printer.name()); ret[KCUPS_DEVICE_URI] = url.url(); ret[KCUPS_DEVICE_ID] = index.data(DevicesModel::DeviceId); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-16.04.3/configure-printer/PrinterOptions.cpp new/print-manager-16.08.0/configure-printer/PrinterOptions.cpp --- old/print-manager-16.04.3/configure-printer/PrinterOptions.cpp 2016-06-25 15:07:11.000000000 +0200 +++ new/print-manager-16.08.0/configure-printer/PrinterOptions.cpp 2016-06-25 11:57:29.000000000 +0200 @@ -78,7 +78,7 @@ void PrinterOptions::reloadPPD() { // The caller "owns" the file that is created and must unlink the returned filename. - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { unlink(m_filename.toUtf8()); } @@ -393,7 +393,7 @@ ppdClose(m_ppd); } - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { unlink(m_filename.toUtf8()); } @@ -706,7 +706,7 @@ *keyptr; /* Pointer into keyword... */ // copy cups-1.4.2/cgi-bin line 3779 - if (!m_filename.isNull()) { + if (!m_filename.isEmpty()) { out = cupsTempFile2(tempfile, sizeof(tempfile)); in = cupsFileOpen(m_filename.toUtf8(), "r"); @@ -764,6 +764,12 @@ cupsFileClose(in); cupsFileClose(out); } + else { + // TODO add a KMessageBox::error + qCWarning(PM_CONFIGURE_PRINTER) << "No printer PPD file set, can't save options."; + + return; + } QVariantHash values; // we need null values QPointer<KCupsRequest> request = new KCupsRequest;
