Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2015-04-18 10:41:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nomacs (Old) and /work/SRC/openSUSE:Factory/.nomacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nomacs" Changes: -------- --- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes 2015-03-03 11:16:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-04-18 10:41:07.000000000 +0200 @@ -1,0 +2,15 @@ +Thu Apr 17 12:32:23 UTC 2015 - sor.alexei@meowr.ru + +- Update to 2.4.4: + * Improved batch processing (add images from multiple directories). + * New Metadata HUD panel (choose entries dynamically). + * Default strings are now translated. + * File sorting is (hopefully) fixed. + * Gamma correction for rescaling is now 16 bit (smooth gradients). + * Zoom to Fit added (replaces ‘Reset Zoom’). + * Saving of multiple tabs. + * UTF-8 encoding for image notes. + * General stability improvements. +- Rebase nomacs-qt5-build-fix.patch. + +------------------------------------------------------------------- Old: ---- nomacs-2.4.2-source.tar.bz2 New: ---- nomacs-2.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.yWtsFA/_old 2015-04-18 10:41:08.000000000 +0200 +++ /var/tmp/diff_new_pack.yWtsFA/_new 2015-04-18 10:41:08.000000000 +0200 @@ -17,13 +17,13 @@ Name: nomacs -Version: 2.4.2 +Version: 2.4.4 Release: 0 Summary: Lightweight image viewer License: GPL-3.0+ Group: Productivity/Graphics/Viewers Url: http://nomacs.org/ -Source: http://downloads.sf.net/%{name}/%{name}-%{version}-source.tar.bz2 +Source: http://downloads.sf.net/%{name}/%{name}-%{version}-source.tar.bz2#/%{name}-%{version}.tar.bz2 # PATCH-FIX-UPSTREAM nomacs-qt5-build-fix.patch sor.alexei@meowr.ru -- Fix build with Qt5. Patch0: %{name}-qt5-build-fix.patch BuildRequires: cmake >= 2.6 ++++++ nomacs-2.4.2-source.tar.bz2 -> nomacs-2.4.4.tar.bz2 ++++++ ++++ 23640 lines of diff (skipped) ++++++ nomacs-qt5-build-fix.patch ++++++ --- /var/tmp/diff_new_pack.yWtsFA/_old 2015-04-18 10:41:09.000000000 +0200 +++ /var/tmp/diff_new_pack.yWtsFA/_new 2015-04-18 10:41:09.000000000 +0200 @@ -1,7 +1,15 @@ diff -aur a/src/DkDialog.cpp b/src/DkDialog.cpp --- a/src/DkDialog.cpp -+++ b/src/DkDialog.cpp -@@ -1800,11 +1800,10 @@ ++++ a/src/DkDialog.cpp +@@ -1668,6 +1668,7 @@ + if (img.isNull() /*|| !isVisible()*/) + return; + ++ + //// fix layout issues - sorry + //origView->setFixedWidth(width()*0.5f-30); + //previewLabel->setFixedWidth(origView->width()-2); +@@ -1802,11 +1803,10 @@ QItemDelegate::setEditorData(editor, index); } @@ -14,18 +22,18 @@ void DkShortcutDelegate::keySequenceChanged(const QKeySequence& keySequence) { emit checkDuplicateSignal(keySequence, item); } -@@ -1948,6 +1947,7 @@ - return createIndex(parentItem->row(), 0, parentItem); - } +@@ -2988,6 +2988,7 @@ + controlLayout->addWidget(overwrite, 3, 3); + controlLayout->setColumnStretch(5, 1); + - int DkShortcutsModel::rowCount(const QModelIndex& parent) const { - - TreeItem *parentItem; + // shows the image if it could be loaded + viewport = new DkBaseViewPort(this); + viewport->setForceFastRendering(true); diff -aur a/src/DkDialog.h b/src/DkDialog.h --- a/src/DkDialog.h -+++ b/src/DkDialog.h -@@ -407,9 +407,8 @@ ++++ a/src/DkDialog.h +@@ -410,9 +410,8 @@ void clearDuplicateSignal() const; protected slots: @@ -36,27 +44,15 @@ void keySequenceChanged(const QKeySequence& keySequence); #endif -diff -aur a/src/DkMetaData.cpp b/src/DkMetaData.cpp ---- a/src/DkMetaData.cpp -+++ b/src/DkMetaData.cpp -@@ -1067,7 +1067,7 @@ - QString info; - - if (QString::fromStdString(exifString).contains("charset=\"ASCII\"", Qt::CaseInsensitive)) { -- info = QString::fromAscii((char*)(exifString.c_str()), exifString.size()); -+ info = QString::fromLatin1((char*)(exifString.c_str()), exifString.size()); - info = info.replace("charset=\"ASCII\" ", "", Qt::CaseInsensitive); - } - else { diff -aur a/src/DkUtils.h b/src/DkUtils.h --- a/src/DkUtils.h +++ b/src/DkUtils.h -@@ -169,7 +169,7 @@ +@@ -174,7 +174,7 @@ static void printMat(const cv::Mat src, const char* varName) { if (src.depth() != CV_32FC1) { - //qDebug() << "I could not visualize the mat: " << QString::fromAscii(varName); -+ //qDebug() << "I could not visualize the mat: " << QString::fromLatin1(varName); ++ //qDebug() << "I could not visualize the mat: " << QString::fromLatin(varName); return; }