Hello community, here is the log from the commit of package qimageblitz for openSUSE:Factory checked in at 2018-05-19 15:38:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qimageblitz (Old) and /work/SRC/openSUSE:Factory/.qimageblitz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qimageblitz" Sat May 19 15:38:25 2018 rev:2 rq:610394 version:0.0.6+svn1515099 Changes: -------- --- /work/SRC/openSUSE:Factory/qimageblitz/qimageblitz.changes 2018-01-19 11:48:51.779942007 +0100 +++ /work/SRC/openSUSE:Factory/.qimageblitz.new/qimageblitz.changes 2018-05-19 15:38:33.355211816 +0200 @@ -1,0 +2,11 @@ +Fri May 18 09:12:01 UTC 2018 - [email protected] + +- Update to version 0.0.6+svn1515099 (changes since + 0.0.6+svn1368047): + * Allow building with Qt 5.11. + qt5_use_modules is no longer present in Qt 5.11. Fix build by + moving to target_link_libraries + This also adds a dependency on Qt5 Widgets (used by the test). +- Rebase qimageblitz-qt5-fix-soname.patch. + +------------------------------------------------------------------- Old: ---- qimageblitz-0.0.6+svn1368047.tar.xz New: ---- qimageblitz-0.0.6+svn1515099.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qimageblitz.spec ++++++ --- /var/tmp/diff_new_pack.KOZIAg/_old 2018-05-19 15:38:34.339175815 +0200 +++ /var/tmp/diff_new_pack.KOZIAg/_new 2018-05-19 15:38:34.343175668 +0200 @@ -21,7 +21,7 @@ %define sover_qt4 4 %define sover_qt5 1 Name: qimageblitz -Version: 0.0.6+svn1368047 +Version: 0.0.6+svn1515099 Release: 0 Summary: Graphical effect and filter library for Qt License: BSD-2-Clause @@ -110,11 +110,21 @@ %postun -n %{soname_qt5}-%{sover_qt5} -p /sbin/ldconfig %files -n %{soname_qt4}%{sover_qt4} -%doc COPYING Changelog README.* +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc Changelog README.* %{_libdir}/%{soname_qt4}.so.%{sover_qt4}* %files -n %{soname_qt5}-%{sover_qt5} -%doc COPYING Changelog README.* +%if 0%{?suse_version} >= 1500 +%license COPYING +%else +%doc COPYING +%endif +%doc Changelog README.* %{_libdir}/%{soname_qt5}.so.%{sover_qt5}* %files -n %{soname_qt4}-devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.KOZIAg/_old 2018-05-19 15:38:34.415173034 +0200 +++ /var/tmp/diff_new_pack.KOZIAg/_new 2018-05-19 15:38:34.415173034 +0200 @@ -4,7 +4,7 @@ <param name="url">svn://anonsvn.kde.org/home/kde/trunk/kdesupport/qimageblitz</param> <param name="filename">qimageblitz</param> <param name="versionformat">0.0.6+svn%r</param> - <param name="revision">1368047</param> + <param name="revision">1515099</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> ++++++ qimageblitz-0.0.6+svn1368047.tar.xz -> qimageblitz-0.0.6+svn1515099.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimageblitz-0.0.6+svn1368047/CMakeLists.txt new/qimageblitz-0.0.6+svn1515099/CMakeLists.txt --- old/qimageblitz-0.0.6+svn1368047/CMakeLists.txt 2013-10-30 00:39:56.000000000 +0100 +++ new/qimageblitz-0.0.6+svn1515099/CMakeLists.txt 2018-05-05 09:32:08.000000000 +0200 @@ -14,6 +14,7 @@ set(CMAKE_AUTOMOC ON) find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) + find_package(Qt5Widgets REQUIRED) else() find_package(Qt4 REQUIRED) # properly set up compile flags (QT_DEBUG/QT_NO_DEBUG, ...) @@ -43,7 +44,7 @@ # By default cmake builds the targets with full RPATH to everything in the build directory, # but then removes the RPATH when installing. # These two options below make it set the RPATH of the installed targets to all -# RPATH directories outside the current CMAKE_BINARY_DIR and also the library +# RPATH directories outside the current CMAKE_BINARY_DIR and also the library # install directory. Alex set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimageblitz-0.0.6+svn1368047/blitz/CMakeLists.txt new/qimageblitz-0.0.6+svn1515099/blitz/CMakeLists.txt --- old/qimageblitz-0.0.6+svn1368047/blitz/CMakeLists.txt 2013-10-30 00:39:56.000000000 +0100 +++ new/qimageblitz-0.0.6+svn1515099/blitz/CMakeLists.txt 2018-05-05 09:32:08.000000000 +0200 @@ -1,12 +1,12 @@ -project(blitz_lib) +project(blitz_lib) include(CheckCXXSourceCompiles) include(CheckIncludeFile) include_directories( - ${CMAKE_SOURCE_DIR} - ${blitz_lib_BINARY_DIR} + ${CMAKE_SOURCE_DIR} + ${blitz_lib_BINARY_DIR} ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ) @@ -48,12 +48,12 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +endif(COMMAND cmake_policy) add_library(qimageblitz SHARED ${blitz_LIB_SRCS} ${blitz_LIB_EXTRA_SRCS}) if (Qt5Core_FOUND) - qt5_use_modules(qimageblitz Core Gui) + target_link_libraries(qimageblitz Qt5::Core Qt5::Gui) endif() target_link_libraries(qimageblitz ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) @@ -66,20 +66,20 @@ SOVERSION ${BLITZ_LIB_MAJOR_VERSION} DEFINE_SYMBOL MAKE_QIMAGEBLITZ_LIB ) -install( TARGETS qimageblitz - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} +install( TARGETS qimageblitz + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) install( FILES qimageblitz.h qimageblitz_export.h blitzcpu.h DESTINATION include/qimageblitz COMPONENT Devel ) if(NOT WIN32) configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc" - @ONLY) + @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION + ${LIB_INSTALL_DIR}/pkgconfig) endif(NOT WIN32) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qimageblitz-0.0.6+svn1368047/test/CMakeLists.txt new/qimageblitz-0.0.6+svn1515099/test/CMakeLists.txt --- old/qimageblitz-0.0.6+svn1368047/test/CMakeLists.txt 2013-10-30 00:39:56.000000000 +0100 +++ new/qimageblitz-0.0.6+svn1515099/test/CMakeLists.txt 2018-05-05 09:32:08.000000000 +0200 @@ -21,12 +21,12 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) +endif(COMMAND cmake_policy) add_executable(blitztest ${blitztest_SRCS}) if (Qt5Core_FOUND) - qt5_use_modules(blitztest Core Gui Widgets) + target_link_libraries(blitztest Qt5::Core Qt5::Gui Qt5::Widgets) endif() target_link_libraries(blitztest ${QT_QTCORE_LIBRARY} ++++++ qimageblitz-qt5-fix-soname.patch ++++++ --- /var/tmp/diff_new_pack.KOZIAg/_old 2018-05-19 15:38:34.515169376 +0200 +++ /var/tmp/diff_new_pack.KOZIAg/_new 2018-05-19 15:38:34.519169229 +0200 @@ -9,16 +9,16 @@ else() SET(BLITZ_LIB_MAJOR_VERSION "4") endif() -@@ -50,35 +50,36 @@ if(COMMAND cmake_policy) +@@ -50,35 +50,37 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) + endif(COMMAND cmake_policy) -add_library(qimageblitz SHARED ${blitz_LIB_SRCS} ${blitz_LIB_EXTRA_SRCS}) +add_library(qimageblitz${BLITZ_QT_SUFFIX} SHARED ${blitz_LIB_SRCS} ${blitz_LIB_EXTRA_SRCS}) if (Qt5Core_FOUND) -- qt5_use_modules(qimageblitz Core Gui) -+ qt5_use_modules(qimageblitz${BLITZ_QT_SUFFIX} Core Gui) +- target_link_libraries(qimageblitz Qt5::Core Qt5::Gui) ++ target_link_libraries(qimageblitz${BLITZ_QT_SUFFIX} Qt5::Core Qt5::Gui) endif() -target_link_libraries(qimageblitz ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) @@ -34,11 +34,11 @@ SOVERSION ${BLITZ_LIB_MAJOR_VERSION} DEFINE_SYMBOL MAKE_QIMAGEBLITZ_LIB ) --install( TARGETS qimageblitz +-install( TARGETS qimageblitz +install( TARGETS qimageblitz${BLITZ_QT_SUFFIX} - RUNTIME DESTINATION ${BIN_INSTALL_DIR} - LIBRARY DESTINATION ${LIB_INSTALL_DIR} - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} + RUNTIME DESTINATION ${BIN_INSTALL_DIR} + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) -install( FILES qimageblitz.h qimageblitz_export.h blitzcpu.h DESTINATION include/qimageblitz COMPONENT Devel ) @@ -47,12 +47,13 @@ if(NOT WIN32) - configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc" -+ configure_file("qimageblitz.pc.cmake" "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${BLITZ_QT_SUFFIX}.pc" - @ONLY) ++ configure_file("qimageblitz.pc.cmake" ++ "${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${BLITZ_QT_SUFFIX}.pc" + @ONLY) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz.pc DESTINATION + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/qimageblitz${BLITZ_QT_SUFFIX}.pc DESTINATION - ${LIB_INSTALL_DIR}/pkgconfig) + ${LIB_INSTALL_DIR}/pkgconfig) endif(NOT WIN32) --- a/blitz/qimageblitz.pc.cmake @@ -68,10 +69,10 @@ Cflags: -I${includedir} --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -14,10 +14,12 @@ if (Qt5Core_FOUND) - set(CMAKE_AUTOMOC ON) +@@ -15,10 +15,12 @@ if (Qt5Core_FOUND) find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) + find_package(Qt5Widgets REQUIRED) + SET(BLITZ_QT_SUFFIX "5") else() find_package(Qt4 REQUIRED) @@ -83,16 +84,17 @@ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" ) --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt -@@ -23,14 +23,14 @@ if(COMMAND cmake_policy) +@@ -23,14 +23,15 @@ if(COMMAND cmake_policy) cmake_policy(SET CMP0003 NEW) - endif(COMMAND cmake_policy) + endif(COMMAND cmake_policy) -add_executable(blitztest ${blitztest_SRCS}) +add_executable(blitztest${BLITZ_QT_SUFFIX} ${blitztest_SRCS}) if (Qt5Core_FOUND) -- qt5_use_modules(blitztest Core Gui Widgets) -+ qt5_use_modules(blitztest${BLITZ_QT_SUFFIX} Core Gui Widgets) +- target_link_libraries(blitztest Qt5::Core Qt5::Gui Qt5::Widgets) ++ target_link_libraries(blitztest${BLITZ_QT_SUFFIX} Qt5::Core Qt5::Gui ++ Qt5::Widgets qimageblitz${BLITZ_QT_SUFFIX}) endif() -target_link_libraries(blitztest ${QT_QTCORE_LIBRARY}
