Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2016-05-31 12:20:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksane" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2016-03-26 15:19:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2016-05-31 12:20:24.000000000 +0200 @@ -1,0 +2,29 @@ +Sat May 7 10:43:05 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Wed Apr 27 21:58:12 UTC 2016 - [email protected] + +- Remove conflicting icons with kipi-plugins + +------------------------------------------------------------------- +Sun Apr 17 06:19:03 UTC 2016 - [email protected] + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:54:12 UTC 2016 - [email protected] + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- libksane-15.12.3.tar.xz New: ---- libksane-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.MOjFiA/_old 2016-05-31 12:20:25.000000000 +0200 +++ /var/tmp/diff_new_pack.MOjFiA/_new 2016-05-31 12:20:25.000000000 +0200 @@ -35,7 +35,7 @@ License: GPL-2.0+ Group: Development/Libraries/KDE Url: http://www.kde.org -Version: 15.12.3 +Version: 16.04.1 Release: 0 Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,6 +53,10 @@ %install %kf5_makeinstall -C build + # FIXME: Remove temporarily as they conflict with kipi + rm -f %{buildroot}%{_kf5_iconsdir}/hicolor/16x16/actions/black-white.png + rm -f %{buildroot}%{_kf5_iconsdir}/hicolor/16x16/actions/color.png + rm -f %{buildroot}%{_kf5_iconsdir}/hicolor/16x16/actions/gray-scale.png %package -n %{lname}%{_so} Summary: KDE scan library ++++++ libksane-15.12.3.tar.xz -> libksane-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-15.12.3/CMakeLists.txt new/libksane-16.04.1/CMakeLists.txt --- old/libksane-15.12.3/CMakeLists.txt 2015-10-16 09:52:39.000000000 +0200 +++ new/libksane-16.04.1/CMakeLists.txt 2016-03-15 13:43:23.000000000 +0100 @@ -16,10 +16,11 @@ include(FeatureSummary) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMInstallIcons) include(CMakePackageConfigHelpers) include(CheckFunctionExists) include(KDEInstallDirs) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(GenerateExportHeader) @@ -39,7 +40,6 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets) # Required KF5 frameworks -find_package(KF5Config ${KF5_VERSION} REQUIRED) find_package(KF5I18n ${KF5_VERSION} REQUIRED) find_package(KF5Wallet ${KF5_VERSION} REQUIRED) find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED) Files old/libksane-15.12.3/src/16-actions-black-white.png and new/libksane-16.04.1/src/16-actions-black-white.png differ Files old/libksane-15.12.3/src/16-actions-color.png and new/libksane-16.04.1/src/16-actions-color.png differ Files old/libksane-15.12.3/src/16-actions-gray-scale.png and new/libksane-16.04.1/src/16-actions-gray-scale.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-15.12.3/src/CMakeLists.txt new/libksane-16.04.1/src/CMakeLists.txt --- old/libksane-15.12.3/src/CMakeLists.txt 2015-10-16 09:52:39.000000000 +0200 +++ new/libksane-16.04.1/src/CMakeLists.txt 2016-03-15 13:43:23.000000000 +0100 @@ -69,8 +69,13 @@ # Install files -# FIXME KF5: KDE4_INSTALL_ICONS -#KDE4_INSTALL_ICONS(${ICON_INSTALL_DIR}) +set(ksane_ICONS + 16-actions-black-white.png + 16-actions-color.png + 16-actions-gray-scale.png +) +ecm_install_icons(ICONS ${ksane_ICONS} + DESTINATION ${ICON_INSTALL_DIR}) install(TARGETS KF5Sane EXPORT KF5SaneTargets Files old/libksane-15.12.3/src/hi16-action-black-white.png and new/libksane-16.04.1/src/hi16-action-black-white.png differ Files old/libksane-15.12.3/src/hi16-action-color.png and new/libksane-16.04.1/src/hi16-action-color.png differ Files old/libksane-15.12.3/src/hi16-action-gray-scale.png and new/libksane-16.04.1/src/hi16-action-gray-scale.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-15.12.3/src/ksanewidget.cpp new/libksane-16.04.1/src/ksanewidget.cpp --- old/libksane-15.12.3/src/ksanewidget.cpp 2015-10-16 09:52:39.000000000 +0200 +++ new/libksane-16.04.1/src/ksanewidget.cpp 2016-03-15 13:43:23.000000000 +0100 @@ -868,43 +868,15 @@ d->m_optBrY->getMaxValue(ymax); if (topLeft.x() < 0.0 || topLeft.y() < 0.0 || bottomRight.x() < 0.0 || bottomRight.y() < 0.0) { d->m_previewViewer->clearActiveSelection(); - d->m_optTlX->setValue(0.0); - d->m_optTlY->setValue(0.0); - d->m_optBrX->setValue(xmax); - d->m_optBrY->setValue(ymax); + return; } - if (d->m_optBrY->getUnit() == SANE_UNIT_MM) { - // clear selection if values are out of bounds - if (topLeft.x() > xmax || topLeft.y() > ymax || bottomRight.x() > xmax || bottomRight.y() > ymax) { - d->m_previewViewer->clearActiveSelection(); - d->m_optTlX->setValue(0.0); - d->m_optTlY->setValue(0.0); - d->m_optBrX->setValue(xmax); - d->m_optBrY->setValue(ymax); - } - d->m_previewViewer->setSelection(topLeft.x(), topLeft.y(), bottomRight.x(), bottomRight.y()); - d->m_optTlX->setValue(topLeft.x()); - d->m_optTlY->setValue(topLeft.y()); - d->m_optBrX->setValue(bottomRight.x()); - d->m_optBrY->setValue(bottomRight.y()); - } else if (d->m_optBrY->getUnit() == SANE_UNIT_PIXEL) { - const float mmperinch = 25.4; - const float dpi = currentDPI(); - const float m = dpi / mmperinch; - if (m * topLeft.x() > xmax || m * topLeft.y() > ymax || m * bottomRight.x() > xmax || m * bottomRight.y() > ymax) { - d->m_previewViewer->clearActiveSelection(); - d->m_optTlX->setValue(0.0); - d->m_optTlY->setValue(0.0); - d->m_optBrX->setValue(xmax); - d->m_optBrY->setValue(ymax); - } - d->m_previewViewer->setSelection(m * topLeft.x(), m * topLeft.y(), m * bottomRight.x(), m * bottomRight.y()); - d->m_optTlX->setValue(m * topLeft.x()); - d->m_optTlY->setValue(m * topLeft.y()); - d->m_optBrX->setValue(m * bottomRight.x()); - d->m_optBrY->setValue(m * bottomRight.y()); - } + float tlxRatio = topLeft.x()/xmax; + float tlyRatio = topLeft.y()/ymax; + float brxRatio = bottomRight.x()/xmax; + float bryRatio = bottomRight.y()/ymax; + + d->m_previewViewer->setSelection(tlxRatio, tlyRatio, brxRatio, bryRatio); } void KSaneWidget::setOptionsCollapsed(bool collapse) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksane-15.12.3/src/ksanewidget_p.cpp new/libksane-16.04.1/src/ksanewidget_p.cpp --- old/libksane-15.12.3/src/ksanewidget_p.cpp 2015-10-16 09:52:39.000000000 +0200 +++ new/libksane-16.04.1/src/ksanewidget_p.cpp 2016-03-15 13:43:23.000000000 +0100 @@ -1067,6 +1067,7 @@ m_activityFrame->hide(); m_btnFrame->hide(); m_optionPollTmr.stop(); + emit(q->scanProgress(0)); } else { m_warmingUp->hide(); m_activityFrame->hide(); @@ -1074,6 +1075,7 @@ if (m_pollList.size() > 0) { m_optionPollTmr.start(); } + emit(q->scanProgress(100)); } m_optsTabWidget->setDisabled(busy);
