Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2014-11-13 09:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-11-04 17:28:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2014-11-13 09:18:29.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Nov 12 11:13:02 UTC 2014 - [email protected] + +- Update to 2.2.0: + * Bugfixes and new features + (see http://nomacs.org/redmine for details). +- Compile against Qt5 instead of Qt4. +- Rebase nomacs-strcmp-fix.patch. +- Add nomacs-qt5-build-fix.patch. + +------------------------------------------------------------------- Old: ---- nomacs-2.0.2-source.tar.bz2 New: ---- nomacs-2.2.0-source.tar.bz2 nomacs-qt5-build-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.Sp3Pv7/_old 2014-11-13 09:18:30.000000000 +0100 +++ /var/tmp/diff_new_pack.Sp3Pv7/_new 2014-11-13 09:18:30.000000000 +0100 @@ -17,22 +17,27 @@ Name: nomacs -Version: 2.0.2 +Version: 2.2.0 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-strcmp-fix.patch [email protected] -- Fix build by correcting string comparison. +# PATCH-FIX-UPSTREAM nomacs-strcmp-fix.patch [email protected] -- Correct string comparison. Patch0: nomacs-strcmp-fix.patch +# PATCH-FIX-UPSTREAM nomacs-qt5-build-fix.patch [email protected] -- Fix build with Qt5. +Patch1: nomacs-qt5-build-fix.patch BuildRequires: cmake >= 2.6 BuildRequires: dos2unix BuildRequires: gcc-c++ +BuildRequires: libqt5-linguist-devel BuildRequires: pkg-config BuildRequires: update-desktop-files -# nomacs yet probably does not build with Qt5. -BuildRequires: pkgconfig(QtGui) +BuildRequires: pkgconfig(Qt5Concurrent) +BuildRequires: pkgconfig(Qt5Network) +BuildRequires: pkgconfig(Qt5PrintSupport) +BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(exiv2) BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(libraw) @@ -50,18 +55,24 @@ %prep %setup -q %patch0 -p1 +%patch1 -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" +done %build %cmake \ -DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \ -DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \ - -DENABLE_QT5=0 \ - -DQT_QMAKE_EXECUTABLE=%{_bindir}/qmake + -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 %suse_update_desktop_file %{name} %find_lang %{name} --with-qt @@ -76,6 +87,7 @@ %doc Readme/* %{_bindir}/%{name} %{_datadir}/%{name}/ +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.png %{_mandir}/man1/* ++++++ nomacs-2.0.2-source.tar.bz2 -> nomacs-2.2.0-source.tar.bz2 ++++++ ++++ 126843 lines of diff (skipped) ++++++ nomacs-qt5-build-fix.patch ++++++ diff -ur a/src/DkThumbsWidgets.h b/src/DkThumbsWidgets.h --- a/src/DkThumbsWidgets.h +++ b/src/DkThumbsWidgets.h @@ -28,6 +28,7 @@ #pragma once #include <QProcess> +#include <QDrag> #include "DkWidgets.h" ++++++ nomacs-strcmp-fix.patch ++++++ --- /var/tmp/diff_new_pack.Sp3Pv7/_old 2014-11-13 09:18:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Sp3Pv7/_new 2014-11-13 09:18:31.000000000 +0100 @@ -1,6 +1,6 @@ --- a/src/DkBasicLoader.cpp +++ b/src/DkBasicLoader.cpp -@@ -334,7 +334,7 @@ +@@ -358,7 +358,7 @@ //unpack the data error = iProcessor.unpack(); @@ -9,10 +9,3 @@ iProcessor.raw2image(); if (error != LIBRAW_SUCCESS) -@@ -1299,4 +1299,4 @@ - #endif - - --} -\ No newline at end of file -+} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
