Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mobipocket for openSUSE:Factory checked in at 2023-04-23 22:44:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mobipocket (Old) and /work/SRC/openSUSE:Factory/.mobipocket.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mobipocket" Sun Apr 23 22:44:45 2023 rev:152 rq:1080731 version:23.04.0 Changes: -------- --- /work/SRC/openSUSE:Factory/mobipocket/mobipocket.changes 2023-03-19 16:15:52.447116628 +0100 +++ /work/SRC/openSUSE:Factory/.mobipocket.new.1533/mobipocket.changes 2023-04-23 22:46:18.422319377 +0200 @@ -1,0 +2,20 @@ +Sat Apr 15 08:45:38 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.04.0/ + +------------------------------------------------------------------- +Fri Mar 31 16:41:53 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.90 + * New feature release + +------------------------------------------------------------------- +Fri Mar 17 20:43:20 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.03.80 + * New feature release + +------------------------------------------------------------------- Old: ---- kdegraphics-mobipocket-22.12.3.tar.xz kdegraphics-mobipocket-22.12.3.tar.xz.sig New: ---- kdegraphics-mobipocket-23.04.0.tar.xz kdegraphics-mobipocket-23.04.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mobipocket.spec ++++++ --- /var/tmp/diff_new_pack.A1Slfd/_old 2023-04-23 22:46:19.966328101 +0200 +++ /var/tmp/diff_new_pack.A1Slfd/_new 2023-04-23 22:46:19.974328146 +0200 @@ -22,7 +22,7 @@ %bcond_without released Name: mobipocket -Version: 22.12.3 +Version: 23.04.0 Release: 0 Summary: E-book plugin and library License: GPL-2.0-or-later @@ -75,7 +75,7 @@ %{_kf5_libdir}/libqmobipocket.so.* %files devel -%{_includedir}/qmobipocket/ +%{_includedir}/QMobipocket/ %{_kf5_cmakedir}/QMobipocket/ %{_kf5_libdir}/libqmobipocket.so ++++++ kdegraphics-mobipocket-22.12.3.tar.xz -> kdegraphics-mobipocket-23.04.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/.gitlab-ci.yml new/kdegraphics-mobipocket-23.04.0/.gitlab-ci.yml --- old/kdegraphics-mobipocket-22.12.3/.gitlab-ci.yml 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/.gitlab-ci.yml 2023-03-10 03:08:01.000000000 +0100 @@ -3,8 +3,10 @@ include: - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/android-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml - - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml + - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/.kde-ci.yml new/kdegraphics-mobipocket-23.04.0/.kde-ci.yml --- old/kdegraphics-mobipocket-22.12.3/.kde-ci.yml 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/.kde-ci.yml 2023-03-10 03:08:01.000000000 +0100 @@ -2,7 +2,10 @@ # SPDX-License-Identifier: CC0-1.0 Dependencies: -- 'on': ['@all'] +- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6', 'Android/Qt6'] + 'require': + 'frameworks/extra-cmake-modules': '@latest-kf6' + +- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5', 'Android/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@stable' - 'frameworks/kio': '@stable' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/CMakeLists.txt new/kdegraphics-mobipocket-23.04.0/CMakeLists.txt --- old/kdegraphics-mobipocket-22.12.3/CMakeLists.txt 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/CMakeLists.txt 2023-03-10 03:08:01.000000000 +0100 @@ -1,17 +1,20 @@ cmake_minimum_required (VERSION 3.16 FATAL_ERROR) -project(mobipocket) +project(mobipocket VERSION 2.1.0) -find_package(ECM 5.90.0 REQUIRED NO_MODULE) +find_package(ECM 5.92.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ) + +include(KDEInstallDirs) +include(KDECMakeSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) + include(FeatureSummary) include(GenerateExportHeader) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(ECMSetupVersion) -include(KDEInstallDirs) -include(KDECMakeSettings) -include(KDECompilerSettings NO_POLICY_SCOPE) +include(ECMDeprecationSettings) set(REQUIRED_QT_VERSION 5.12.0) find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core Gui) @@ -20,30 +23,41 @@ find_package(Qt6 REQUIRED COMPONENTS Core5Compat) endif() -ecm_setup_version("2.0.0" +if (QT_MAJOR_VERSION STREQUAL "6") + set(CMAKECONFIG_NAME "QMobipocket6") +else() + set(CMAKECONFIG_NAME "QMobipocket") +endif() + +ecm_setup_version(PROJECT VARIABLE_PREFIX QMOBIPOCKET - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/QMobipocketConfigVersion.cmake" + VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/lib/qmobipocket_version.h" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}ConfigVersion.cmake" SOVERSION "2" ) +ecm_set_disabled_deprecation_versions( + QT 6.4 +) + add_subdirectory(lib) -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/QMobipocket") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${CMAKECONFIG_NAME}") configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/QMobipocketConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/QMobipocketConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}Config.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(EXPORT QMobipocketTargets DESTINATION ${CMAKECONFIG_INSTALL_DIR} - FILE QMobipocketTargets.cmake + FILE ${CMAKECONFIG_NAME}Targets.cmake ) install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/QMobipocketConfig.cmake - ${CMAKE_CURRENT_BINARY_DIR}/QMobipocketConfigVersion.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}ConfigVersion.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/QMobipocketConfig.cmake.in new/kdegraphics-mobipocket-23.04.0/QMobipocketConfig.cmake.in --- old/kdegraphics-mobipocket-22.12.3/QMobipocketConfig.cmake.in 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/QMobipocketConfig.cmake.in 2023-03-10 03:08:01.000000000 +0100 @@ -4,6 +4,5 @@ find_dependency(Qt@QT_MAJOR_VERSION@Core "@REQUIRED_QT_VERSION@") find_dependency(Qt@QT_MAJOR_VERSION@Gui "@REQUIRED_QT_VERSION@") -find_dependency(KF5I18n) -include("${CMAKE_CURRENT_LIST_DIR}/QMobipocketTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/@[email protected]") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/lib/CMakeLists.txt new/kdegraphics-mobipocket-23.04.0/lib/CMakeLists.txt --- old/kdegraphics-mobipocket-22.12.3/lib/CMakeLists.txt 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/lib/CMakeLists.txt 2023-03-10 03:08:01.000000000 +0100 @@ -1,28 +1,56 @@ +if (QT_MAJOR_VERSION STREQUAL "6") + set(qmobipocket_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/QMobipocket6) +else() + set(qmobipocket_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/QMobipocket) +endif() -set (QMOBIPOCKET_SRCS +add_library(qmobipocket SHARED) +set_target_properties(qmobipocket PROPERTIES + VERSION ${QMOBIPOCKET_VERSION} + SOVERSION ${QMOBIPOCKET_SOVERSION} +) +if (QT_MAJOR_VERSION STREQUAL "6") + set_target_properties(qmobipocket PROPERTIES + LIBRARY_OUTPUT_NAME QMobipocket6 + EXPORT_NAME QMobipocket6 + ) +endif() + +target_sources( qmobipocket PRIVATE decompressor.cpp mobipocket.cpp qfilestream.cpp ) -add_library(qmobipocket SHARED ${QMOBIPOCKET_SRCS}) generate_export_header(qmobipocket) target_link_libraries (qmobipocket + PUBLIC Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Gui ) if(TARGET Qt6::Core5Compat) - target_link_libraries(qmobipocket Qt6::Core5Compat) + target_link_libraries(qmobipocket PRIVATE Qt6::Core5Compat) endif() +target_include_directories(qmobipocket + INTERFACE + "$<INSTALL_INTERFACE:${qmobipocket_INCLUDE_INSTALL_DIR}>" +) + install(FILES mobipocket.h qfilestream.h ${CMAKE_CURRENT_BINARY_DIR}/qmobipocket_export.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR}/qmobipocket/ COMPONENT Devel + DESTINATION ${qmobipocket_INCLUDE_INSTALL_DIR}/qmobipocket + COMPONENT Devel +) + +install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/qmobipocket_version.h + DESTINATION ${qmobipocket_INCLUDE_INSTALL_DIR} + COMPONENT Devel ) install(TARGETS qmobipocket EXPORT QMobipocketTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -set_target_properties(qmobipocket PROPERTIES VERSION ${QMOBIPOCKET_VERSION} SOVERSION ${QMOBIPOCKET_SOVERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/lib/decompressor.cpp new/kdegraphics-mobipocket-23.04.0/lib/decompressor.cpp --- old/kdegraphics-mobipocket-22.12.3/lib/decompressor.cpp 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/lib/decompressor.cpp 2023-03-10 03:08:01.000000000 +0100 @@ -235,7 +235,7 @@ case 1 : return new NOOPDecompressor(pdb); case 2 : return new RLEDecompressor(pdb); case 'H' : return new HuffdicDecompressor(pdb); - default : return 0; + default : return nullptr; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/lib/mobipocket.cpp new/kdegraphics-mobipocket-23.04.0/lib/mobipocket.cpp --- old/kdegraphics-mobipocket-22.12.3/lib/mobipocket.cpp 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/lib/mobipocket.cpp 2023-03-10 03:08:01.000000000 +0100 @@ -14,7 +14,7 @@ #include <QtEndian> #include <QBuffer> #include <QTextCodec> -#include <QtGui/QImageReader> +#include <QImageReader> #include <QRegExp> namespace Mobipocket { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdegraphics-mobipocket-22.12.3/lib/mobipocket.h new/kdegraphics-mobipocket-23.04.0/lib/mobipocket.h --- old/kdegraphics-mobipocket-22.12.3/lib/mobipocket.h 2022-08-28 10:10:17.000000000 +0200 +++ new/kdegraphics-mobipocket-23.04.0/lib/mobipocket.h 2023-03-10 03:08:01.000000000 +0100 @@ -13,7 +13,7 @@ #include <QString> #include <QByteArray> #include <QMap> -#include <QtGui/QImage> +#include <QImage> #include "qmobipocket_export.h"
