commit libkmahjongg for openSUSE:Factory
Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libkmahjongg for openSUSE:Factory checked in at 2023-08-31 13:45:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkmahjongg (Old) and /work/SRC/openSUSE:Factory/.libkmahjongg.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkmahjongg" Thu Aug 31 13:45:12 2023 rev:136 rq:1105795 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkmahjongg/libkmahjongg.changes 2023-07-07 15:52:15.937963536 +0200 +++ /work/SRC/openSUSE:Factory/.libkmahjongg.new.1766/libkmahjongg.changes 2023-08-31 13:50:22.562212663 +0200 @@ -1,0 +2,26 @@ +Sun Aug 20 14:00:15 UTC 2023 - Christophe Marin <christophe@krop.fr> + +- Update to 23.08.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/23.08.0/ +- No code change since 23.07.90 + +------------------------------------------------------------------- +Mon Aug 14 08:03:32 UTC 2023 - Christophe Marin <christophe@krop.fr> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:14:28 UTC 2023 - Christophe Marin <christophe@krop.fr> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Add explicit moc includes to sources for moc-covered headers + * Have export macros header include version header (Qt6-only) + * Prepare "KMahjongglib6" as name for Qt6/KF6-based variant + +------------------------------------------------------------------- Old: ---- libkmahjongg-23.04.3.tar.xz libkmahjongg-23.04.3.tar.xz.sig New: ---- libkmahjongg-23.08.0.tar.xz libkmahjongg-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkmahjongg.spec ++++++ --- /var/tmp/diff_new_pack.3K659b/_old 2023-08-31 13:50:23.686252839 +0200 +++ /var/tmp/diff_new_pack.3K659b/_new 2023-08-31 13:50:23.690252982 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: libkmahjongg -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: General Data for KDE Games License: GPL-2.0-or-later ++++++ libkmahjongg-23.04.3.tar.xz -> libkmahjongg-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/CMakeLists.txt new/libkmahjongg-23.08.0/CMakeLists.txt --- old/libkmahjongg-23.04.3/CMakeLists.txt 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/CMakeLists.txt 2023-08-07 05:38:13.000000000 +0200 @@ -24,8 +24,8 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) +include(ECMGenerateExportHeader) -include(GenerateExportHeader) include(CMakePackageConfigHelpers) include(FeatureSummary) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/backgrounds/wood_light.desktop new/libkmahjongg-23.08.0/backgrounds/wood_light.desktop --- old/libkmahjongg-23.04.3/backgrounds/wood_light.desktop 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/backgrounds/wood_light.desktop 2023-08-07 05:38:13.000000000 +0200 @@ -71,7 +71,7 @@ Description[fi]=Muistuttaa puisen pöydän pintaa Description[fr]=Ressemble à la surface d'une table en bois Description[ga]=Cosúil le tábla adhmaid -Description[gl]=Aseméllase á superficie dunha mesa de madeira +Description[gl]=Aseméllase á superficie dunha mesa de madeira. Description[hi]=लकड़ी के टेबल की सतह से मिलता जुलता Description[hu]=Egy fából készült asztal lapjára hasonlít Description[id]=Menyerupai permukaan meja kayu diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/po/zh_CN/libkmahjongg5.po new/libkmahjongg-23.08.0/po/zh_CN/libkmahjongg5.po --- old/libkmahjongg-23.04.3/po/zh_CN/libkmahjongg5.po 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/po/zh_CN/libkmahjongg5.po 2023-08-07 05:38:13.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n" "POT-Creation-Date: 2022-09-28 00:44+0000\n" -"PO-Revision-Date: 2023-07-03 11:40\n" +"PO-Revision-Date: 2023-08-02 12:43\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/src/CMakeLists.txt new/libkmahjongg-23.08.0/src/CMakeLists.txt --- old/libkmahjongg-23.04.3/src/CMakeLists.txt 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/src/CMakeLists.txt 2023-08-07 05:38:13.000000000 +0200 @@ -1,16 +1,34 @@ -set(kmahjongg_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KMahjongg) +if (QT_MAJOR_VERSION STREQUAL "5") + set(kmahjongg_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KMahjongg) + set(CMAKECONFIG_NAME "KF5KMahjongglib") + set(CMAKECONFIGTARGET_NAME "KF5KMahjongg") # for history reasons different from CMAKECONFIG_NAME + set(LIBRARYFILE_NAME "KF5KMahjongglib") + set(TARGET_EXPORT_NAME "KF5KMahjongglib") +else() + set(kmahjongg_INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR}/KMahjongg6) + set(CMAKECONFIG_NAME "KMahjongglib6") + set(CMAKECONFIGTARGET_NAME "KMahjongglib6") + set(LIBRARYFILE_NAME "KMahjongg6") # no need to repeat "lib" with the actualy library file name + set(TARGET_EXPORT_NAME "KMahjongglib6") +endif() add_definitions(-DTRANSLATION_DOMAIN="libkmahjongg5") ecm_setup_version(${libkmahjongg_VERSION} VARIABLE_PREFIX KMAHJONGGLIB VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmahjongglib_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" + PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}ConfigVersion.cmake" COMPATIBILITY SameMajorVersion SOVERSION 5 ) add_library(KMahjongglib SHARED) +set_target_properties(KMahjongglib PROPERTIES + VERSION ${KMAHJONGGLIB_VERSION} + SOVERSION ${KMAHJONGGLIB_SOVERSION} + OUTPUT_NAME ${LIBRARYFILE_NAME} + EXPORT_NAME ${TARGET_EXPORT_NAME} +) target_sources(KMahjongglib PRIVATE kmahjonggtileset.cpp kmahjonggtileset.h @@ -41,7 +59,23 @@ kmahjonggbackgroundselector.ui ) -generate_export_header(KMahjongglib BASE_NAME libkmahjongg) +if (QT_MAJOR_VERSION STREQUAL "5") + set(_generate_export_header_version_args) +else() + # For Qt6/KF6 world transitively include the version header + if(ECM_VERSION VERSION_LESS "5.106") + set(include_version_header_code "#include <kmahjongglib_version.h>\n") + set(_generate_export_header_version_args CUSTOM_CONTENT_FROM_VARIABLE include_version_header_code) + else() + set(_generate_export_header_version_args USE_VERSION_HEADER VERSION_BASE_NAME KMAHJONGGLIB) + endif() +endif() +ecm_generate_export_header(KMahjongglib + BASE_NAME libkmahjongg + VERSION ${libkmahjongg_VERSION} + DEPRECATED_BASE_VERSION 0 + ${_generate_export_header_version_args} +) target_link_libraries(KMahjongglib PUBLIC @@ -61,13 +95,6 @@ "$<INSTALL_INTERFACE:${kmahjongg_INCLUDE_INSTALL_DIR}>" ) -set_target_properties(KMahjongglib PROPERTIES - VERSION ${KMAHJONGGLIB_VERSION} - SOVERSION ${KMAHJONGGLIB_SOVERSION} - OUTPUT_NAME KF5KMahjongglib - EXPORT_NAME KF5KMahjongglib -) - install(TARGETS KMahjongglib EXPORT KMahjonggTargets @@ -89,23 +116,23 @@ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR} ) -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KMahjongglib") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/${CMAKECONFIG_NAME}") configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5KMahjongglibConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" + "${CMAKE_CURRENT_SOURCE_DIR}/KMahjongglibConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}Config.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KF5KMahjongglibConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKECONFIG_NAME}ConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT KMahjonggTargets DESTINATION ${CMAKECONFIG_INSTALL_DIR} - FILE KF5KMahjonggTargets.cmake + FILE ${CMAKECONFIGTARGET_NAME}Targets.cmake COMPONENT Devel ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/src/KF5KMahjongglibConfig.cmake.in new/libkmahjongg-23.08.0/src/KF5KMahjongglibConfig.cmake.in --- old/libkmahjongg-23.04.3/src/KF5KMahjongglibConfig.cmake.in 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/src/KF5KMahjongglibConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,9 +0,0 @@ -@PACKAGE_INIT@ - -# Any changes in this file will be overwritten by CMake. - -include(CMakeFindDependencyMacro) -find_dependency(Qt@QT_MAJOR_VERSION@Gui @QT_MIN_VERSION@) -find_dependency(KF@KF_MAJOR_VERSION@ConfigWidgets @KF_MIN_VERSION@) - -include("${CMAKE_CURRENT_LIST_DIR}/KF5KMahjonggTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/src/KMahjongglibConfig.cmake.in new/libkmahjongg-23.08.0/src/KMahjongglibConfig.cmake.in --- old/libkmahjongg-23.04.3/src/KMahjongglibConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkmahjongg-23.08.0/src/KMahjongglibConfig.cmake.in 2023-08-07 05:38:13.000000000 +0200 @@ -0,0 +1,9 @@ +@PACKAGE_INIT@ + +# Any changes in this file will be overwritten by CMake. + +include(CMakeFindDependencyMacro) +find_dependency(Qt@QT_MAJOR_VERSION@Gui @QT_MIN_VERSION@) +find_dependency(KF@KF_MAJOR_VERSION@ConfigWidgets @KF_MIN_VERSION@) + +include("${CMAKE_CURRENT_LIST_DIR}/@CMAKECONFIGTARGET_NAME@Targets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/src/kmahjonggbackgroundselector.cpp new/libkmahjongg-23.08.0/src/kmahjonggbackgroundselector.cpp --- old/libkmahjongg-23.04.3/src/kmahjonggbackgroundselector.cpp 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/src/kmahjonggbackgroundselector.cpp 2023-08-07 05:38:13.000000000 +0200 @@ -111,3 +111,5 @@ p.end(); backgroundPreview->setPixmap(QPixmap::fromImage(qiRend)); } + +#include "moc_kmahjonggbackgroundselector.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/src/kmahjonggconfigdialog.cpp new/libkmahjongg-23.08.0/src/kmahjonggconfigdialog.cpp --- old/libkmahjongg-23.04.3/src/kmahjonggconfigdialog.cpp 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/src/kmahjonggconfigdialog.cpp 2023-08-07 05:38:13.000000000 +0200 @@ -52,3 +52,5 @@ { //qCDebug(LIBKMAHJONGG_LOG) << "updateWidgetsDefault"; } + +#include "moc_kmahjonggconfigdialog.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/src/kmahjonggtilesetselector.cpp new/libkmahjongg-23.08.0/src/kmahjonggtilesetselector.cpp --- old/libkmahjongg-23.04.3/src/kmahjonggtilesetselector.cpp 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/src/kmahjonggtilesetselector.cpp 2023-08-07 05:38:13.000000000 +0200 @@ -113,3 +113,5 @@ p.end(); tilesetPreview->setPixmap(QPixmap::fromImage(qiRend)); } + +#include "moc_kmahjonggtilesetselector.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkmahjongg-23.04.3/tilesets/bamboo.desktop new/libkmahjongg-23.08.0/tilesets/bamboo.desktop --- old/libkmahjongg-23.04.3/tilesets/bamboo.desktop 2023-07-04 06:57:21.000000000 +0200 +++ new/libkmahjongg-23.08.0/tilesets/bamboo.desktop 2023-08-07 05:38:13.000000000 +0200 @@ -62,7 +62,7 @@ Description[eu]=Fitxa-multzo japoniarra, zur-hari leunekoa, kolore distiratsuko «kanji»ekin Description[fi]=Japanilainen tiilisetti, jonka puisissa tiilissä on kirkkaanvärisiä kanji-merkkejä Description[fr]=Tuiles dans le style japonais avec des kanjis vivement colorés sur un grain de bois doux -Description[gl]=Xogo de pezas nipón con rechamantes caracteres kanji en vetas da madeira lisas +Description[gl]=Xogo de pezas nipón con rechamantes caracteres kanji en vetas da madeira lisas. Description[hi]=कोमल लकड़ी के काष्ठमयता पर उज्जवल रंग की कांजी के साथ जापानी टाइलसेट। Description[hu]=Japán elemkészlet ragyogó színű írásjelekkel, puha fára Description[id]=Tileset Jepang dengan kanji berwarna cerah pada sebuah serbuk kayu yang lembut
participants (1)
-
Source-Sync