commit a9fff72703b580b1739a210312e2763ecbad4dfb Author: Jan Rękorajski <bagg...@pld-linux.org> Date: Mon Feb 11 22:17:33 2019 +0100
- up to 3.12 nomacs-libqpsd.patch | 34 +++++++----------------------- nomacs.spec | 34 +++++++++--------------------- quazip-qt5.patch | 58 ---------------------------------------------------- 3 files changed, 17 insertions(+), 109 deletions(-) --- diff --git a/nomacs.spec b/nomacs.spec index b491c39..0d6010e 100644 --- a/nomacs.spec +++ b/nomacs.spec @@ -2,14 +2,13 @@ Summary: Lightweight image viewer Summary(pl.UTF-8): Lekka przeglądarka obrazków Name: nomacs -Version: 3.4.1 -Release: 4 +Version: 3.12 +Release: 1 License: GPL v3+ Group: X11/Applications Source0: https://github.com/nomacs/nomacs/archive/%{version}/%{name}-%{version}-source.tar.gz -# Source0-md5: 1daf7458717eb545b2da8534cff36d6e -Patch0: quazip-qt5.patch -Patch1: %{name}-libqpsd.patch +# Source0-md5: 7b2160cbcf907ee080d696c61b3dc4e8 +Patch0: %{name}-libqpsd.patch URL: http://nomacs.org/ BuildRequires: Qt5Concurrent-devel >= 5.2.1 BuildRequires: Qt5Core-devel >= 5.2.1 @@ -24,6 +23,7 @@ BuildRequires: libqpsd-qt5-devel BuildRequires: libraw-devel >= 0.17 BuildRequires: libstdc++-devel >= 6:4.3 BuildRequires: libtiff-devel +BuildRequires: libtiff-cxx-devel BuildRequires: libwebp-devel >= 0.3.1 BuildRequires: opencv-devel >= 2.4.6 BuildRequires: pkgconfig @@ -41,6 +41,7 @@ Requires: libraw >= 0.17 Requires: opencv >= 2.4.6 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define skip_post_check_so libnomacsCore.so.* %description nomacs is image viewer based on Qt library. @@ -63,11 +64,8 @@ np. projekty architektów w celu pokazania postępów. %setup -q cd ImageLounge %patch0 -p1 -%patch1 -p1 -dos2unix Readme/* - -%{__rm} -r 3rdparty/{libqpsd,quazip-0.7} +%{__rm} -r 3rdparty/libqpsd %build install -d build @@ -87,19 +85,11 @@ rm -rf $RPM_BUILD_ROOT %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT -# unify -%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/nomacs_{zh,zh_CN}.qm -# translation to German "Vorarlbergerisch" dialect - should be de_AT@Vorarlberg? -# ("als" is wrong code - it's Tosk Albanian in iso-639-3) -%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/nomacs_als.qm - # API not exported, so keep only library files + soname symlinks %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnomacs*.so desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop -%find_lang %{name} --with-qm --without-mo - %clean rm -rf $RPM_BUILD_ROOT @@ -111,19 +101,15 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig %update_desktop_database -%files -f %{name}.lang +%files %defattr(644,root,root,755) %doc ImageLounge/Readme/{COPYRIGHT,LICENSE.OPENCV,README} %attr(755,root,root) %{_bindir}/nomacs %attr(755,root,root) %{_libdir}/libnomacsCore.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libnomacsCore.so.3 -%attr(755,root,root) %{_libdir}/libnomacsGui.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libnomacsGui.so.3 -%attr(755,root,root) %{_libdir}/libnomacsLoader.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libnomacsLoader.so.3 %{_mandir}/man1/nomacs.1* %dir %{_datadir}/%{name} -%dir %{_datadir}/%{name}/translations -%{_datadir}/appdata/nomacs.appdata.xml +%{_datadir}/%{name}/Image* +%{_datadir}/metainfo/nomacs.appdata.xml %{_desktopdir}/nomacs.desktop %{_pixmapsdir}/nomacs.svg diff --git a/nomacs-libqpsd.patch b/nomacs-libqpsd.patch index e5902d8..eb5d30a 100644 --- a/nomacs-libqpsd.patch +++ b/nomacs-libqpsd.patch @@ -20,31 +20,11 @@ --- nomacs-3.4.1/CMakeLists.txt.orig 2016-09-10 21:27:15.454047058 +0200 +++ nomacs-3.4.1/CMakeLists.txt 2016-09-10 21:27:26.287380269 +0200 @@ -155,7 +155,7 @@ - ${HUPNP_INCLUDE_DIR} - ${QUAZIP_INCLUDE_DIRECTORY} - # ${ZLIB_INCLUDE_DIRS} -- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd -+ ${LIBQPSD_INCLUDE_DIRECTORY} - ) - - if (APPLE) # todo: somehow add this to Mac.cmake or MacBuildTarget.cmake ---- nomacs-3.4.1/cmake/UnixBuildTarget.cmake.orig 2016-07-28 11:01:01.000000000 +0200 -+++ nomacs-3.4.1/cmake/UnixBuildTarget.cmake 2016-09-10 22:09:29.120684793 +0200 -@@ -14,7 +14,7 @@ - #binary - link_directories(${LIBRAW_LIBRARY_DIRS} ${OpenCV_LIBRARY_DIRS} ${EXIV2_LIBRARY_DIRS} ${CMAKE_BINARY_DIR}) - add_executable(${BINARY_NAME} WIN32 MACOSX_BUNDLE ${NOMACS_EXE_SOURCES} ${NOMACS_EXE_HEADERS} ${NOMACS_QM} ${NOMACS_TRANSLATIONS} ${NOMACS_RC} ${QUAZIP_SOURCES}) --target_link_libraries(${BINARY_NAME} ${DLL_NAME} ${DLL_CORE_NAME} ${DLL_LOADER_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${ZLIB_LIBRARY} ${LIBQPSD_LIBRARY}) -+target_link_libraries(${BINARY_NAME} ${DLL_NAME} ${DLL_CORE_NAME} ${DLL_LOADER_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${ZLIB_LIBRARY}) - - - set_target_properties(${BINARY_NAME} PROPERTIES COMPILE_FLAGS "-DDK_DLL_IMPORT -DNOMINMAX") -@@ -28,7 +28,7 @@ - - # add loader - add_library(${DLL_LOADER_NAME} SHARED ${LOADER_SOURCES} ${NOMACS_UI} ${NOMACS_RCC} ${LOADER_HEADERS} ${AUTOFLOW_RC} ${QUAZIP_SOURCES} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS}) --target_link_libraries(${DLL_LOADER_NAME} ${DLL_CORE_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES}) -+target_link_libraries(${DLL_LOADER_NAME} ${DLL_CORE_NAME} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBS} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${LIBQPSD_LIBRARY}) - set_property(TARGET ${DLL_LOADER_NAME} PROPERTY VERSION ${NOMACS_VERSION_MAJOR}.${NOMACS_VERSION_MINOR}.${NOMACS_VERSION_PATCH}) - set_property(TARGET ${DLL_LOADER_NAME} PROPERTY SOVERSION ${NOMACS_VERSION_MAJOR}) + ${TIFF_CONFIG_DIR} + ${QUAZIP_INCLUDE_DIR} + ${QUAZIP_ZLIB_INCLUDE_DIR} +- ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/libqpsd ++ ${LIBQPSD_INCLUDE_DIRECTORY} + ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/drif + ) diff --git a/quazip-qt5.patch b/quazip-qt5.patch deleted file mode 100644 index d22b7ba..0000000 --- a/quazip-qt5.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- nomacs-3.4.1/cmake/FindQuaZIP.cmake.orig 2016-09-09 21:46:55.635020115 +0200 -+++ nomacs-3.4.1/cmake/FindQuaZIP.cmake 2016-09-09 21:59:03.015011808 +0200 -@@ -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) ---- nomacs-3.4.1/src/DkLoader/DkImageLoader.cpp~ 2015-12-17 11:01:42.000000000 +0100 -+++ nomacs-3.4.1/src/DkLoader/DkImageLoader.cpp 2016-04-16 18:26:05.820609479 +0200 -@@ -74,7 +74,7 @@ - - // quazip - #ifdef WITH_QUAZIP --#include <quazip/JlCompress.h> -+#include <quazip5/JlCompress.h> - #endif - - // opencv ---- nomacs-3.4.1/src/DkLoader/DkBasicLoader.cpp~ 2015-12-17 11:01:42.000000000 +0100 -+++ nomacs-3.4.1/src/DkLoader/DkBasicLoader.cpp 2016-04-16 18:26:23.390836011 +0200 -@@ -51,7 +51,7 @@ - - // quazip - #ifdef WITH_QUAZIP --#include <quazip/JlCompress.h> -+#include <quazip5/JlCompress.h> - #endif - - #ifdef WITH_WEBP ---- nomacs-3.4.1/src/DkLoader/DkImageContainer.cpp~ 2015-12-17 11:01:42.000000000 +0100 -+++ nomacs-3.4.1/src/DkLoader/DkImageContainer.cpp 2016-04-16 18:26:39.697712795 +0200 -@@ -41,7 +41,7 @@ - - // quazip - #ifdef WITH_QUAZIP --#include <quazip/JlCompress.h> -+#include <quazip5/JlCompress.h> - #endif - #pragma warning(pop) // no warnings from includes - end - ---- nomacs-3.4.1/src/DkGui/DkDialog.cpp.orig 2016-09-09 22:00:28.425010835 +0200 -+++ nomacs-3.4.1/src/DkGui/DkDialog.cpp 2016-09-09 22:01:33.561676757 +0200 -@@ -92,7 +92,7 @@ - #include <QPrinterInfo> - // quazip - #ifdef WITH_QUAZIP --#include <quazip/JlCompress.h> -+#include <quazip5/JlCompress.h> - #endif - - #pragma warning(pop) // no warnings from includes - end ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/nomacs.git/commitdiff/a9fff72703b580b1739a210312e2763ecbad4dfb _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit