Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2015-08-23 15:43:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-18 10:41:07.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-08-23 17:45:29.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Aug 20 17:47:01 UTC 2015 - [email protected] + +- Update to 2.4.6: + * Directory ScrollBar added again (and updated). + * Fix various crashes (metadata saving/displaying). + * Fix sorting. + * Fix some minor bugs. +- Rebase nomacs-qt5-build-fix.patch. + +------------------------------------------------------------------- Old: ---- nomacs-2.4.4.tar.bz2 New: ---- nomacs-2.4.6-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.RMLd6x/_old 2015-08-23 17:45:30.000000000 +0200 +++ /var/tmp/diff_new_pack.RMLd6x/_new 2015-08-23 17:45:30.000000000 +0200 @@ -17,19 +17,20 @@ Name: nomacs -Version: 2.4.4 +Version: 2.4.6 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#/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM nomacs-qt5-build-fix.patch [email protected] -- Fix build with Qt5. +Source: http://downloads.sf.net/%{name}/%{name}-%{version}-source.tar.bz2 +# PATCH-FIX-OPENSUSE nomacs-qt5-build-fix.patch [email protected] -- Fix build with Qt5. Patch0: %{name}-qt5-build-fix.patch BuildRequires: cmake >= 2.6 BuildRequires: dos2unix BuildRequires: gcc-c++ BuildRequires: libqt5-linguist-devel +BuildRequires: opencv-qt5-devel BuildRequires: pkg-config BuildRequires: quazip-devel BuildRequires: update-desktop-files @@ -41,7 +42,6 @@ BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libraw) BuildRequires: pkgconfig(libtiff-4) -BuildRequires: pkgconfig(opencv) BuildRequires: pkgconfig(zlib) %description @@ -90,6 +90,7 @@ %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png +%dir %{_datadir}/appdata/ %{_datadir}/appdata/%{name}.appdata.xml %{_mandir}/man?/%{name}.?%{?ext_man} ++++++ nomacs-qt5-build-fix.patch ++++++ --- /var/tmp/diff_new_pack.RMLd6x/_old 2015-08-23 17:45:30.000000000 +0200 +++ /var/tmp/diff_new_pack.RMLd6x/_new 2015-08-23 17:45:30.000000000 +0200 @@ -1,15 +1,6 @@ -diff -aur a/src/DkDialog.cpp b/src/DkDialog.cpp --- a/src/DkDialog.cpp -+++ 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 @@ ++++ b/src/DkDialog.cpp +@@ -1809,11 +1809,10 @@ QItemDelegate::setEditorData(editor, index); } @@ -22,17 +13,8 @@ void DkShortcutDelegate::keySequenceChanged(const QKeySequence& keySequence) { emit checkDuplicateSignal(keySequence, item); } -@@ -2988,6 +2988,7 @@ - controlLayout->addWidget(overwrite, 3, 3); - controlLayout->setColumnStretch(5, 1); - -+ - // 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 -+++ a/src/DkDialog.h ++++ b/src/DkDialog.h @@ -410,9 +410,8 @@ void clearDuplicateSignal() const; @@ -44,7 +26,6 @@ void keySequenceChanged(const QKeySequence& keySequence); #endif -diff -aur a/src/DkUtils.h b/src/DkUtils.h --- a/src/DkUtils.h +++ b/src/DkUtils.h @@ -174,7 +174,7 @@ @@ -52,7 +33,7 @@ if (src.depth() != CV_32FC1) { - //qDebug() << "I could not visualize the mat: " << QString::fromAscii(varName); -+ //qDebug() << "I could not visualize the mat: " << QString::fromLatin(varName); ++ //qDebug() << "I could not visualize the mat: " << QString::fromLatin1(varName); return; }
