From 723c4b5a1e56e006b9ec0c1a4e3d932d721e8975 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sat, 10 Sep 2016 22:19:01 +0200 Subject: [PATCH] - added libqpsd patch, use system libqpsd - use upstream provided appdata file --- nomacs-libqpsd.patch | 50 ++++++++++++++++++++++++++++++++++++++++++++ nomacs.spec | 19 +++++++---------- 2 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 nomacs-libqpsd.patch diff --git a/nomacs-libqpsd.patch b/nomacs-libqpsd.patch new file mode 100644 index 0000000..e5902d8 --- /dev/null +++ b/nomacs-libqpsd.patch @@ -0,0 +1,50 @@ +--- nomacs-3.4.1/cmake/Findqpsd.cmake.orig 1970-01-01 01:00:00.000000000 +0100 ++++ nomacs-3.4.1/cmake/Findqpsd.cmake 2016-09-10 21:25:00.580715267 +0200 +@@ -0,0 +1,16 @@ ++# QPSD_FOUND - system has the LIBQPSD library ++# LIBQPSD_INCLUDE_DIRECTORY - the LIBQPSD include directory ++# LIBQPSD_LIBRARY - The libraries needed to use LIBQPSD ++ ++if(LIBQPSD_INCLUDE_DIRECTORY AND LIBQPSD_LIBRARY) ++ set(QPSD_FOUND TRUE) ++else() ++ find_path(LIBQPSD_INCLUDE_DIRECTORY NAMES qpsdhandler.h PATH_SUFFIXES qt5) ++ ++ find_library(LIBQPSD_LIBRARY NAMES qpsd5) ++ ++ include(FindPackageHandleStandardArgs) ++ find_package_handle_standard_args(QPSD DEFAULT_MSG LIBQPSD_INCLUDE_DIRECTORY LIBQPSD_LIBRARY) ++ ++ mark_as_advanced(LIBQPSD_INCLUDE_DIRECTORY LIBQPSD_LIBRARY) ++endif(LIBQPSD_INCLUDE_DIRECTORY AND LIBQPSD_LIBRARY) +--- 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}) + diff --git a/nomacs.spec b/nomacs.spec index ff0f086..c4c5da7 100644 --- a/nomacs.spec +++ b/nomacs.spec @@ -1,5 +1,4 @@ -# TODO: system qpsd (http://sourceforge.net/projects/libqpsd/) -# +# TODO: add plugins (https://github.com/nomacs/nomacs-plugins/) Summary: Lightweight image viewer Summary(pl.UTF-8): Lekka przeglądarka obrazków Name: nomacs @@ -9,8 +8,8 @@ License: GPL v3+ Group: X11/Applications Source0: https://github.com/nomacs/nomacs/archive/%{version}/%{name}-%{version}-source.tar.gz # Source0-md5: 1daf7458717eb545b2da8534cff36d6e -Source1: %{name}.appdata.xml Patch0: quazip-qt5.patch +Patch1: %{name}-libqpsd.patch URL: http://nomacs.org/ BuildRequires: Qt5Concurrent-devel >= 5.2.1 BuildRequires: Qt5Core-devel >= 5.2.1 @@ -21,6 +20,7 @@ BuildRequires: cmake >= 2.8 BuildRequires: desktop-file-utils BuildRequires: dos2unix BuildRequires: exiv2-devel >= 0.25 +BuildRequires: libqpsd-qt5-devel BuildRequires: libraw-devel >= 0.17 BuildRequires: libstdc++-devel >= 6:4.3 BuildRequires: libtiff-devel @@ -63,10 +63,11 @@ np. projekty architektów w celu pokazania postępów. %setup -q cd ImageLounge %patch0 -p1 +%patch1 -p1 dos2unix Readme/* -%{__rm} -r 3rdparty/quazip-0.7 +%{__rm} -r 3rdparty/{libqpsd,quazip-0.7} %build install -d build @@ -74,10 +75,9 @@ cd build %cmake ../ImageLounge \ -DENABLE_PLUGINS=ON \ -DENABLE_RAW=1 \ - -DUSE_SYSTEM_WEBP=ON \ - -DUSE_SYSTEM_QUAZIP=ON - -# TODO: -DUSE_SYSTEM_LIBQPSD=ON + -DUSE_SYSTEM_LIBQPSD=ON \ + -DUSE_SYSTEM_QUAZIP=ON \ + -DUSE_SYSTEM_WEBP=ON %{__make} @@ -98,9 +98,6 @@ rm -rf $RPM_BUILD_ROOT desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop -install -d $RPM_BUILD_ROOT%{_datadir}/appdata -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml - %find_lang %{name} --with-qm --without-mo %clean -- 2.44.0