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.changes 2018-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 - [email protected] + +- 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 [email protected] -- 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_BINARY_DIR}/libs) --- a/ImageLounge/cmake/WinBuildTarget.cmake +++ b/ImageLounge/cmake/WinBuildTarget.cmake @@ -62,8 +62,8 @@ add_dependencies( target_include_directories(${BINARY_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) target_include_directories(${DLL_CORE_NAME} PRIVATE ${OpenCV_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}) -qt5_use_modules(${BINARY_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras) -qt5_use_modules(${DLL_CORE_NAME} Widgets Gui Network LinguistTools PrintSupport Concurrent Svg WinExtras) +target_link_libraries(${BINARY_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras) +target_link_libraries(${DLL_CORE_NAME} Qt5::Widgets Qt5::Gui Qt5::Network Qt5::PrintSupport Qt5::Concurrent Qt5::Svg Qt5::WinExtras) # set(_moc ${CMAKE_CURRENT_BINARY_DIR}/GeneratedFiles) file(GLOB NOMACS_AUTOMOC "${CMAKE_BINARY_DIR}/*_automoc.cpp ${CMAKE_BINARY_DIR}/moc_.cpp")
