Hello community, here is the log from the commit of package qimageblitz for openSUSE:Leap:15.2 checked in at 2020-01-30 14:49:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/qimageblitz (Old) and /work/SRC/openSUSE:Leap:15.2/.qimageblitz.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "qimageblitz" Thu Jan 30 14:49:01 2020 rev:12 rq:753199 version:0.0.6+svn1515099 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/qimageblitz/qimageblitz.changes 2020-01-15 15:55:06.879655381 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.qimageblitz.new.26092/qimageblitz.changes 2020-01-30 14:49:40.482879305 +0100 @@ -1,0 +2,22 @@ +Mon Oct 14 12:36:18 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> + +- Stop packaging qimageblitz4 for Tumbleweed. + +------------------------------------------------------------------- +Wed Jul 31 15:17:29 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de> + +- Add patch to fix build with newer CMake: + * remove-ansi-option.patch + +------------------------------------------------------------------- +Fri May 18 09:12:01 UTC 2018 - sor.alexei@meowr.ru + +- 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 remove-ansi-option.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qimageblitz.spec ++++++ --- /var/tmp/diff_new_pack.QGpa1l/_old 2020-01-30 14:49:40.886879520 +0100 +++ /var/tmp/diff_new_pack.QGpa1l/_new 2020-01-30 14:49:40.894879524 +0100 @@ -1,7 +1,7 @@ # # spec file for package qimageblitz # -# 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,16 +12,21 @@ # 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/ # -%define soname_qt4 libqimageblitz %define soname_qt5 libqimageblitz5 -%define sover_qt4 4 %define sover_qt5 1 +%if 0%{?suse_version} <= 1500 +%bcond_without qt4 +%define soname_qt4 libqimageblitz +%define sover_qt4 4 +%else +%bcond_with qt4 +%endif 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 @@ -30,19 +35,24 @@ Source0: %{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE qimageblitz-qt5-fix-soname.patch sor.alexei@meowr.ru -- Change the soname for Qt5 to fix a conflict with Qt4. Patch0: qimageblitz-qt5-fix-soname.patch +# PATCH-FIX-UPSTREAM +Patch1: remove-ansi-option.patch BuildRequires: cmake BuildRequires: pkgconfig BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Widgets) +%if %{with qt4} BuildRequires: pkgconfig(QtCore) BuildRequires: pkgconfig(QtGui) +%endif %description qimageblitz is a graphical effect and filter library for Qt that contains many improvements over KDE 3.x's kdefx library including bugfixes, memory and speed improvements, and MMX/SSE support. +%if %{with qt4} %package -n %{soname_qt4}%{sover_qt4} Summary: Graphical effect and filter library for Qt4 Group: System/Libraries @@ -52,6 +62,7 @@ that contains many improvements over KDE 3.x's kdefx library including bugfixes, memory and speed improvements, and MMX/SSE support. +%endif %package -n %{soname_qt5}-%{sover_qt5} Summary: Graphical effect and filter library for Qt5 @@ -63,6 +74,7 @@ including bugfixes, memory and speed improvements, and MMX/SSE support. +%if %{with qt4} %package -n %{soname_qt4}-devel Summary: Development files for libqimageblitz4 Group: Development/Libraries/C and C++ @@ -70,6 +82,7 @@ %description -n %{soname_qt4}-devel This package contains development files for libqimageblitz. +%endif %package -n %{soname_qt5}-devel Summary: Development files for libqimageblitz5 @@ -80,48 +93,69 @@ This package contains development files for libqimageblitz5. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build WORKDIR="$PWD" %define __builddir build-qt5 %cmake -DQT4_BUILD=OFF make %{?_smp_mflags} V=1 + +%if %{with qt4} cd "$WORKDIR" %define __builddir build-qt4 %cmake -DQT4_BUILD=ON make %{?_smp_mflags} V=1 +%endif %install WORKDIR="$PWD" %define __builddir build-qt5 %cmake_install + +%if %{with qt4} cd "$WORKDIR" %define __builddir build-qt4 %cmake_install +%endif +%if %{with qt4} %post -n %{soname_qt4}%{sover_qt4} -p /sbin/ldconfig %postun -n %{soname_qt4}%{sover_qt4} -p /sbin/ldconfig +%endif %post -n %{soname_qt5}-%{sover_qt5} -p /sbin/ldconfig %postun -n %{soname_qt5}-%{sover_qt5} -p /sbin/ldconfig +%if %{with qt4} %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}* +%endif %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}* +%if %{with qt4} %files -n %{soname_qt4}-devel %{_includedir}/qimageblitz/ %{_bindir}/blitztest %{_libdir}/%{soname_qt4}.so %{_libdir}/pkgconfig/qimageblitz.pc +%endif %files -n %{soname_qt5}-devel %{_includedir}/qimageblitz5/ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.QGpa1l/_old 2020-01-30 14:49:40.918879536 +0100 +++ /var/tmp/diff_new_pack.QGpa1l/_new 2020-01-30 14:49:40.918879536 +0100 @@ -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.QGpa1l/_old 2020-01-30 14:49:40.970879564 +0100 +++ /var/tmp/diff_new_pack.QGpa1l/_new 2020-01-30 14:49:40.974879567 +0100 @@ -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} ++++++ remove-ansi-option.patch ++++++ From: Luca Beltrame <lbeltrame@kde.org> Subject: Remove -ansi option It is equivalent to "-std=c++98", which breaks building as Qt relies on C++11. --- Index: qimageblitz-0.0.6+svn1515099/CMakeLists.txt =================================================================== --- qimageblitz-0.0.6+svn1515099.orig/CMakeLists.txt +++ qimageblitz-0.0.6+svn1515099/CMakeLists.txt @@ -32,7 +32,7 @@ set(LIB_INSTALL_DIR "${EXEC_INS if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common") add_definitions(-DQT_NO_EXCEPTIONS) endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) endif (CMAKE_COMPILER_IS_GNUCXX)