Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kColorPicker for openSUSE:Factory checked in at 2024-02-08 19:01:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kColorPicker (Old) and /work/SRC/openSUSE:Factory/.kColorPicker.new.1815 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kColorPicker" Thu Feb 8 19:01:28 2024 rev:7 rq:1143696 version:0.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kColorPicker/kColorPicker.changes 2022-05-24 20:30:57.734897739 +0200 +++ /work/SRC/openSUSE:Factory/.kColorPicker.new.1815/kColorPicker.changes 2024-02-08 19:01:30.121631849 +0100 @@ -1,0 +2,9 @@ +Tue Jan 16 17:14:48 UTC 2024 - Fabian Vogt <[email protected]> + +- Update to 0.3.0: + * Port away from deprecated QLayout API + * Add support for Qt 6 +- Build both Qt5 and Qt6 flavors +- Build and run unittests + +------------------------------------------------------------------- Old: ---- kColorPicker-0.2.0.tar.gz New: ---- _multibuild kColorPicker-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kColorPicker.spec ++++++ --- /var/tmp/diff_new_pack.uw93L6/_old 2024-02-08 19:01:30.841658226 +0100 +++ /var/tmp/diff_new_pack.uw93L6/_new 2024-02-08 19:01:30.845658373 +0100 @@ -1,7 +1,7 @@ # # spec file for package kColorPicker # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2024 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,35 @@ # +%global qtver 0 +%if "@BUILD_FLAVOR@" == "" +ExclusiveArch: do_not_build +%endif +%if "@BUILD_FLAVOR@" == "qt5" +%global qtver 5 +%endif +%if "@BUILD_FLAVOR@" == "qt6" +%global qtver 6 +%endif + %define sover 0 -%define libname libkColorPicker%{sover} +%define libname libkColorPicker-Qt%{qtver}-%{sover} +%if %{qtver} == 0 Name: kColorPicker -Version: 0.2.0 +%else +Name: kColorPicker-Qt%{qtver} +%endif +Version: 0.3.0 Release: 0 Summary: Qt based Color Picker with popup menu License: GPL-2.0-or-later Group: Development/Tools/Other URL: https://github.com/DamirPorobic/kColorPicker -Source: https://github.com/DamirPorobic/kColorPicker/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source: https://github.com/DamirPorobic/kColorPicker/archive/v%{version}.tar.gz#/kColorPicker-%{version}.tar.gz BuildRequires: cmake BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: pkgconfig(Qt5Test) -BuildRequires: pkgconfig(Qt5Widgets) +BuildRequires: cmake(Qt%{qtver}Test) +BuildRequires: cmake(Qt%{qtver}Widgets) %description QToolButton with color popup menu with lets you select a color. The popup @@ -50,26 +64,40 @@ Summary: Development files for %{name} Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} +%if %{qtver} == 5 +Obsoletes: kColorPicker-devel < %{version} +%endif %description devel Development files for %{name} including headers and libraries %prep -%setup -q +%autosetup -p1 -n kColorPicker-%{version} %build -%cmake +%cmake \ +%if %{qtver} == 6 + -DBUILD_WITH_QT6=TRUE \ +%endif + -DBUILD_TESTS=TRUE \ + -DBUILD_EXAMPLE=FALSE + %make_jobs %install %cmake_install +%check +export QT_QPA_PLATFORM=offscreen +%ctest + %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} %license LICENSE -%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}.so.%{sover} +%{_libdir}/lib%{name}.so.%{sover}.* %files devel %doc README.md ++++++ _multibuild ++++++ <multibuild> <flavor>qt5</flavor> <flavor>qt6</flavor> </multibuild> ++++++ kColorPicker-0.2.0.tar.gz -> kColorPicker-0.3.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/CMakeLists.txt new/kColorPicker-0.3.0/CMakeLists.txt --- old/kColorPicker-0.2.0/CMakeLists.txt 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/CMakeLists.txt 2024-01-16 12:13:22.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -project(kColorPicker LANGUAGES CXX VERSION 0.2.0) +project(kColorPicker LANGUAGES CXX VERSION 0.3.0) set(QT_MIN_VERSION "5.9.4") @@ -13,7 +13,17 @@ option(BUILD_TESTS "Build Unit Tests" OFF) option(BUILD_EXAMPLE "Build Example Application" ON) -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Widgets) +option(BUILD_WITH_QT6 "Build with Qt6" OFF) +if(BUILD_WITH_QT6) + set(CMAKE_CXX_STANDARD 17) + set(QT_MAJOR_VERSION 6) + set(kColorPicker_LIB_NAME "kColorPicker-Qt6") +else() + set(QT_MAJOR_VERSION 5) + set(kColorPicker_LIB_NAME "kColorPicker-Qt5") +endif() + +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED Widgets) include(GNUInstallDirs) include(FeatureSummary) @@ -27,33 +37,33 @@ endif (BUILD_EXAMPLE) if (BUILD_TESTS) - find_package(Qt5 ${QT_MIN_VERSION} REQUIRED Test) + find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED Test) enable_testing() add_subdirectory(tests) endif (BUILD_TESTS) include(CMakePackageConfigHelpers) -add_library(kColorPicker +add_library(${kColorPicker_LIB_NAME} ${KCOLORPICKER_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/include/kColorPicker/KColorPicker.h ${CMAKE_CURRENT_SOURCE_DIR}/icons/kColorPicker_icons.qrc ) -add_library(kColorPicker::kColorPicker ALIAS kColorPicker) +#add_library(kColorPicker::kColorPicker ALIAS kColorPicker) -target_include_directories(kColorPicker +target_include_directories(${kColorPicker_LIB_NAME} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include> - $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> + $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>/${kColorPicker_LIB_NAME} ) -target_link_libraries(kColorPicker PUBLIC Qt5::Widgets) +target_link_libraries(${kColorPicker_LIB_NAME} PUBLIC Qt${QT_MAJOR_VERSION}::Widgets) -target_compile_definitions(kColorPicker PRIVATE KIMAGEANNOTATOR_LIB) +target_compile_definitions(${kColorPicker_LIB_NAME} PRIVATE KIMAGEANNOTATOR_LIB) -set_target_properties(kColorPicker +set_target_properties(${kColorPicker_LIB_NAME} PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib @@ -62,43 +72,43 @@ SOVERSION 0 ) -install(TARGETS kColorPicker - EXPORT kColorPicker-targets +install(TARGETS ${kColorPicker_LIB_NAME} + EXPORT ${kColorPicker_LIB_NAME}-targets ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/kColorPicker - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${kColorPicker_LIB_NAME} ) -configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/kColorPickerConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/cmake/kColorPickerConfig.cmake - INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kColorPicker +configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/${kColorPicker_LIB_NAME}Config.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${kColorPicker_LIB_NAME}Config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${kColorPicker_LIB_NAME} ) -write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/cmake/kColorPickerConfig-version.cmake +write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/cmake/${kColorPicker_LIB_NAME}Config-version.cmake VERSION ${PROJECT_VERSION} COMPATIBILITY AnyNewerVersion ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/cmake/kColorPickerConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/cmake/kColorPickerConfig-version.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kColorPicker + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${kColorPicker_LIB_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/cmake/${kColorPicker_LIB_NAME}Config-version.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${kColorPicker_LIB_NAME} ) -export(EXPORT kColorPicker-targets - FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/kColorPicker-targets.cmake +export(EXPORT ${kColorPicker_LIB_NAME}-targets + FILE ${CMAKE_CURRENT_BINARY_DIR}/cmake/${kColorPicker_LIB_NAME}-targets.cmake NAMESPACE kColorPicker:: ) -install(EXPORT kColorPicker-targets - FILE kColorPicker-targets.cmake +install(EXPORT ${kColorPicker_LIB_NAME}-targets + FILE ${kColorPicker_LIB_NAME}-targets.cmake NAMESPACE kColorPicker:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/kColorPicker + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${kColorPicker_LIB_NAME} ) # uninstall target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/README.md new/kColorPicker-0.3.0/README.md --- old/kColorPicker-0.2.0/README.md 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/README.md 2024-01-16 12:13:22.000000000 +0100 @@ -1,7 +1,7 @@ # kColorPicker [![Build Status][github-badge]][github-url] QToolButton with color popup menu with lets you select a color. The popup features a color dialog button which can be used to add custom colors to the popup menu. -Version 0.2.0 +Version 0.3.0  @@ -14,6 +14,7 @@ `$ mkdir build && cd build` 4. Create the makefile and build the project: `$ cmake .. && make` + to build with Qt6, pass `-DBUILD_WITH_QT6=true` to the `cmake` command 5. Install shared library (not required when only using the example): `$ sudo make install` 6. Run the example application: @@ -30,11 +31,17 @@ 1. Let cmake find the shared library, optionally with version `set(KCOLORPICKER_MIN_VERSION "0.x.x")` - `find_package(kColorPicker ${KCOLORPICKER_MIN_VERSION} REQUIRED)` + to build with Qt5: + `find_package(kColorPicker-Qt5 ${KCOLORPICKER_MIN_VERSION} REQUIRED)` + to build with Qt6: + `find_package(kColorPicker-Qt6 ${KCOLORPICKER_MIN_VERSION} REQUIRED)` 2. Link the library with your application - `target_link_libraries(myApp kColorPicker)` + if you built with Qt5: + `target_link_libraries(myApp kColorPicker-Qt5)` + if you built with Qt6: + `target_link_libraries(myApp kColorPicker-Qt6)` [github-badge]: https://github.com/ksnip/kColorPicker/actions/workflows/build.yml/badge.svg -[github-url]: https://github.com/ksnip/kColorPicker/actions \ No newline at end of file +[github-url]: https://github.com/ksnip/kColorPicker/actions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/cmake/kColorPicker-Qt5Config.cmake.in new/kColorPicker-0.3.0/cmake/kColorPicker-Qt5Config.cmake.in --- old/kColorPicker-0.2.0/cmake/kColorPicker-Qt5Config.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/kColorPicker-0.3.0/cmake/kColorPicker-Qt5Config.cmake.in 2024-01-16 12:13:22.000000000 +0100 @@ -0,0 +1,9 @@ +include(CMakeFindDependencyMacro) + +@PACKAGE_INIT@ + +find_dependency(Qt5 @QT_MIN_VERSION@ COMPONENTS Widgets) + +if(NOT TARGET kColorPicker::kColorPicker-Qt5) + include("${CMAKE_CURRENT_LIST_DIR}/kColorPicker-Qt5-targets.cmake") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/cmake/kColorPicker-Qt6Config.cmake.in new/kColorPicker-0.3.0/cmake/kColorPicker-Qt6Config.cmake.in --- old/kColorPicker-0.2.0/cmake/kColorPicker-Qt6Config.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/kColorPicker-0.3.0/cmake/kColorPicker-Qt6Config.cmake.in 2024-01-16 12:13:22.000000000 +0100 @@ -0,0 +1,9 @@ +include(CMakeFindDependencyMacro) + +@PACKAGE_INIT@ + +find_dependency(Qt6 @QT_MIN_VERSION@ COMPONENTS Widgets) + +if(NOT TARGET kColorPicker::kColorPicker-Qt6) + include("${CMAKE_CURRENT_LIST_DIR}/kColorPicker-Qt6-targets.cmake") +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/cmake/kColorPickerConfig.cmake.in new/kColorPicker-0.3.0/cmake/kColorPickerConfig.cmake.in --- old/kColorPicker-0.2.0/cmake/kColorPickerConfig.cmake.in 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/cmake/kColorPickerConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -include(CMakeFindDependencyMacro) - -@PACKAGE_INIT@ - -find_dependency(Qt5 @QT_MIN_VERSION@ COMPONENTS Widgets) - -if(NOT TARGET kColorPicker::kColorPicker) - include("${CMAKE_CURRENT_LIST_DIR}/kColorPicker-targets.cmake") -endif() \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/example/CMakeLists.txt new/kColorPicker-0.3.0/example/CMakeLists.txt --- old/kColorPicker-0.2.0/example/CMakeLists.txt 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/example/CMakeLists.txt 2024-01-16 12:13:22.000000000 +0100 @@ -1,3 +1,3 @@ add_executable(kColorPicker-example main.cpp) -target_link_libraries(kColorPicker-example kColorPicker) \ No newline at end of file +target_link_libraries(kColorPicker-example ${kColorPicker_LIB_NAME}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/example/main.cpp new/kColorPicker-0.3.0/example/main.cpp --- old/kColorPicker-0.2.0/example/main.cpp 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/example/main.cpp 2024-01-16 12:13:22.000000000 +0100 @@ -19,7 +19,7 @@ #include <QApplication> #include <QVBoxLayout> -#include <kColorPicker/KColorPicker.h> +#include "kColorPicker/KColorPicker.h" using kColorPicker::KColorPicker; @@ -37,4 +37,4 @@ widget->show(); return app.exec(); -} \ No newline at end of file +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/include/kColorPicker/KColorPicker.h new/kColorPicker-0.3.0/include/kColorPicker/KColorPicker.h --- old/kColorPicker-0.2.0/include/kColorPicker/KColorPicker.h 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/include/kColorPicker/KColorPicker.h 2024-01-16 12:13:22.000000000 +0100 @@ -24,7 +24,7 @@ #include <QColor> #include <QList> -#include <kColorPicker/KColorPickerExport.h> +#include "kColorPicker/KColorPickerExport.h" namespace kColorPicker { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/src/KColorPicker.cpp new/kColorPicker-0.3.0/src/KColorPicker.cpp --- old/kColorPicker-0.2.0/src/KColorPicker.cpp 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/src/KColorPicker.cpp 2024-01-16 12:13:22.000000000 +0100 @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kColorPicker/KColorPicker.h> +#include "kColorPicker/KColorPicker.h" #include "IconCreator.h" #include "PopupMenu.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/src/PopupMenu.cpp new/kColorPicker-0.3.0/src/PopupMenu.cpp --- old/kColorPicker-0.2.0/src/PopupMenu.cpp 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/src/PopupMenu.cpp 2024-01-16 12:13:22.000000000 +0100 @@ -28,7 +28,7 @@ mColorDialogButton(new ColorDialogButton(QIcon(QLatin1String(":/icons/ellipsis")), showAlphaChannel)) { mLayout->setSpacing(0); - mLayout->setMargin(5); + mLayout->setContentsMargins(5, 5, 5, 5); setLayout(mLayout); connect(mColorDialogButton, &AbstractPopupMenuButton::colorSelected, this, &PopupMenu::colorSelected); @@ -136,4 +136,4 @@ return mLayout->sizeHint(); } -} // namespace kColorPicker \ No newline at end of file +} // namespace kColorPicker diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kColorPicker-0.2.0/tests/CMakeLists.txt new/kColorPicker-0.3.0/tests/CMakeLists.txt --- old/kColorPicker-0.2.0/tests/CMakeLists.txt 2022-04-07 22:37:30.000000000 +0200 +++ new/kColorPicker-0.3.0/tests/CMakeLists.txt 2024-01-16 12:13:22.000000000 +0100 @@ -4,11 +4,11 @@ add_library(KCOLORPICKER_STATIC STATIC ${KCOLORPICKER_SRCS}) -target_link_libraries(KCOLORPICKER_STATIC Qt5::Widgets kColorPicker) +target_link_libraries(KCOLORPICKER_STATIC Qt${QT_MAJOR_VERSION}::Widgets ${kColorPicker_LIB_NAME}) foreach (UnitTest ${UNITTEST_SRC}) get_filename_component(UnitTestName ${UnitTest} NAME_WE) add_executable(${UnitTestName} ${UnitTest}) - target_link_libraries(${UnitTestName} KCOLORPICKER_STATIC Qt5::Test) + target_link_libraries(${UnitTestName} KCOLORPICKER_STATIC Qt${QT_MAJOR_VERSION}::Test) add_test(${UnitTestName} ${UnitTestName}) -endforeach (UnitTest) \ No newline at end of file +endforeach (UnitTest)
