Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2020-02-24 15:54:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nomacs (Old) and /work/SRC/openSUSE:Factory/.nomacs.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nomacs" Mon Feb 24 15:54:18 2020 rev:22 rq:778633 version:3.12 Changes: -------- --- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes 2019-09-04 09:13:35.246952782 +0200 +++ /work/SRC/openSUSE:Factory/.nomacs.new.26092/nomacs.changes 2020-02-24 15:56:15.935980004 +0100 @@ -1,0 +2,7 @@ +Sun Feb 23 19:28:57 UTC 2020 - Alexei Sorokin <[email protected]> + +- Add nomacs-3.12-fix-DkImageStorage.patch: Fix DkImageStorage + (commits e4d0c079, 7779c75b). +- Drop openSUSE Leap 42.x support. + +------------------------------------------------------------------- New: ---- nomacs-3.12-fix-DkImageStorage.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nomacs.spec ++++++ --- /var/tmp/diff_new_pack.yXZIKD/_old 2020-02-24 15:56:17.515983272 +0100 +++ /var/tmp/diff_new_pack.yXZIKD/_new 2020-02-24 15:56:17.519983280 +0100 @@ -1,7 +1,7 @@ # # spec file for package nomacs # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,12 @@ Summary: Lightweight image viewer License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers -Url: https://nomacs.org/ +URL: https://nomacs.org/ Source: https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -Patch0: Fix-build-with-GCC9.patch +# PATCH-FIX-UPSTREAM nomacs-3.12-fix-DkImageStorage.patch [email protected] -- Fix DkImageStorage (commits e4d0c079, 7779c75b). +Patch0: nomacs-3.12-fix-DkImageStorage.patch +# PATCH-FIX-UPSTREAM Fix-build-with-GCC9.patch [email protected] -- Fix build with GCC9 (commit 37805e3b). +Patch1: Fix-build-with-GCC9.patch BuildRequires: cmake >= 2.8 BuildRequires: fdupes BuildRequires: gcc-c++ @@ -56,8 +59,8 @@ %lang_package %prep -%setup -q -%patch0 -p1 +%autosetup -p1 + sed -i 's/\r$//g' ImageLounge/Readme/* %build @@ -69,16 +72,13 @@ -DUSE_SYSTEM_QUAZIP=ON \ -DCMAKE_SHARED_LINKER_FLAGS="" \ -DENABLE_TRANSLATIONS=ON -make %{?_smp_mflags} V=1 +%make_build popd %install pushd ImageLounge/ %cmake_install popd -%if 0%{?suse_version} < 1500 -mv %{buildroot}%{_datadir}/{metainfo,appdata}/ -%endif rm %{buildroot}%{_libdir}/lib%{name}*.so %suse_update_desktop_file %{name} @@ -88,24 +88,12 @@ sed -i -E 's|(%{_datadir}.*)$|"\1"|' %{name}.lang %fdupes %{buildroot}%{_datadir}/ -%post -/sbin/ldconfig -%if 0%{?suse_version} < 1500 -%desktop_database_post -%endif - -%postun -/sbin/ldconfig -%if 0%{?suse_version} < 1500 -%desktop_database_postun -%endif +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig %files -%if 0%{?suse_version} >= 1500 %license ImageLounge/Readme/COPYRIGHT ImageLounge/Readme/LICENSE* -%else -%doc ImageLounge/Readme/COPYRIGHT ImageLounge/Readme/LICENSE* -%endif %doc ImageLounge/Readme/README %{_bindir}/%{name} %{_libdir}/lib%{name}*.so.* @@ -113,13 +101,8 @@ %exclude "%{_datadir}/nomacs/Image Lounge/translations/" %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}.* -%if 0%{?suse_version} >= 1500 %dir %{_datadir}/metainfo/ %{_datadir}/metainfo/%{name}.appdata.xml -%else -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml -%endif %{_mandir}/man?/%{name}.?%{?ext_man} %files lang -f %{name}.lang ++++++ nomacs-3.12-fix-DkImageStorage.patch ++++++ --- a/ImageLounge/src/DkCore/DkImageStorage.cpp +++ b/ImageLounge/src/DkCore/DkImageStorage.cpp @@ -1424,7 +1424,7 @@ void DkImage::mapGammaTable(cv::Mat& img qDebug() << "gamma computation takes: " << dt; } -void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale) { +void DkImage::logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale) { cv::Mat mapx, mapy; --- a/ImageLounge/src/DkCore/DkImageStorage.h +++ b/ImageLounge/src/DkCore/DkImageStorage.h @@ -95,7 +95,7 @@ public: static void mapGammaTable(cv::Mat& img, const QVector<unsigned short>& gammaTable); static void gammaToLinear(cv::Mat& img); static void linearToGamma(cv::Mat& img); - static void logPolar(const cv::Mat& src, cv::Mat& dst, CvPoint2D32f center, double scaleLog, double angle, double scale = 1.0); + static void logPolar(const cv::Mat& src, cv::Mat& dst, cv::Point2d center, double scaleLog, double angle, double scale = 1.0); static void tinyPlanet(QImage& img, double scaleLog, double angle, QSize s, bool invert = false); #endif
