commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2020-11-09 13:57:24
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new.11331 (New)
Package is "nomacs"
Mon Nov 9 13:57:24 2020 rev:25 rq:844929 version:3.16.224
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2020-08-10
14:57:34.675987180 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new.11331/nomacs.changes 2020-11-09
13:58:51.455774863 +0100
@@ -1,0 +2,7 @@
+Thu Oct 29 19:29:54 UTC 2020 - Petr Vanek
+
+- QuaZip1 migration
+ * patch quazip1_cmake_remove_after_new_version.diff also
+ sent to the upstream
+
+---
New:
quazip1_cmake_remove_after_new_version.diff
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.zeJHHn/_old 2020-11-09 13:58:51.995773685 +0100
+++ /var/tmp/diff_new_pack.zeJHHn/_new 2020-11-09 13:58:51.999773676 +0100
@@ -24,6 +24,7 @@
Group: Productivity/Graphics/Viewers
URL:https://nomacs.org/
Source:
https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0: quazip1_cmake_remove_after_new_version.diff
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -56,6 +57,7 @@
%prep
%setup -q
+%patch0 -p1
%build
pushd ImageLounge/
++ quazip1_cmake_remove_after_new_version.diff ++
diff --git a/ImageLounge/cmake/Unix.cmake b/ImageLounge/cmake/Unix.cmake
index 5567084b..c90ba320 100644
--- a/ImageLounge/cmake/Unix.cmake
+++ b/ImageLounge/cmake/Unix.cmake
@@ -102,14 +102,26 @@ unset(QT_ROOT CACHE)
if(ENABLE_QUAZIP)
if(USE_SYSTEM_QUAZIP)
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
-
-find_package(QuaZip5 QUIET)
-if(NOT QUAZIP_FOUND)
- message(FATAL_ERROR "QUAZIP not found. It's mandatory when used
with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
-else()
- add_definitions(-DWITH_QUAZIP)
-endif()
+# Let's try QuaZip1 first (it's the bright future)
+find_package(QuaZip-Qt5 QUIET)
+if (QuaZip-Qt5_FOUND)
+ message(STATUS "QUAZIP: QuaZip-1 for Qt5 found")
+ set(QUAZIP_LIBRARIES QuaZip::QuaZip)
+ add_definitions(-DWITH_QUAZIP1)
+else ()
+ message(WARNING "QUAZIP: 1.x not found. Trying to find 0.x")
+ # QuaZip < 1.0. This leg can be removed (including
cmake/FindQuaZip5.cmake)
+ # ater the final migration to 1.x in Linux distros
+ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+ find_package(QuaZip5 QUIET)
+ if(NOT QUAZIP_FOUND)
+message(FATAL_ERROR "QUAZIP: even 0.x not found. It's mandatory when
used with ENABLE_QUAZIP enabled, you can also disable USE_SYSTEM_QUAZIP")
+ endif()
+
+endif (QuaZip-Qt5_FOUND)
+# we have any QuaZip after all
+add_definitions(-DWITH_QUAZIP)
else()
find_package(ZLIB REQUIRED)
set(QUAZIP_INCLUDE_DIRECTORY
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/quazip
${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/quazip-0.7/)
diff --git a/ImageLounge/src/DkCore/DkBasicLoader.cpp
b/ImageLounge/src/DkCore/DkBasicLoader.cpp
index 7f9e889c..b7edfd43 100644
--- a/ImageLounge/src/DkCore/DkBasicLoader.cpp
+++ b/ImageLounge/src/DkCore/DkBasicLoader.cpp
@@ -54,8 +54,12 @@
// quazip
#ifdef WITH_QUAZIP
+#ifdef WITH_QUAZIP1
+#include
+#else
#include
#endif
+#endif
// opencv
#ifdef WITH_OPENCV
diff --git a/ImageLounge/src/DkCore/DkImageContainer.cpp
b/ImageLounge/src/DkCore/DkImageContainer.cpp
index 810994d3..150da9c2 100644
--- a/ImageLounge/src/DkCore/DkImageContainer.cpp
+++ b/ImageLounge/src/DkCore/DkImageContainer.cpp
@@ -41,8 +41,12 @@
// quazip
#ifdef WITH_QUAZIP
+#ifdef WITH_QUAZIP1
+#include
+#else
#include
#endif
+#endif
#pragma warning(pop) // no warnings from includes - end
#pragma warning(disable: 4251) // TODO: remove
diff --git a/ImageLounge/src/DkCore/DkImageLoader.cpp
b/ImageLounge/src/DkCore/DkImageLoader.cpp
index 09d25d23..e4186f2b 100644
--- a/ImageLounge/src/DkCore/DkImageLoader.cpp
+++ b/ImageLounge/src/DkCore/DkImageLoader.cpp
@@ -79,8 +79,12 @@
// quazip
#ifdef WITH_QUAZIP
+#ifdef WITH_QUAZIP1
+#include
+#else
#include
#endif
+#endif
// opencv
#ifdef WITH_OPENCV
@@ -2212,4 +2216,4 @@ QString DkImageLoader::fileName() const {
return mCurrentImage->fileName();
}
-}
\ No newline at end of file
+}
diff --git a/ImageLounge/src/DkGui/DkDialog.cpp
b/ImageLounge/src/DkGui/DkDialog.cpp
index 008c9a3b..85842eca 100644
--- a/ImageLounge/src/DkGui/DkDialog.cpp
+++ b/Image
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2020-08-10 14:57:14
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new.3399 (New)
Package is "nomacs"
Mon Aug 10 14:57:14 2020 rev:24 rq:824894 version:3.16.224
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2020-03-17
13:10:45.713827372 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new.3399/nomacs.changes 2020-08-10
14:57:34.675987180 +0200
@@ -1,0 +2,12 @@
+Fri Aug 7 00:29:08 UTC 2020 - Namor Barcode - 3.16.224
+
+- Update to version 3.16.224
+ * avif support
+ * cr3, pcx support added
+ * default system theme added
+ * edit: adds blur
+ * translations updated
+ * plugins: adds composite image plugin
+ * bug fixes
+
+---
Old:
nomacs-3.14.tar.gz
New:
nomacs-3.16.224.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.0QhMJG/_old 2020-08-10 14:57:36.115987940 +0200
+++ /var/tmp/diff_new_pack.0QhMJG/_new 2020-08-10 14:57:36.119987942 +0200
@@ -17,7 +17,7 @@
Name: nomacs
-Version:3.14
+Version:3.16.224
Release:0
Summary:Lightweight image viewer
License:GPL-3.0-or-later
@@ -56,7 +56,6 @@
%prep
%setup -q
-sed -i 's/\r$//g' ImageLounge/Readme/*
%build
pushd ImageLounge/
@@ -76,7 +75,7 @@
popd
rm %{buildroot}%{_libdir}/lib%{name}*.so
-%suse_update_desktop_file %{name}
+%suse_update_desktop_file org.%{name}.ImageLounge
%find_lang %{name} --with-qt
# find_lang doesn't escape paths, but language paths contain "Image Lounge"
with space,
# we'll escape the paths manually
@@ -88,16 +87,16 @@
%postun -p /sbin/ldconfig
%files
-%license ImageLounge/Readme/COPYRIGHT ImageLounge/Readme/LICENSE*
-%doc ImageLounge/Readme/README
%{_bindir}/%{name}
%{_libdir}/lib%{name}*.so.*
%{_datadir}/%{name}/
%exclude "%{_datadir}/nomacs/Image Lounge/translations/"
-%{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.*
+%{_datadir}/applications/org.%{name}.ImageLounge.desktop
+%dir %{_datadir}/icons/hicolor/scalable
+%dir %{_datadir}/icons/hicolor/scalable/apps
+%{_datadir}/icons/hicolor/scalable/apps/org.%{name}.ImageLounge.svg
%dir %{_datadir}/metainfo/
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_datadir}/metainfo/org.%{name}.ImageLounge.appdata.xml
%{_mandir}/man?/%{name}.?%{?ext_man}
%files lang -f %{name}.lang
++ nomacs-3.14.tar.gz -> nomacs-3.16.224.tar.gz ++
104187 lines of diff (skipped)
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2020-03-17 13:10:31
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new.3160 (New)
Package is "nomacs"
Tue Mar 17 13:10:31 2020 rev:23 rq:785740 version:3.14
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2020-02-24
15:56:15.935980004 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new.3160/nomacs.changes 2020-03-17
13:10:45.713827372 +0100
@@ -1,0 +2,11 @@
+Mon Mar 16 18:29:49 UTC 2020 - Alexei Sorokin
+
+- Update to version 3.14:
+ * Add HEIF/HEIC support.
+ * Add metadata filtering.
+ * Reduce start-up time.
+ * Bug fixes.
+- Remove nomacs-3.12-fix-DkImageStorage.patch,
+ Fix-build-with-GCC9.patch: fixed upstream.
+
+---
Old:
Fix-build-with-GCC9.patch
nomacs-3.12-fix-DkImageStorage.patch
nomacs-3.12.tar.gz
New:
nomacs-3.14.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.ZYrzKI/_old 2020-03-17 13:10:46.217827759 +0100
+++ /var/tmp/diff_new_pack.ZYrzKI/_new 2020-03-17 13:10:46.221827763 +0100
@@ -17,17 +17,13 @@
Name: nomacs
-Version:3.12
+Version:3.14
Release:0
Summary:Lightweight image viewer
License:GPL-3.0-or-later
Group: Productivity/Graphics/Viewers
URL:https://nomacs.org/
Source:
https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM nomacs-3.12-fix-DkImageStorage.patch aro...@archlinux.org
-- Fix DkImageStorage (commits e4d0c079, 7779c75b).
-Patch0: nomacs-3.12-fix-DkImageStorage.patch
-# PATCH-FIX-UPSTREAM Fix-build-with-GCC9.patch kensing...@gentoo.org -- Fix
build with GCC9 (commit 37805e3b).
-Patch1: Fix-build-with-GCC9.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -59,8 +55,7 @@
%lang_package
%prep
-%autosetup -p1
-
+%setup -q
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
++ nomacs-3.12.tar.gz -> nomacs-3.14.tar.gz ++
358816 lines of diff (skipped)
commit nomacs for openSUSE:Factory
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.changes2019-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
+
+- 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 aro...@archlinux.org
-- Fix DkImageStorage (commits e4d0c079, 7779c75b).
+Patch0: nomacs-3.12-fix-DkImageStorage.patch
+# PATCH-FIX-UPSTREAM Fix-build-with-GCC9.patch kensing...@gentoo.org -- 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&
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
c
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2019-09-04 09:13:06
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new.7948 (New)
Package is "nomacs"
Wed Sep 4 09:13:06 2019 rev:21 rq:727842 version:3.12
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2019-02-24
17:10:10.256509777 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new.7948/nomacs.changes 2019-09-04
09:13:35.246952782 +0200
@@ -1,0 +2,5 @@
+Mon Sep 2 10:34:00 UTC 2019 - Christophe Giboudeaux
+
+- Add Fix-build-with-GCC9.patch.
+
+---
New:
Fix-build-with-GCC9.patch
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.Plh5gM/_old 2019-09-04 09:13:36.046952671 +0200
+++ /var/tmp/diff_new_pack.Plh5gM/_new 2019-09-04 09:13:36.046952671 +0200
@@ -24,6 +24,7 @@
Group: Productivity/Graphics/Viewers
Url:https://nomacs.org/
Source:
https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0: Fix-build-with-GCC9.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -56,6 +57,7 @@
%prep
%setup -q
+%patch0 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
++ Fix-build-with-GCC9.patch ++
>From 37805e3bc8753970127db101f4aa0c061bc5a70d Mon Sep 17 00:00:00 2001
From: Michael Palimaka
Date: Sun, 9 Jun 2019 19:15:28 +1000
Subject: [PATCH] Fix build with GCC9
---
ImageLounge/src/DkCore/DkMetaData.cpp | 2 ++
ImageLounge/src/DkGui/DkNoMacs.cpp| 2 ++
2 files changed, 4 insertions(+)
diff --git a/ImageLounge/src/DkCore/DkMetaData.cpp
b/ImageLounge/src/DkCore/DkMetaData.cpp
index d195757..affec7b 100644
--- a/ImageLounge/src/DkCore/DkMetaData.cpp
+++ b/ImageLounge/src/DkCore/DkMetaData.cpp
@@ -42,6 +42,8 @@
#include
#pragma warning(pop) // no warnings from includes - end
+#include
+
namespace nmc {
// DkMetaDataT
diff --git a/ImageLounge/src/DkGui/DkNoMacs.cpp
b/ImageLounge/src/DkGui/DkNoMacs.cpp
index 6a412f7..bbfba23 100644
--- a/ImageLounge/src/DkGui/DkNoMacs.cpp
+++ b/ImageLounge/src/DkGui/DkNoMacs.cpp
@@ -96,6 +96,8 @@
#include
#endif
+#include
+
namespace nmc {
DkNomacsOSXEventFilter::DkNomacsOSXEventFilter(QObject *parent) :
QObject(parent) {
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2019-02-24 17:10:09
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new.28833 (New)
Package is "nomacs"
Sun Feb 24 17:10:09 2019 rev:20 rq:669481 version:3.12
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2018-07-13
10:22:24.838531822 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new.28833/nomacs.changes 2019-02-24
17:10:10.256509777 +0100
@@ -1,0 +2,20 @@
+Fri Jan 25 22:00:00 UTC 2019 - pa...@pavlk.cz
+
+- Update to version 3.12:
+ * New icon theme,
+ * An improved dark theme
+ * Speed-ups
+ * Recent files panel renewed
+ * New icon theme
+ * Improved drag&drop of thumbnail preview (copy/move/link)
+ * Editable zoom levels
+ * Fill transparent background with a color added
+ * LAN client removed
+ * Batch: original filename is added to the metadata
+ * Frameless: multi-screen setup improved
+ * SVG: resulting image size can be adjusted when converting
+ * RLE compressed TGA support
+ * Bug fixes
+- Remove nomacs-use-quazip-qt5.patch.
+
+---
Old:
nomacs-3.10.2.tar.gz
nomacs-use-quazip-qt5.patch
New:
nomacs-3.12.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.d0FiDX/_old 2019-02-24 17:10:11.140509499 +0100
+++ /var/tmp/diff_new_pack.d0FiDX/_new 2019-02-24 17:10:11.140509499 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nomacs
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,20 +12,18 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: nomacs
-Version:3.10.2
+Version:3.12
Release:0
Summary:Lightweight image viewer
License:GPL-3.0-or-later
Group: Productivity/Graphics/Viewers
Url:https://nomacs.org/
Source:
https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch aloi...@gmx.com -- Link to
the Qt5 version of quazip.
-Patch0: nomacs-use-quazip-qt5.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -40,7 +38,7 @@
BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2
BuildRequires: pkgconfig(Qt5Svg) >= 5.2
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2
-BuildRequires: pkgconfig(exiv2) >= 0.25
+BuildRequires: pkgconfig(exiv2) >= 0.26
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(libraw) >= 0.17
BuildRequires: pkgconfig(libtiff-4)
@@ -58,7 +56,6 @@
%prep
%setup -q
-%patch0 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
@@ -84,6 +81,9 @@
rm %{buildroot}%{_libdir}/lib%{name}*.so
%suse_update_desktop_file %{name}
%find_lang %{name} --with-qt
+# find_lang doesn't escape paths, but language paths contain "Image Lounge"
with space,
+# we'll escape the paths manually
+sed -i -E 's|(%{_datadir}.*)$|"\1"|' %{name}.lang
%fdupes %{buildroot}%{_datadir}/
%post
@@ -108,7 +108,7 @@
%{_bindir}/%{name}
%{_libdir}/lib%{name}*.so.*
%{_datadir}/%{name}/
-%exclude %{_datadir}/%{name}/translations/
+%exclude "%{_datadir}/nomacs/Image Lounge/translations/"
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.*
%if 0%{?suse_version} >= 1500
@@ -121,6 +121,6 @@
%{_mandir}/man?/%{name}.?%{?ext_man}
%files lang -f %{name}.lang
-%dir %{_datadir}/%{name}/translations/
+%dir "%{_datadir}/nomacs/Image Lounge/translations/"
%changelog
++ nomacs-3.10.2.tar.gz -> nomacs-3.12.tar.gz ++
/work/SRC/openSUSE:Factory/nomacs/nomacs-3.10.2.tar.gz
/work/SRC/openSUSE:Factory/.nomacs.new.28833/nomacs-3.12.tar.gz differ: char
12, line 1
commit nomacs for openSUSE:Factory
Hello community, here is the log from the commit of package nomacs for openSUSE:Factory checked in at 2018-07-13 10:21:42 Comparing /work/SRC/openSUSE:Factory/nomacs (Old) and /work/SRC/openSUSE:Factory/.nomacs.new (New) Package is "nomacs" Fri Jul 13 10:21:42 2018 rev:19 rq:622269 version:3.10.2 Changes: --- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2018-07-12 09:21:53.174646910 +0200 +++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2018-07-13 10:22:24.838531822 +0200 @@ -1,0 +2,8 @@ +Thu Jul 12 08:21:30 UTC 2018 - sor.ale...@meowr.ru + +- Update to version 3.10.2: + * Fix disabling update interactions. + * Add config.ini that can be used for multi-user systems. + * Restore mng and jp2 support. + +--- Old: nomacs-3.10.1.tar.gz New: nomacs-3.10.2.tar.gz Other differences: -- ++ nomacs.spec ++ --- /var/tmp/diff_new_pack.XBHVUg/_old 2018-07-13 10:22:25.950533155 +0200 +++ /var/tmp/diff_new_pack.XBHVUg/_new 2018-07-13 10:22:25.950533155 +0200 @@ -17,7 +17,7 @@ Name: nomacs -Version:3.10.1 +Version:3.10.2 Release:0 Summary:Lightweight image viewer License:GPL-3.0-or-later ++ nomacs-3.10.1.tar.gz -> nomacs-3.10.2.tar.gz ++ /work/SRC/openSUSE:Factory/nomacs/nomacs-3.10.1.tar.gz /work/SRC/openSUSE:Factory/.nomacs.new/nomacs-3.10.2.tar.gz differ: char 29, line 1
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2018-07-12 09:20:20
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Thu Jul 12 09:20:20 2018 rev:18 rq:622074 version:3.10.1
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2018-06-19
11:56:59.868881586 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2018-07-12
09:21:53.174646910 +0200
@@ -1,0 +2,16 @@
+Wed Jul 11 06:29:18 UTC 2018 - sor.ale...@meowr.ru
+
+- Update to version 3.10.1 (changes since 3.8.1):
+ * Improve anti-aliasing.
+ * Improve printing.
+ * Print multiple pages from thumbnail preview.
+ * Support animated WebP.
+ * Support JPG compressed TIFFs.
+ * Add batch cropping.
+ * Update the PSD library.
+ * Add Qt style/ plugins.
+ * Add padding to HUD labels (e.g. zoom).
+ * Add new translations: Bosnian, Croation, Serbian.
+- Remove nomacs-3.8.1-fix-qt-5.11.patch.
+
+---
Old:
nomacs-3.8.1-fix-qt-5.11.patch
nomacs-3.8.1.tar.gz
New:
nomacs-3.10.1.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.T4ahZs/_old 2018-07-12 09:21:54.094648197 +0200
+++ /var/tmp/diff_new_pack.T4ahZs/_new 2018-07-12 09:21:54.098648203 +0200
@@ -17,7 +17,7 @@
Name: nomacs
-Version:3.8.1
+Version:3.10.1
Release:0
Summary:Lightweight image viewer
License:GPL-3.0-or-later
@@ -26,8 +26,6 @@
Source:
https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch aloi...@gmx.com -- Link to
the Qt5 version of quazip.
Patch0: nomacs-use-quazip-qt5.patch
-# PATCH-FIX-UPSTREAM nomacs-3.8.1-fix-qt-5.11.patch -- Fix Qt 5.11+
compatibility.
-Patch1: nomacs-3.8.1-fix-qt-5.11.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -61,7 +59,6 @@
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
++ nomacs-3.8.1.tar.gz -> nomacs-3.10.1.tar.gz ++
/work/SRC/openSUSE:Factory/nomacs/nomacs-3.8.1.tar.gz
/work/SRC/openSUSE:Factory/.nomacs.new/nomacs-3.10.1.tar.gz differ: char 29,
line 1
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2018-06-19 11:56:57
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Tue Jun 19 11:56:57 2018 rev:17 rq:616328 version:3.8.1
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2018-04-20
17:29:51.949677737 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2018-06-19
11:56:59.868881586 +0200
@@ -1,0 +2,5 @@
+Tue Jun 12 11:12:00 UTC 2018 - sor.ale...@meowr.ru
+
+- Add nomacs-3.8.1-fix-qt-5.11.patch: Fix Qt 5.11+ compatibility.
+
+---
New:
nomacs-3.8.1-fix-qt-5.11.patch
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.54SQqG/_old 2018-06-19 11:57:01.208831840 +0200
+++ /var/tmp/diff_new_pack.54SQqG/_new 2018-06-19 11:57:01.208831840 +0200
@@ -23,9 +23,11 @@
License:GPL-3.0-or-later
Group: Productivity/Graphics/Viewers
Url:https://nomacs.org/
-Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source:
https://github.com/nomacs/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch aloi...@gmx.com -- Link to
the Qt5 version of quazip.
Patch0: nomacs-use-quazip-qt5.patch
+# PATCH-FIX-UPSTREAM nomacs-3.8.1-fix-qt-5.11.patch -- Fix Qt 5.11+
compatibility.
+Patch1: nomacs-3.8.1-fix-qt-5.11.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -59,6 +61,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
++ nomacs-3.8.1-fix-qt-5.11.patch ++
--- a/ImageLounge/3rdparty/libqpsd/CMakeLists.txt
+++ b/ImageLounge/3rdparty/libqpsd/CMakeLists.txt
@@ -20,9 +20,7 @@ file(GLOB LIBQPSD_HEADERS "*.h")
SET(CMAKE_DEBUG_POSTFIX "d")
add_library(${PROJECT_NAME} SHARED ${LIBQPSD_SOURCES})
-target_link_libraries(${PROJECT_NAME} ${QT_LIBRARIES})
-
-qt5_use_modules(${PROJECT_NAME} Gui)
+target_link_libraries(${PROJECT_NAME} Qt5::Widgets Qt5::Gui)
set_target_properties(${PROJECT_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
set_target_properties(${PROJECT_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_BINARY_DIR}/libs)
--- a/ImageLounge/3rdparty/quazip-0.7/quazip/CMakeLists.txt
+++ b/ImageLounge/3rdparty/quazip-0.7/quazip/CMakeLists.txt
@@ -8,9 +8,9 @@ ADD_DEFINITIONS(-DQUAZIP_BUILD)
add_library(quazip SHARED ${SRCS})
set_target_properties(quazip PROPERTIES VERSION 1.0.0 SOVERSION 1)
target_include_directories(quazip PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${ZLIB_INCLUDE_DIRS})
+
# Link against ZLIB_LIBRARIES if needed (on Windows this variable is empty)
-target_link_libraries(quazip ${QT_QTMAIN_LIBRARY} ${QT_QTCORE_LIBRARY}
${ZLIB_LIBRARIES})
-qt5_use_modules(quazip Core)
+target_link_libraries(quazip Qt5::Core Qt5::Gui ${ZLIB_LIBRARIES})
# added by stefan for nomacs
# message(STATUS "binarydir: ${NOMACS_BUILD_DIRECTORY}")
--- a/ImageLounge/cmake/MacBuildTarget.cmake
+++ b/ImageLounge/cmake/MacBuildTarget.cmake
@@ -66,8 +66,8 @@ add_dependencies(
${QUAZIP_DEPENDENCY}
${LIBQPSD_LIBRARY})
-qt5_use_modules(${BINARY_NAME} Widgets Gui Network
LinguistTools PrintSupport Concurrent Svg)
-qt5_use_modules(${DLL_CORE_NAME} Widgets Gui Network LinguistTools
PrintSupport Concurrent Svg)
+target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network
Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
+target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network
Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
# core flags
set_target_properties(${DLL_CORE_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_BINARY_DIR}/libs)
--- a/ImageLounge/cmake/UnixBuildTarget.cmake
+++ b/ImageLounge/cmake/UnixBuildTarget.cmake
@@ -58,8 +58,8 @@ add_dependencies(
${QUAZIP_DEPENDENCY}
${LIBQPSD_LIBRARY})
-qt5_use_modules(${BINARY_NAME} Widgets Gui Network
LinguistTools PrintSupport Concurrent Svg)
-qt5_use_modules(${DLL_CORE_NAME} Widgets Gui Network LinguistTools
PrintSupport Concurrent Svg)
+target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network
Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
+target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network
Qt5::PrintSupport Qt5::Concurrent Qt5::Svg)
# core flags
set_target_properties(${DLL_CORE_NAME} PROPERTIES
ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_B
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2018-04-20 17:28:13
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Fri Apr 20 17:28:13 2018 rev:16 rq:597152 version:3.8.1
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2018-02-21
14:13:30.101802674 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2018-04-20
17:29:51.949677737 +0200
@@ -1,0 +2,9 @@
+Mon Apr 16 16:30:48 UTC 2018 - sor.ale...@meowr.ru
+
+- Update to version 3.8.1:
+ * Update lipqpsd.
+ * Add themes.
+ * Add a basic dark theme.
+- Use the %license tag for licences.
+
+---
Old:
nomacs-3.8.0.tar.gz
New:
nomacs-3.8.1.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.MjZfrY/_old 2018-04-20 17:29:53.677615072 +0200
+++ /var/tmp/diff_new_pack.MjZfrY/_new 2018-04-20 17:29:53.681614927 +0200
@@ -17,14 +17,14 @@
Name: nomacs
-Version:3.8.0
+Version:3.8.1
Release:0
Summary:Lightweight image viewer
-License:GPL-3.0+
+License:GPL-3.0-or-later
Group: Productivity/Graphics/Viewers
Url:https://nomacs.org/
Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch link to Qt5 version of quazip
-- aloi...@gmx.com
+# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch aloi...@gmx.com -- Link to
the Qt5 version of quazip.
Patch0: nomacs-use-quazip-qt5.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
@@ -99,7 +99,12 @@
%endif
%files
-%doc ImageLounge/Readme/*
+%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.*
%{_datadir}/%{name}/
++ nomacs-3.8.0.tar.gz -> nomacs-3.8.1.tar.gz ++
/work/SRC/openSUSE:Factory/nomacs/nomacs-3.8.0.tar.gz
/work/SRC/openSUSE:Factory/.nomacs.new/nomacs-3.8.1.tar.gz differ: char 16,
line 1
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2018-02-21 14:13:25
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Wed Feb 21 14:13:25 2018 rev:15 rq:578556 version:3.8.0
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2017-11-27
22:18:36.678198784 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2018-02-21
14:13:30.101802674 +0100
@@ -1,0 +2,5 @@
+Tue Feb 20 21:45:48 UTC 2018 - aloi...@gmx.com
+
+- Added nomacs-use-quazip-qt5.patch to link against quazip-qt5
+
+---
New:
nomacs-use-quazip-qt5.patch
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.XKNsvV/_old 2018-02-21 14:13:31.701745056 +0100
+++ /var/tmp/diff_new_pack.XKNsvV/_new 2018-02-21 14:13:31.701745056 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nomacs
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@
Group: Productivity/Graphics/Viewers
Url:https://nomacs.org/
Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE nomacs-use-quazip-qt5.patch link to Qt5 version of quazip
-- aloi...@gmx.com
+Patch0: nomacs-use-quazip-qt5.patch
BuildRequires: cmake >= 2.8
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -31,7 +33,7 @@
BuildRequires: libqt5-linguist-devel >= 5.2
BuildRequires: opencv-qt5-devel >= 2.4.6
BuildRequires: pkgconfig
-BuildRequires: quazip-devel
+BuildRequires: quazip-qt5-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2
BuildRequires: pkgconfig(Qt5Network) >= 5.2
@@ -56,6 +58,7 @@
%prep
%setup -q
+%patch0 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
@@ -64,6 +67,7 @@
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \
+ -DUSE_SYSTEM_QUAZIP=ON \
-DCMAKE_SHARED_LINKER_FLAGS="" \
-DENABLE_TRANSLATIONS=ON
make %{?_smp_mflags} V=1
@@ -73,7 +77,7 @@
pushd ImageLounge/
%cmake_install
popd
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} < 1500
mv %{buildroot}%{_datadir}/{metainfo,appdata}/
%endif
@@ -84,13 +88,13 @@
%post
/sbin/ldconfig
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} < 1500
%desktop_database_post
%endif
%postun
/sbin/ldconfig
-%if 0%{?suse_version} <= 1320
+%if 0%{?suse_version} < 1500
%desktop_database_postun
%endif
@@ -102,7 +106,7 @@
%exclude %{_datadir}/%{name}/translations/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.*
-%if 0%{?suse_version} > 1320
+%if 0%{?suse_version} >= 1500
%dir %{_datadir}/metainfo/
%{_datadir}/metainfo/%{name}.appdata.xml
%else
++ nomacs-use-quazip-qt5.patch ++
Index: nomacs-3.8.0/ImageLounge/cmake/FindQuaZIP.cmake
===
--- nomacs-3.8.0.orig/ImageLounge/cmake/FindQuaZIP.cmake
+++ nomacs-3.8.0/ImageLounge/cmake/FindQuaZIP.cmake
@@ -6,9 +6,9 @@
if(QUAZIP_INCLUDE_DIRECTORY AND QUAZIP_LIBRARIES)
set(QUAZIP_FOUND TRUE)
else()
- find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip/quazip.h)
+ find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip5/quazip.h)
- find_library(QUAZIP_LIBRARIES NAMES quazip)
+ find_library(QUAZIP_LIBRARIES NAMES quazip5)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(QUAZIP DEFAULT_MSG
QUAZIP_INCLUDE_DIRECTORY QUAZIP_LIBRARIES)
Index: nomacs-3.8.0/ImageLounge/src/DkCore/DkBasicLoader.cpp
===
--- nomacs-3.8.0.orig/ImageLounge/src/DkCore/DkBasicLoader.cpp
+++ nomacs-3.8.0/ImageLounge/src/DkCore/DkBasicLoader.cpp
@@ -53,7 +53,7 @@
// quazip
#ifdef WITH_QUAZIP
-#include
+#include
#endif
// opencv
Index: nomacs-3.8.0/ImageLounge/src/DkCore/DkImageContainer.cpp
===
--- nomacs-3.8.0.orig/ImageLounge/src/DkCore/DkImageContainer.cpp
+++ nomacs-3.8.0/ImageLounge/src/DkCore/DkImageContainer.cpp
@@ -41,7 +41,7 @@
// quazip
#ifdef WITH_QUAZIP
-#include
+#include
#endif
#pragma warning(pop) // no warnings from includes
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2017-11-27 22:18:33
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Mon Nov 27 22:18:33 2017 rev:14 rq:545903 version:3.8.0
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2017-11-15
16:55:58.744036681 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2017-11-27
22:18:36.678198784 +0100
@@ -1,0 +2,6 @@
+Sun Nov 26 22:59:10 UTC 2017 - sor.ale...@meowr.ru
+
+- Build with the Release build type (gh#opencv/opencv#10105).
+- Re-enable locales.
+
+---
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.EnORoO/_old 2017-11-27 22:18:37.958152328 +0100
+++ /var/tmp/diff_new_pack.EnORoO/_new 2017-11-27 22:18:37.962152184 +0100
@@ -25,6 +25,7 @@
Url:https://nomacs.org/
Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
BuildRequires: cmake >= 2.8
+BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: lcov
BuildRequires: libqt5-linguist-devel >= 5.2
@@ -42,6 +43,7 @@
BuildRequires: pkgconfig(libraw) >= 0.17
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(zlib)
+Recommends: %{name}-lang
%description
nomacs is a free image viewer, which is small, fast and able to handle the
@@ -50,6 +52,8 @@
computer or via LAN is possible. It allows to compare images and spot the
differences (e.g. schemes of architects to show the progress).
+%lang_package
+
%prep
%setup -q
sed -i 's/\r$//g' ImageLounge/Readme/*
@@ -57,9 +61,11 @@
%build
pushd ImageLounge/
%cmake \
+ -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \
- -DCMAKE_SHARED_LINKER_FLAGS=""
+ -DCMAKE_SHARED_LINKER_FLAGS="" \
+ -DENABLE_TRANSLATIONS=ON
make %{?_smp_mflags} V=1
popd
@@ -73,6 +79,8 @@
rm %{buildroot}%{_libdir}/lib%{name}*.so
%suse_update_desktop_file %{name}
+%find_lang %{name} --with-qt
+%fdupes %{buildroot}%{_datadir}/
%post
/sbin/ldconfig
@@ -90,6 +98,8 @@
%doc ImageLounge/Readme/*
%{_bindir}/%{name}
%{_libdir}/lib%{name}*.so.*
+%{_datadir}/%{name}/
+%exclude %{_datadir}/%{name}/translations/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.*
%if 0%{?suse_version} > 1320
@@ -101,4 +111,7 @@
%endif
%{_mandir}/man?/%{name}.?%{?ext_man}
+%files lang -f %{name}.lang
+%dir %{_datadir}/%{name}/translations/
+
%changelog
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2017-11-15 16:55:57
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Wed Nov 15 16:55:57 2017 rev:13 rq:540478 version:3.8.0
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2017-04-07
14:19:57.953558393 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2017-11-15
16:55:58.744036681 +0100
@@ -1,0 +2,13 @@
+Fri Nov 10 09:40:52 UTC 2017 - sor.ale...@meowr.ru
+
+- Update to version 3.8.0:
+ * Full PhaseOne Support (Monochrome).
+ * Optimise RAW loader (less RAM & speed-up).
+ * Improve RAW loading (reduce pink pixels).
+ * Fix Drag & Drop.
+ * Fix batch resize.
+ * Fix GPS link.
+ * Fix the translation downloader.
+- Remove nomacs-remove-datetime.patch.
+
+---
Old:
nomacs-3.6.1.tar.gz
nomacs-remove-datetime.patch
New:
nomacs-3.8.0.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.Add6JE/_old 2017-11-15 16:56:00.139985535 +0100
+++ /var/tmp/diff_new_pack.Add6JE/_new 2017-11-15 16:56:00.139985535 +0100
@@ -17,17 +17,16 @@
Name: nomacs
-Version:3.6.1
+Version:3.8.0
Release:0
Summary:Lightweight image viewer
License:GPL-3.0+
Group: Productivity/Graphics/Viewers
Url:https://nomacs.org/
Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM nomacs-remove-datetime.patch sor.ale...@meowr.ru --
Remove __DATE__ and __TIME__.
-Patch0: nomacs-remove-datetime.patch
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
+BuildRequires: lcov
BuildRequires: libqt5-linguist-devel >= 5.2
BuildRequires: opencv-qt5-devel >= 2.4.6
BuildRequires: pkgconfig
@@ -53,7 +52,6 @@
%prep
%setup -q
-%patch0 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
@@ -69,31 +67,38 @@
pushd ImageLounge/
%cmake_install
popd
-install -Dpm 0644 ImageLounge/%{name}.appdata.xml \
- %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+%if 0%{?suse_version} <= 1320
+mv %{buildroot}%{_datadir}/{metainfo,appdata}/
+%endif
rm %{buildroot}%{_libdir}/lib%{name}*.so
%suse_update_desktop_file %{name}
-%find_lang %{name} --with-qt
%post
-%desktop_database_post
/sbin/ldconfig
+%if 0%{?suse_version} <= 1320
+%desktop_database_post
+%endif
%postun
-%desktop_database_postun
/sbin/ldconfig
+%if 0%{?suse_version} <= 1320
+%desktop_database_postun
+%endif
%files
-%defattr(-,root,root)
%doc ImageLounge/Readme/*
%{_bindir}/%{name}
%{_libdir}/lib%{name}*.so.*
-%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.*
+%if 0%{?suse_version} > 1320
+%dir %{_datadir}/metainfo/
+%{_datadir}/metainfo/%{name}.appdata.xml
+%else
%dir %{_datadir}/appdata/
%{_datadir}/appdata/%{name}.appdata.xml
+%endif
%{_mandir}/man?/%{name}.?%{?ext_man}
%changelog
++ nomacs-3.6.1.tar.gz -> nomacs-3.8.0.tar.gz ++
/work/SRC/openSUSE:Factory/nomacs/nomacs-3.6.1.tar.gz
/work/SRC/openSUSE:Factory/.nomacs.new/nomacs-3.8.0.tar.gz differ: char 13,
line 1
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2017-04-07 14:19:43
Comparing /work/SRC/openSUSE:Factory/nomacs (Old)
and /work/SRC/openSUSE:Factory/.nomacs.new (New)
Package is "nomacs"
Fri Apr 7 14:19:43 2017 rev:12 rq:483209 version:3.6.1
Changes:
--- /work/SRC/openSUSE:Factory/nomacs/nomacs.changes2016-07-28
23:46:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2017-04-07
14:19:57.953558393 +0200
@@ -1,0 +2,17 @@
+Tue Mar 28 19:40:11 UTC 2017 - sor.ale...@meowr.ru
+
+- Update to version 3.6.1 (changes since 3.4):
+ * Introduce image adjustments.
+ * Add Exposure.
+ * Batch:
++ Improve profiles
++ Add image adjustments.
++ Add settings for batch plugins
+ * Extended tab functions.
+ * Settings Editor
+ * Icons for high DPI displays.
+ * Fix a crash on exit.
+ * Move bug reporting to GitHub.
+- Add nomacs-remove-datetime.patch: Remove __DATE__ and __TIME__.
+
+---
Old:
nomacs-3.4.tar.gz
New:
nomacs-3.6.1.tar.gz
nomacs-remove-datetime.patch
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.iVod9d/_old 2017-04-07 14:19:59.397354502 +0200
+++ /var/tmp/diff_new_pack.iVod9d/_new 2017-04-07 14:19:59.397354502 +0200
@@ -1,7 +1,7 @@
#
# spec file for package nomacs
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,18 +17,20 @@
Name: nomacs
-Version:3.4
+Version:3.6.1
Release:0
Summary:Lightweight image viewer
License:GPL-3.0+
Group: Productivity/Graphics/Viewers
-Url:http://nomacs.org/
+Url:https://nomacs.org/
Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM nomacs-remove-datetime.patch sor.ale...@meowr.ru --
Remove __DATE__ and __TIME__.
+Patch0: nomacs-remove-datetime.patch
BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: libqt5-linguist-devel >= 5.2
BuildRequires: opencv-qt5-devel >= 2.4.6
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: quazip-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2
@@ -51,6 +53,7 @@
%prep
%setup -q
+%patch0 -p1
sed -i 's/\r$//g' ImageLounge/Readme/*
%build
@@ -59,14 +62,14 @@
-DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_SHARED_LINKER_FLAGS=""
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
popd
%install
pushd ImageLounge/
%cmake_install
popd
-install -Dm 0644 ImageLounge/%{name}.appdata.xml \
+install -Dpm 0644 ImageLounge/%{name}.appdata.xml \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
rm %{buildroot}%{_libdir}/lib%{name}*.so
++ nomacs-3.4.tar.gz -> nomacs-3.6.1.tar.gz ++
/work/SRC/openSUSE:Factory/nomacs/nomacs-3.4.tar.gz
/work/SRC/openSUSE:Factory/.nomacs.new/nomacs-3.6.1.tar.gz differ: char 14,
line 1
++ nomacs-remove-datetime.patch ++
--- a/ImageLounge/src/DkGui/DkDialog.cpp
+++ b/ImageLounge/src/DkGui/DkDialog.cpp
@@ -227,7 +227,6 @@ QString DkSplashScreen::versionText() co
// version & build date
vt += QApplication::applicationVersion() + platform + "";
- vt += QString(__DATE__) + "";
// supplemental info
vt += "";
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2016-07-28 23:46:34
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.changes2016-06-19
10:50:30.0 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2016-07-28
23:46:38.0 +0200
@@ -1,0 +2,17 @@
+Sat Jul 23 16:15:39 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 3.4:
+ * Rework Batch UI.
+ * Add Batch Profiles.
+ * Cropping to metadata.
+ * Improve RGB to Gray.
+ * Fix crash on delete.
+ * Fix slow thumbnail rendering.
+ * Improve start-up time.
+ * Fix RAW/PSD orientation.
+- Remove nomacs-3.2.0-gcc6.patch: fixed upstream.
+- Remove /usr/lib(|64)/libnomacs*.so files: for development, yet
+ no development seem possible for nomacs now.
+- Add ldconfig to post(|un).
+
+---
Old:
nomacs-3.2.0-gcc6.patch
nomacs-3.2.0-source.tar.bz2
New:
nomacs-3.4.tar.gz
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.7IVxRS/_old 2016-07-28 23:46:40.0 +0200
+++ /var/tmp/diff_new_pack.7IVxRS/_new 2016-07-28 23:46:40.0 +0200
@@ -17,17 +17,14 @@
Name: nomacs
-Version:3.2.0
+Version:3.4
Release:0
Summary:Lightweight image viewer
License:GPL-3.0+
Group: Productivity/Graphics/Viewers
Url:http://nomacs.org/
-Source:
https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-source.tar.bz2
-# PATCH-FIX-UPSTREAM nomacs-3.2.0-gcc6.patch boo#985374 ser...@serjux.com --
Fix GCC6 errors.
-Patch0: %{name}-3.2.0-gcc6.patch
-BuildRequires: cmake >= 2.6
-BuildRequires: dos2unix
+Source:
https://github.com/%{name}/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+BuildRequires: cmake >= 2.8
BuildRequires: gcc-c++
BuildRequires: libqt5-linguist-devel >= 5.2
BuildRequires: opencv-qt5-devel >= 2.4.6
@@ -54,40 +51,40 @@
%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"
-done
+sed -i 's/\r$//g' ImageLounge/Readme/*
%build
+pushd ImageLounge/
%cmake \
-DCMAKE_C_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_CXX_FLAGS='%{optflags} -fno-strict-aliasing' \
-DCMAKE_SHARED_LINKER_FLAGS=""
make %{?_smp_mflags}
+popd
%install
+pushd ImageLounge/
%cmake_install
-install -Dm 0644 %{name}.appdata.xml \
+popd
+install -Dm 0644 ImageLounge/%{name}.appdata.xml \
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
+
+rm %{buildroot}%{_libdir}/lib%{name}*.so
%suse_update_desktop_file %{name}
%find_lang %{name} --with-qt
%post
%desktop_database_post
+/sbin/ldconfig
%postun
%desktop_database_postun
+/sbin/ldconfig
%files
%defattr(-,root,root)
-%doc Readme/*
+%doc ImageLounge/Readme/*
%{_bindir}/%{name}
-%{_libdir}/lib%{name}*.so
%{_libdir}/lib%{name}*.so.*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2016-06-19 10:50:27
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.changes2016-05-10
09:27:26.0 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2016-06-19
10:50:30.0 +0200
@@ -1,0 +2,7 @@
+Fri Jun 17 10:36:49 UTC 2016 - sor.ale...@meowr.ru
+
+- Add nomacs-3.2.0-gcc6.patch from
+ https://github.com/nomacs/nomacs/issues/62: fix GCC6 errors
+ (boo#985374).
+
+---
New:
nomacs-3.2.0-gcc6.patch
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.MKlxJm/_old 2016-06-19 10:50:31.0 +0200
+++ /var/tmp/diff_new_pack.MKlxJm/_new 2016-06-19 10:50:31.0 +0200
@@ -24,6 +24,8 @@
Group: Productivity/Graphics/Viewers
Url:http://nomacs.org/
Source:
https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-source.tar.bz2
+# PATCH-FIX-UPSTREAM nomacs-3.2.0-gcc6.patch boo#985374 ser...@serjux.com --
Fix GCC6 errors.
+Patch0: %{name}-3.2.0-gcc6.patch
BuildRequires: cmake >= 2.6
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -52,6 +54,7 @@
%prep
%setup -q
+%patch0 -p1
dos2unix Readme/*
find src -type f -name '*.cpp' | while read f; do
# Fix encoding issues in nomacs with Qt5.
++ nomacs-3.2.0-gcc6.patch ++
--- a/src/DkGui/DkPong.cpp
+++ b/src/DkGui/DkPong.cpp
@@ -655,7 +655,7 @@ void DkBall::fixAngle() {
double angle = mDirection.angle();
double range = CV_PI / 5.0;
double sign = angle > 0 ? 1.0 : -1.0;
- angle = abs(angle);
+ angle = fabs(angle);
double newAngle = 0.0;
if (angle < CV_PI*0.5 && angle > CV_PI*0.5 - range) {
--- a/src/DkGui/DkViewPort.cpp
+++ b/src/DkGui/DkViewPort.cpp
@@ -1251,7 +1251,7 @@ void DkViewPort::animateFade() {
mAnimationValue =
1.0f-(float)(mAnimationTime.elapsed()/1000.0)/Settings::param().display().animationDuration;
// slow in - slow out
- double speed = mAnimationValue > 0.5 ? abs(1.0 - mAnimationValue) :
abs(mAnimationValue);
+ double speed = mAnimationValue > 0.5 ? fabs(1.0 - mAnimationValue) :
fabs(mAnimationValue);
speed *= .05;
mAnimationValue += (float)speed;
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2016-05-10 09:27:25
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.changes2016-03-07
13:29:44.0 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2016-05-10
09:27:26.0 +0200
@@ -1,0 +2,13 @@
+Wed May 4 16:34:01 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to version 3.2.0:
+ * Redesign plugin framework.
+ * New preferences.
+ * Add Undo & History dock.
+ * Improve statusbar (e.g. zoom level).
+ * All Icons are SVG (UHD monitors).
+ * Add compression to Batch.
+ * Extend image transitions (swipe).
+- Remove nomacs-3.0.0-opencv-detection.patch: fixed upstream.
+
+---
Old:
nomacs-3.0.0-opencv-detection.patch
nomacs-3.0.0-source.tar.bz2
New:
nomacs-3.2.0-source.tar.bz2
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.RhlFzv/_old 2016-05-10 09:27:27.0 +0200
+++ /var/tmp/diff_new_pack.RhlFzv/_new 2016-05-10 09:27:27.0 +0200
@@ -17,31 +17,29 @@
Name: nomacs
-Version:3.0.0
+Version:3.2.0
Release:0
Summary:Lightweight image viewer
License:GPL-3.0+
Group: Productivity/Graphics/Viewers
Url:http://nomacs.org/
Source:
https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-source.tar.bz2
-# PATCH-FIX-UPSTREAM nomacs-3.0.0-opencv-detection.patch -- Fix detection of
OpenCV 3.x and later.
-Patch0: nomacs-3.0.0-opencv-detection.patch
BuildRequires: cmake >= 2.6
BuildRequires: dos2unix
BuildRequires: gcc-c++
-BuildRequires: libqt5-linguist-devel
-BuildRequires: opencv-qt5-devel
+BuildRequires: libqt5-linguist-devel >= 5.2
+BuildRequires: opencv-qt5-devel >= 2.4.6
BuildRequires: pkg-config
BuildRequires: quazip-devel
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(Qt5Concurrent)
-BuildRequires: pkgconfig(Qt5Network)
-BuildRequires: pkgconfig(Qt5PrintSupport)
-BuildRequires: pkgconfig(Qt5Svg)
-BuildRequires: pkgconfig(Qt5Widgets)
-BuildRequires: pkgconfig(exiv2)
+BuildRequires: pkgconfig(Qt5Concurrent) >= 5.2
+BuildRequires: pkgconfig(Qt5Network) >= 5.2
+BuildRequires: pkgconfig(Qt5PrintSupport) >= 5.2
+BuildRequires: pkgconfig(Qt5Svg) >= 5.2
+BuildRequires: pkgconfig(Qt5Widgets) >= 5.2
+BuildRequires: pkgconfig(exiv2) >= 0.25
BuildRequires: pkgconfig(expat)
-BuildRequires: pkgconfig(libraw)
+BuildRequires: pkgconfig(libraw) >= 0.17
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(zlib)
@@ -54,7 +52,6 @@
%prep
%setup -q
-%patch0 -p1
dos2unix Readme/*
find src -type f -name '*.cpp' | while read f; do
# Fix encoding issues in nomacs with Qt5.
@@ -87,10 +84,11 @@
%defattr(-,root,root)
%doc Readme/*
%{_bindir}/%{name}
-%{_libdir}/lib%{name}lib.so
+%{_libdir}/lib%{name}*.so
+%{_libdir}/lib%{name}*.so.*
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_datadir}/pixmaps/%{name}.*
%dir %{_datadir}/appdata/
%{_datadir}/appdata/%{name}.appdata.xml
%{_mandir}/man?/%{name}.?%{?ext_man}
++ nomacs-3.0.0-source.tar.bz2 -> nomacs-3.2.0-source.tar.bz2 ++
191748 lines of diff (skipped)
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2016-03-07 13:28: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.changes2015-12-24
12:16:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2016-03-07
13:29:44.0 +0100
@@ -1,0 +2,6 @@
+Fri Mar 4 07:46:25 UTC 2016 - sor.ale...@meowr.ru
+
+- Add nomacs-3.0.0-opencv-detection.patch to fix detection of
+ OpenCV 3.x and later.
+
+---
New:
nomacs-3.0.0-opencv-detection.patch
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.9R5Art/_old 2016-03-07 13:29:44.0 +0100
+++ /var/tmp/diff_new_pack.9R5Art/_new 2016-03-07 13:29:44.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nomacs
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,6 +24,8 @@
Group: Productivity/Graphics/Viewers
Url:http://nomacs.org/
Source:
https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-source.tar.bz2
+# PATCH-FIX-UPSTREAM nomacs-3.0.0-opencv-detection.patch -- Fix detection of
OpenCV 3.x and later.
+Patch0: nomacs-3.0.0-opencv-detection.patch
BuildRequires: cmake >= 2.6
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -52,6 +54,7 @@
%prep
%setup -q
+%patch0 -p1
dos2unix Readme/*
find src -type f -name '*.cpp' | while read f; do
# Fix encoding issues in nomacs with Qt5.
++ nomacs-3.0.0-opencv-detection.patch ++
--- a/cmake/Unix.cmake
+++ b/cmake/Unix.cmake
@@ -43,7 +43,7 @@ endif(NOT EXIV2_FOUND)
# search for opencv
unset(OpenCV_FOUND CACHE)
if(ENABLE_OPENCV)
- find_package(OpenCV 2.1.0 REQUIRED core imgproc)
+ find_package(OpenCV REQUIRED core imgproc)
if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is
set in Ubuntu 12.04 (without finding opencv)
# Older OpenCV versions only supplied pkg-config files
if(PKG_CONFIG_FOUND)
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2015-12-24 12:16:27
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.changes2015-08-23
17:45:29.0 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-12-24
12:16:29.0 +0100
@@ -1,0 +2,14 @@
+Thu Dec 17 18:28:24 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 3.0.0:
+ * Add plugins support.
+ * Full SVG support.
+ * Add Quick Launch.
+ * Add Tiny Planet option.
+ * Improve batch processing.
+ * Add command line arguments.
+ * Improve zoom control.
+ * Add Bulgarian and Ukrainian translations.
+- Remove nomacs-qt5-build-fix.patch.
+
+---
Old:
nomacs-2.4.6-source.tar.bz2
nomacs-qt5-build-fix.patch
New:
nomacs-3.0.0-source.tar.bz2
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.K0PSou/_old 2015-12-24 12:16:30.0 +0100
+++ /var/tmp/diff_new_pack.K0PSou/_new 2015-12-24 12:16:30.0 +0100
@@ -17,15 +17,13 @@
Name: nomacs
-Version:2.4.6
+Version:3.0.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-OPENSUSE nomacs-qt5-build-fix.patch sor.ale...@meowr.ru -- Fix
build with Qt5.
-Patch0: %{name}-qt5-build-fix.patch
+Source:
https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}-source.tar.bz2
BuildRequires: cmake >= 2.6
BuildRequires: dos2unix
BuildRequires: gcc-c++
@@ -37,6 +35,7 @@
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5PrintSupport)
+BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(exiv2)
BuildRequires: pkgconfig(expat)
@@ -46,14 +45,13 @@
%description
nomacs is a free image viewer, which is small, fast and able to handle the
-most common image formats. Additionally it is possible to synchronize
-multiple viewers. A synchronization of viewers running on the same
+most common image formats. Additionally it is possible to synchronise
+multiple viewers. A synchronisation of viewers running on the same
computer or via LAN is possible. It allows to compare images and spot the
differences (e.g. schemes of architects to show the progress).
%prep
%setup -q
-%patch0 -p1
dos2unix Readme/*
find src -type f -name '*.cpp' | while read f; do
# Fix encoding issues in nomacs with Qt5.
@@ -66,8 +64,7 @@
%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
+ -DCMAKE_SHARED_LINKER_FLAGS=""
make %{?_smp_mflags}
%install
@@ -87,6 +84,7 @@
%defattr(-,root,root)
%doc Readme/*
%{_bindir}/%{name}
+%{_libdir}/lib%{name}lib.so
%{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
++ nomacs-2.4.6-source.tar.bz2 -> nomacs-3.0.0-source.tar.bz2 ++
221299 lines of diff (skipped)
commit nomacs for openSUSE:Factory
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.changes2015-04-18
10:41:07.0 +0200
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-08-23
17:45:29.0 +0200
@@ -1,0 +2,10 @@
+Thu Aug 20 17:47:01 UTC 2015 - sor.ale...@meowr.ru
+
+- 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.0 +0200
+++ /var/tmp/diff_new_pack.RMLd6x/_new 2015-08-23 17:45:30.0 +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 sor.ale...@meowr.ru -- Fix
build with Qt5.
+Source:
http://downloads.sf.net/%{name}/%{name}-%{version}-source.tar.bz2
+# PATCH-FIX-OPENSUSE nomacs-qt5-build-fix.patch sor.ale...@meowr.ru -- 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.0 +0200
+++ /var/tmp/diff_new_pack.RMLd6x/_new 2015-08-23 17:45:30.0 +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;
}
commit nomacs for openSUSE:Factory
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.changes2015-03-03
11:16:36.0 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-04-18
10:41:07.0 +0200
@@ -1,0 +2,15 @@
+Thu Apr 17 12:32:23 UTC 2015 - sor.ale...@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.0 +0200
+++ /var/tmp/diff_new_pack.yWtsFA/_new 2015-04-18 10:41:08.0 +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.ale...@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.0 +0200
+++ /var/tmp/diff_new_pack.yWtsFA/_new 2015-04-18 10:41:09.0 +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);
++ //qD
commit nomacs for openSUSE:Factory
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.changes2015-02-27
11:09:53.0 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-03-03
11:16:36.0 +0100
@@ -1,0 +2,13 @@
+Mon Mar 2 23:11:02 UTC 2015 - sor.ale...@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.0 +0100
+++ /var/tmp/diff_new_pack.ZAbo7w/_new 2015-03-03 11:16:37.0 +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.ale...@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 < 0x05
void DkShortcutDelegate::textChanged(QString text) {
emit checkDuplicateSignal(text, item);
}
-#else
+#if QT_VERSION >= 0x05
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 < 0x05
void textChanged(QString text = QString());
-#else
+#if QT_VERSION >= 0x05
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: " <
commit nomacs for openSUSE:Factory
Hello community,
here is the log from the commit of package nomacs for openSUSE:Factory checked
in at 2015-02-27 11:09:52
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.changes2014-11-13
09:18:29.0 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2015-02-27
11:09:53.0 +0100
@@ -1,0 +2,20 @@
+Thu Feb 26 11:28:42 UTC 2015 - sor.ale...@meowr.ru
+
+- Update to 2.4.0:
+ * Batch processing (you can try it by clicking
+Tools > Batch Processing).
+ * Image tabs (open multiple images within different tabs).
+ * Thumbnail preview improved (copy/paste delete/rename is now
+supported).
+ * Zoom panel improved (you can now chose a specific zoom level).
+ * Olympus RAW added.
+ * Convert to grayscale added.
+ * Faster directory loading (especially if you have many images
+in a directory).
+ * Gesture improvements.
+ * Saving of images from archives (e.g. zip, docx) is now supported.
+ * File sorting improved.
+ * Stability improvements.
+- Remove nomacs-strcmp-fix.patch and nomacs-qt5-build-fix.patch.
+
+---
Old:
nomacs-2.2.0-source.tar.bz2
nomacs-qt5-build-fix.patch
nomacs-strcmp-fix.patch
New:
nomacs-2.4.0-source.tar.bz2
Other differences:
--
++ nomacs.spec ++
--- /var/tmp/diff_new_pack.PFN3tt/_old 2015-02-27 11:09:54.0 +0100
+++ /var/tmp/diff_new_pack.PFN3tt/_new 2015-02-27 11:09:54.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package nomacs
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,19 @@
Name: nomacs
-Version:2.2.0
+Version:2.4.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 sor.ale...@meowr.ru -- Correct
string comparison.
-Patch0: nomacs-strcmp-fix.patch
-# PATCH-FIX-UPSTREAM nomacs-qt5-build-fix.patch sor.ale...@meowr.ru -- 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: quazip-devel
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5Network)
@@ -54,8 +51,6 @@
%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.
@@ -64,8 +59,6 @@
%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}
@@ -87,9 +80,9 @@
%doc Readme/*
%{_bindir}/%{name}
%{_datadir}/%{name}/
-%{_datadir}/appdata/%{name}.appdata.xml
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
-%{_mandir}/man1/*
+%{_datadir}/appdata/%{name}.appdata.xml
+%{_mandir}/man?/%{name}.?%{?ext_man}
%changelog
++ nomacs-2.2.0-source.tar.bz2 -> nomacs-2.4.0-source.tar.bz2 ++
26050 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit nomacs for openSUSE:Factory
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.changes2014-11-04
17:28:40.0 +0100
+++ /work/SRC/openSUSE:Factory/.nomacs.new/nomacs.changes 2014-11-13
09:18:29.0 +0100
@@ -1,0 +2,10 @@
+Wed Nov 12 11:13:02 UTC 2014 - sor.ale...@meowr.ru
+
+- 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.0 +0100
+++ /var/tmp/diff_new_pack.Sp3Pv7/_new 2014-11-13 09:18:30.0 +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 sor.ale...@meowr.ru -- Fix build
by correcting string comparison.
+# PATCH-FIX-UPSTREAM nomacs-strcmp-fix.patch sor.ale...@meowr.ru -- Correct
string comparison.
Patch0: nomacs-strcmp-fix.patch
+# PATCH-FIX-UPSTREAM nomacs-qt5-build-fix.patch sor.ale...@meowr.ru -- 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
+#include
#include "DkWidgets.h"
++ nomacs-strcmp-fix.patch ++
--- /var/tmp/diff_new_pack.Sp3Pv7/_old 2014-11-13 09:18:31.0 +0100
+++ /var/tmp/diff_new_pack.Sp3Pv7/_new 2014-11-13 09:18:31.0 +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: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
