Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2015-03-03 11:16:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-27 11:09:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-03-03 11:16:36.000000000 +0100 @@ -1,0 +2,13 @@ +Mon Mar 2 23:11:02 UTC 2015 - sor.alexei@meowr.ru + +- Update to 2.4.2: + * Image Manipulations are fixed now (black images on e.g. gamma). + * Resize with gamma correction (black images if gamma was + checked). + * Crash fix (if reload occurred after an image resize). + * Fix Batch Processing. + * Fix GIF movie toolbar. + * Update translations. +- Add nomacs-qt5-build-fix.patch. + +------------------------------------------------------------------- Old: ---- nomacs-2.4.0-source.tar.bz2 New: ---- nomacs-2.4.2-source.tar.bz2 nomacs-qt5-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.ZAbo7w/_old 2015-03-03 11:16:37.000000000 +0100 +++ /var/tmp/diff_new_pack.ZAbo7w/_new 2015-03-03 11:16:37.000000000 +0100 @@ -17,13 +17,15 @@ Name: nomacs -Version: 2.4.0 +Version: 2.4.2 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 +# 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 BuildRequires: dos2unix BuildRequires: gcc-c++ @@ -51,21 +53,27 @@ %prep %setup -q +%patch0 -p1 dos2unix Readme/* find src -type f -name '*.cpp' | while read f; do # Fix encoding issues in nomacs with Qt5. - dos2unix "$f" && iconv -f iso-8859-2 -t utf-8 "$f" > "$f.new" && mv -f "$f.new" "$f" + dos2unix "$f" && \ + iconv -f iso-8859-2 -t utf-8 "$f" > "$f.new" && \ + mv -f "$f.new" "$f" done %build %cmake \ + -DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \ + -DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \ -DENABLE_QT5=1 \ -DQT_QMAKE_EXECUTABLE=%{_libdir}/qt5/bin/qmake make %{?_smp_mflags} %install %cmake_install -install -Dm 0644 %{name}.appdata.xml %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +install -Dm 0644 %{name}.appdata.xml \ + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %suse_update_desktop_file %{name} %find_lang %{name} --with-qt ++++++ nomacs-2.4.0-source.tar.bz2 -> nomacs-2.4.2-source.tar.bz2 ++++++ ++++ 98196 lines of diff (skipped) ++++++ nomacs-qt5-build-fix.patch ++++++ diff -aur a/src/DkDialog.cpp b/src/DkDialog.cpp --- a/src/DkDialog.cpp +++ b/src/DkDialog.cpp @@ -1800,11 +1800,10 @@ QItemDelegate::setEditorData(editor, index); } -#if QT_VERSION < 0x050000 void DkShortcutDelegate::textChanged(QString text) { emit checkDuplicateSignal(text, item); } -#else +#if QT_VERSION >= 0x050000 void DkShortcutDelegate::keySequenceChanged(const QKeySequence& keySequence) { emit checkDuplicateSignal(keySequence, item); } @@ -1948,6 +1947,7 @@ return createIndex(parentItem->row(), 0, parentItem); } + int DkShortcutsModel::rowCount(const QModelIndex& parent) const { TreeItem *parentItem; diff -aur a/src/DkDialog.h b/src/DkDialog.h --- a/src/DkDialog.h +++ b/src/DkDialog.h @@ -407,9 +407,8 @@ void clearDuplicateSignal() const; protected slots: -#if QT_VERSION < 0x050000 void textChanged(QString text = QString()); -#else +#if QT_VERSION >= 0x050000 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 @@ 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); return; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org