Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libkdepim for openSUSE:Factory checked in at 2023-08-31 13:43:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdepim (Old) and /work/SRC/openSUSE:Factory/.libkdepim.new.1766 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkdepim" Thu Aug 31 13:43:32 2023 rev:91 rq:1105789 version:23.08.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libkdepim/libkdepim.changes 2023-07-07 15:48:18.856551208 +0200 +++ /work/SRC/openSUSE:Factory/.libkdepim.new.1766/libkdepim.changes 2023-08-31 13:45:46.924360712 +0200 @@ -1,0 +2,32 @@ +Sun Aug 20 14:00:12 UTC 2023 - Christophe Marin <[email protected]> + +- 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:29 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.90 + * New feature release +- No code change since 23.07.80 + +------------------------------------------------------------------- +Tue Aug 1 10:14:26 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 23.07.80 + * New feature release +- Changes since 23.04.3: + * Avoid spurious checkcombobox toggle where indexes don't match (kde#347045) + * Fix platforms name + * Remove unused public method + * Remove unused dependencies + * Remove CI 6 job. We will use kf6 branch for kf6 works + * not export symbol of private methods + * Fix QCH support + * Remove configwidgets + * Use correct INSTALL_TARGETS_DEFAULT_ARGS + +------------------------------------------------------------------- Old: ---- libkdepim-23.04.3.tar.xz libkdepim-23.04.3.tar.xz.sig New: ---- libkdepim-23.08.0.tar.xz libkdepim-23.08.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdepim.spec ++++++ --- /var/tmp/diff_new_pack.dxBNi0/_old 2023-08-31 13:45:48.080402031 +0200 +++ /var/tmp/diff_new_pack.dxBNi0/_new 2023-08-31 13:45:48.088402317 +0200 @@ -18,7 +18,7 @@ %bcond_without released Name: libkdepim -Version: 23.04.3 +Version: 23.08.0 Release: 0 Summary: Base package of kdepim License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later @@ -34,11 +34,8 @@ BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5Contacts) -BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5GuiAddons) BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5ItemViews) -BuildRequires: cmake(KF5JobWidgets) BuildRequires: cmake(KF5Wallet) BuildRequires: cmake(KF5WidgetsAddons) BuildRequires: cmake(KPim5Akonadi) ++++++ libkdepim-23.04.3.tar.xz -> libkdepim-23.08.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/.gitignore new/libkdepim-23.08.0/.gitignore --- old/libkdepim-23.04.3/.gitignore 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/.gitignore 2023-08-12 08:00:19.000000000 +0200 @@ -26,3 +26,4 @@ .idea /cmake-build* .cache +Testing/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/.gitlab-ci.yml new/libkdepim-23.08.0/.gitlab-ci.yml --- old/libkdepim-23.04.3/.gitlab-ci.yml 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/.gitlab-ci.yml 2023-08-12 08:00:19.000000000 +0200 @@ -5,6 +5,3 @@ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.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/linux-qt6.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-qt6.yml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/.kde-ci.yml new/libkdepim-23.08.0/.kde-ci.yml --- old/libkdepim-23.04.3/.kde-ci.yml 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/.kde-ci.yml 2023-08-12 08:00:19.000000000 +0200 @@ -5,28 +5,9 @@ - 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5'] 'require': 'frameworks/extra-cmake-modules': '@latest' - 'frameworks/kcontacts' : '@latest' - 'frameworks/kconfig': '@latest' 'frameworks/kcompletion': '@latest' - 'frameworks/kconfigwidgets': '@latest' - 'frameworks/kcoreaddons': '@latest' 'frameworks/ki18n': '@latest' - 'frameworks/kitemviews': '@latest' - 'frameworks/kjobwidgets': '@latest' 'frameworks/kwidgetsaddons': '@latest' -- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6'] - 'require': - 'frameworks/extra-cmake-modules': '@latest-kf6' - 'frameworks/kcontacts' : '@latest-kf6' - 'frameworks/kconfig': '@latest-kf6' - 'frameworks/kcompletion': '@latest-kf6' - 'frameworks/kconfigwidgets': '@latest-kf6' - 'frameworks/kcoreaddons': '@latest-kf6' - 'frameworks/ki18n': '@latest-kf6' - 'frameworks/kitemviews': '@latest-kf6' - 'frameworks/kjobwidgets': '@latest-kf6' - 'frameworks/kwidgetsaddons': '@latest-kf6' - Options: require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/CMakeLists.txt new/libkdepim-23.08.0/CMakeLists.txt --- old/libkdepim-23.04.3/CMakeLists.txt 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/CMakeLists.txt 2023-08-12 08:00:19.000000000 +0200 @@ -1,11 +1,11 @@ # SPDX-FileCopyrightText: none # SPDX-License-Identifier: BSD-3-Clause cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.23.3") +set(PIM_VERSION "5.24.0") project(libkdepim VERSION ${PIM_VERSION}) -set(KF_MIN_VERSION "5.103.0") +set(KF_MIN_VERSION "5.105.0") find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -48,17 +48,13 @@ find_package(KF${KF_MAJOR_VERSION}Config ${KF_MIN_VERSION} CONFIG REQUIRED) find_package(KF${KF_MAJOR_VERSION}Completion ${KF_MIN_VERSION} CONFIG REQUIRED) -find_package(KF${KF_MAJOR_VERSION}ConfigWidgets ${KF_MIN_VERSION} CONFIG REQUIRED) -find_package(KF${KF_MAJOR_VERSION}CoreAddons ${KF_MIN_VERSION} CONFIG REQUIRED) find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED) -find_package(KF${KF_MAJOR_VERSION}ItemViews ${KF_MIN_VERSION} CONFIG REQUIRED) -find_package(KF${KF_MAJOR_VERSION}JobWidgets ${KF_MIN_VERSION} CONFIG REQUIRED) find_package(KF${KF_MAJOR_VERSION}WidgetsAddons ${KF_MIN_VERSION} CONFIG REQUIRED) option(BUILD_DESIGNERPLUGIN "Build plugin for Qt Designer" ON) add_feature_info(DESIGNERPLUGIN ${BUILD_DESIGNERPLUGIN} "Build plugin for Qt Designer") -ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.104.0) +ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.105.0) @@ -66,6 +62,8 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Libkdepim") set(MAILTRANSPORTDBUS_KF5_COMPAT FALSE) + + configure_package_config_file(KPimMailTransportDBusServiceConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MailTransportDBusServiceConfig.cmake PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR @@ -100,6 +98,34 @@ endif() +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Libkdepim") +set(LIBKDEPIM_KF5_COMPAT FALSE) + +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KPim${KF_MAJOR_VERSION}Libkdepim_QCH + FILE KPim${KF_MAJOR_VERSION}LibkdepimQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimQchTargets.cmake\")") +endif() + +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KPimLibkdepimConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + ) + +install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/src/KPim${KF_MAJOR_VERSION}LibkdepimConfigVersion.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + +install(EXPORT KPim${KF_MAJOR_VERSION}LibkdepimTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}LibkdepimTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) + if (QT_MAJOR_VERSION STREQUAL "5") ## @@ -108,7 +134,7 @@ set(CMAKECONFIG_INSTALL_DIR_KF5 "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Libkdepim") set(LIBKDEPIM_KF5_COMPAT TRUE) configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/src/KPimLibkdepimConfig.cmake.in" + "${CMAKE_CURRENT_SOURCE_DIR}/KPimLibkdepimConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5} ) @@ -129,6 +155,13 @@ FILE KPim${KF_MAJOR_VERSION}LibkdepimTargets.cmake NAMESPACE KF5:: ) +if (BUILD_QCH) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimQchTargets.cmake" + DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}" + COMPONENT Devel + ) +endif() endif() ecm_qt_install_logging_categories( @@ -140,14 +173,6 @@ kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) ki18n_install(po) -if (BUILD_QCH) - ecm_install_qch_export( - TARGETS KPim${KF_MAJOR_VERSION}Libkdepim_QCH - FILE KPim${KF_MAJOR_VERSION}LibkdepimQchTargets.cmake - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimQchTargets.cmake\")") -endif() + feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/CMakePresets.json new/libkdepim-23.08.0/CMakePresets.json --- old/libkdepim-23.04.3/CMakePresets.json 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/CMakePresets.json 2023-08-12 08:00:19.000000000 +0200 @@ -41,6 +41,31 @@ ] }, { + "name": "dev-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base" + ] + }, + { + "name": "dev-qt6-qch", + "displayName": "Build as debug", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "BUILD_QCH": "ON" + }, + "inherits": [ + "base-qt6" + ] + }, + + { "name": "dev-qt6", "displayName": "Build against qt6", "binaryDir": "${sourceDir}/build-qt6", @@ -158,11 +183,19 @@ "name": "dev-mold", "configurePreset": "dev-mold" }, + { + "name": "dev-qch", + "configurePreset": "dev-qch" + }, { "name": "dev-qt6", "configurePreset": "dev-qt6" }, { + "name": "dev-qt6-qch", + "configurePreset": "dev-qt6-qch" + }, + { "name": "dev-clang", "configurePreset": "dev-clang" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/KPimLibkdepimConfig.cmake.in new/libkdepim-23.08.0/KPimLibkdepimConfig.cmake.in --- old/libkdepim-23.04.3/KPimLibkdepimConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 +++ new/libkdepim-23.08.0/KPimLibkdepimConfig.cmake.in 2023-08-12 08:00:19.000000000 +0200 @@ -0,0 +1,18 @@ +# SPDX-FileCopyrightText: 2017 Montel Laurent <[email protected]> +# SPDX-License-Identifier: BSD-3-Clause + +@PACKAGE_INIT@ +include(CMakeFindDependencyMacro) + +if (@LIBKDEPIM_KF5_COMPAT@) + message(WARNING "\n" + "************* DEPRECATION WARNING *************\n" + "Using find_package(KF5Libkdepim) and KF5::Libkdepim targets is deprecated. " + "Please use find_package(KPim@KF_MAJOR_VERSION@Libkdepim) and KPim@KF_MAJOR_VERSION@::Libkdepim instead. This backwards " + "compatibility will be removed in the next major version.\n" + "***********************************************\n") +endif() + +include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") + +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/metainfo.yaml new/libkdepim-23.08.0/metainfo.yaml --- old/libkdepim-23.04.3/metainfo.yaml 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/metainfo.yaml 2023-08-12 08:00:19.000000000 +0200 @@ -5,7 +5,10 @@ type: functional group: kdepim platforms: - - name: All + - name: Linux + - name: FreeBSD + - name: macOS + - name: Windows irc: akonadi libraries: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/po/eo/libkdepim.po new/libkdepim-23.08.0/po/eo/libkdepim.po --- old/libkdepim-23.04.3/po/eo/libkdepim.po 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/po/eo/libkdepim.po 2023-08-12 08:00:19.000000000 +0200 @@ -1,13 +1,15 @@ # Translation of libkdepim into esperanto. +# Copyright (C) 2009 Free Software Foundation, Inc. # Axel Rousseau <[email protected]>, 2009. +# Oliver Kellogg <[email protected]>, 2023. # msgid "" msgstr "" "Project-Id-Version: libkdepim\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-02-22 00:59+0000\n" -"PO-Revision-Date: 2009-11-15 12:06+0100\n" -"Last-Translator: Axel Rousseau <[email protected]>\n" +"PO-Revision-Date: 2023-05-06 10:51+0100\n" +"Last-Translator: Oliver Kellogg <[email protected]>\n" "Language-Team: esperanto <[email protected]>\n" "Language: eo\n" "MIME-Version: 1.0\n" @@ -20,11 +22,12 @@ #, kde-format msgid "We can not add more recipients. We have reached maximum recipients" msgstr "" +"Ni ne povas aldoni pli da ricevantoj. Ni atingis maksimumajn ricevantojn" #: progresswidget/progressdialog.cpp:226 #, kde-format msgid "Cancel this operation." -msgstr "" +msgstr "Nuligi Äi tiun operacion." #: progresswidget/progressmanager.cpp:111 #, kde-format @@ -34,665 +37,36 @@ #: progresswidget/ssllabel.cpp:39 #, kde-format msgid "Connection is encrypted" -msgstr "" +msgstr "Konekto estas Äifrita" #: progresswidget/ssllabel.cpp:44 #, kde-format msgid "Connection is unencrypted" -msgstr "" +msgstr "Konekto estas neÄifrita" #: progresswidget/statusbarprogresswidget.cpp:65 #, kde-format msgid "Open detailed progress dialog" -msgstr "" +msgstr "Malfermi detalan progresdialogon" #: progresswidget/statusbarprogresswidget.cpp:267 #, kde-format msgid "Show detailed progress window" -msgstr "" +msgstr "Montri detalan progresfenestron" #: progresswidget/statusbarprogresswidget.cpp:270 #, kde-format msgid "Hide detailed progress window" -msgstr "" +msgstr "KaÅi detalan progresfenestron" #: widgets/kwidgetlister.cpp:91 #, kde-format msgctxt "more widgets" msgid "More" -msgstr "" +msgstr "Pli" #: widgets/kwidgetlister.cpp:96 #, kde-format msgctxt "fewer widgets" msgid "Fewer" -msgstr "" - -#~ msgid "Choose..." -#~ msgstr "Elekti..." - -#, fuzzy -#~| msgid "Preferences" -#~ msgctxt "@title:window" -#~ msgid "Preferences" -#~ msgstr "Preferaĵoj" - -#~ msgid "Reset to Defaults" -#~ msgstr "Restarigi defaÅltojn" - -#, fuzzy -#~| msgid "A&dd" -#~ msgid "Add" -#~ msgstr "Al&doni" - -#, fuzzy -#~| msgid "<< &Remove" -#~ msgid "Remove" -#~ msgstr "<< Fo&rigi" - -#, fuzzy -#~ msgid "Configure Completion..." -#~ msgstr "Agordu konton" - -#~ msgid "Recent Addresses" -#~ msgstr "Lasttempe uzita adreso" - -#, fuzzy -#~| msgid "Search for:" -#~ msgid "Search email:" -#~ msgstr "SerÄu por:" - -#~ msgid "Search" -#~ msgstr "SerÄi" - -#, fuzzy -#~| msgid "Email Address" -#~ msgid "Show Blacklisted Emails" -#~ msgstr "RetpoÅta adreso" - -#, fuzzy -#~| msgid "Selection" -#~ msgid "&Select" -#~ msgstr "Elektaĵo" - -#, fuzzy -#~| msgid "Unselect All" -#~ msgid "&Unselect" -#~ msgstr "Malelekti Äion" - -#, fuzzy -#~| msgid "Loading..." -#~ msgid "Search in result..." -#~ msgstr "Åargas..." - -#, fuzzy -#~ msgctxt "@title:window" -#~ msgid "Configure Completion" -#~ msgstr "Agordu konton" - -#, fuzzy -#~ msgid "Completion Order" -#~ msgstr "Agordu konton" - -#, fuzzy -#~| msgid "Recent Addresses" -#~ msgid "Recent Address" -#~ msgstr "Lasttempe uzita adreso" - -#, fuzzy -#~| msgid "Email Address" -#~ msgid "Blacklist Email Address" -#~ msgstr "RetpoÅta adreso" - -#, fuzzy -#~ msgctxt "@title:window" -#~ msgid "Edit Completion Order" -#~ msgstr "Agordu konton" - -#, fuzzy -#~| msgid "No description available" -#~ msgctxt "@title:window" -#~ msgid "No Address Book Available" -#~ msgstr "Neniu priskribo uzebla" - -#, fuzzy -#~| msgid "&Address Book" -#~ msgctxt "@title:window" -#~ msgid "Add Address Book" -#~ msgstr "&Adresaro" - -#~ msgctxt "NAME OF TRANSLATORS" -#~ msgid "Your names" -#~ msgstr "Axel Rousseau" - -#~ msgctxt "EMAIL OF TRANSLATORS" -#~ msgid "Your emails" -#~ msgstr "[email protected]" - -#, fuzzy -#~ msgctxt "@title:window" -#~ msgid "Add Host" -#~ msgstr "Aldonu al listo" - -#, fuzzy -#~| msgid "Tobias Koenig" -#~ msgid "(c) 2009 - 2010 Tobias Koenig" -#~ msgstr "Tobias Koenig" - -#~ msgid "Tobias Koenig" -#~ msgstr "Tobias Koenig" - -#, fuzzy -#~| msgid "Edit Contact" -#~ msgctxt "@title:window" -#~ msgid "Edit Host" -#~ msgstr "Redakti kontakton" - -#, fuzzy -#~| msgid "&Remove" -#~ msgid "Remove Host" -#~ msgstr "Fo&rigi" - -#, fuzzy -#~| msgid "&Add..." -#~ msgid "&Add Host..." -#~ msgstr "&Aldonu..." - -#, fuzzy -#~| msgid "Edit..." -#~ msgid "&Edit Host..." -#~ msgstr "Redakti..." - -#, fuzzy -#~| msgid "&Remove" -#~ msgid "&Remove Host" -#~ msgstr "Fo&rigi" - -#~ msgctxt "@item LDAP search key" -#~ msgid "Title" -#~ msgstr "Titolo" - -#~ msgid "Full Name" -#~ msgstr "Plena nomo" - -#~ msgctxt "@item LDAP search key" -#~ msgid "Email" -#~ msgstr "RetpoÅto" - -#~ msgid "Home Number" -#~ msgstr "Telefono" - -#~ msgid "Work Number" -#~ msgstr "Labora telefono" - -#~ msgid "Mobile Number" -#~ msgstr "Movebla telefon" - -#~ msgid "Fax Number" -#~ msgstr "Faksnumero" - -#~ msgid "Pager" -#~ msgstr "MesaÄricevilo" - -#~ msgid "Street" -#~ msgstr "Strato" - -#~ msgctxt "@item LDAP search key" -#~ msgid "State" -#~ msgstr "Stato" - -#~ msgid "Country" -#~ msgstr "Lando" - -#~ msgid "City" -#~ msgstr "Urbo" - -#~ msgid "Organization" -#~ msgstr "Organizaĵo" - -#~ msgid "Company" -#~ msgstr "Firmao" - -#~ msgid "Department" -#~ msgstr "Distrikto" - -#~ msgid "Zip Code" -#~ msgstr "Urbokodo" - -#~ msgid "Postal Address" -#~ msgstr "PoÅtadreso" - -#~ msgid "Description" -#~ msgstr "Priskribo" - -#~ msgid "User ID" -#~ msgstr "Uzant-ID" - -#~ msgctxt "@title:column Column containing email addresses" -#~ msgid "Email" -#~ msgstr "RetpoÅto" - -#~ msgctxt "" -#~ "@title:column Column containing the residential state of the address" -#~ msgid "State" -#~ msgstr "Stato" - -#~ msgctxt "@title:column Column containing title of the person" -#~ msgid "Title" -#~ msgstr "Titolo" - -#, fuzzy -#~| msgid "Import Contacts?" -#~ msgctxt "@title:window" -#~ msgid "Import Contacts from LDAP" -#~ msgstr "Äu importi kontaktojn?" - -#~ msgid "Search for:" -#~ msgstr "SerÄu por:" - -#~ msgctxt "In LDAP attribute" -#~ msgid "in" -#~ msgstr "en" - -#~ msgctxt "@item:inlistbox Name of the contact" -#~ msgid "Name" -#~ msgstr "Nomo" - -#~ msgctxt "@item:inlistbox email address of the contact" -#~ msgid "Email" -#~ msgstr "RetpoÅto" - -#~ msgctxt "@item:inlistbox" -#~ msgid "Home Number" -#~ msgstr "Telefono" - -#~ msgctxt "@item:inlistbox" -#~ msgid "Work Number" -#~ msgstr "Labora telefono" - -#, fuzzy -#~| msgid "Search" -#~ msgctxt "@action:button Start searching" -#~ msgid "&Search" -#~ msgstr "SerÄi" - -#~ msgid "Recursive search" -#~ msgstr "Rekursiva serÄo" - -#~ msgid "Contains" -#~ msgstr "Enhavas" - -#, fuzzy -#~| msgid "Loading..." -#~ msgid "Searching..." -#~ msgstr "Åargas..." - -#~ msgid "Select All" -#~ msgstr "Elekti Äion" - -#~ msgid "Unselect All" -#~ msgstr "Malelekti Äion" - -#, fuzzy -#~| msgid "Address Selection" -#~ msgid "Add Selected" -#~ msgstr "Adreselekto" - -#, fuzzy -#~ msgid "Configure LDAP Servers..." -#~ msgstr "Agordu konton" - -#, fuzzy -#~| msgid "&Configure Address Book..." -#~ msgctxt "@title:window" -#~ msgid "Configure the Address Book LDAP Settings" -#~ msgstr "&Agordi adresaron..." - -#, fuzzy -#~| msgid "<< &Remove" -#~ msgid "&Remove" -#~ msgstr "<< Fo&rigi" - -#, fuzzy -#~| msgid "Address Book" -#~ msgctxt "@title:window" -#~ msgid "Select Address Book" -#~ msgstr "Adresaro" - -#~ msgid "Unknown" -#~ msgstr "Nekonata" - -#, fuzzy -#~| msgid "Duration" -#~ msgctxt "@info:tooltip period duration" -#~ msgid "Duration:" -#~ msgstr "DaÅro" - -#~ msgctxt "%1 is a time, %2 is a status message" -#~ msgid "[%1] %2" -#~ msgstr "[%1] %2" - -#, fuzzy -#~| msgid "Name" -#~ msgctxt "Search attribute: Name of contact" -#~ msgid "Name" -#~ msgstr "Nomo" - -#, fuzzy -#~| msgid "Email" -#~ msgctxt "Search attribute: Email of the contact" -#~ msgid "Email" -#~ msgstr "RetpoÅto" - -#, fuzzy -#~| msgid "Message" -#~ msgid "Total Messages" -#~ msgstr "MesaÄo" - -#, fuzzy -#~| msgid "Message" -#~ msgid "Unread Messages" -#~ msgstr "MesaÄo" - -#~ msgid "Stop" -#~ msgstr "Halti" - -#~ msgid "Message" -#~ msgstr "MesaÄo" - -#~ msgid "Send" -#~ msgstr "Sendu" - -#, fuzzy -#~| msgid "Address Book" -#~ msgid "Select Address Book" -#~ msgstr "Adresaro" - -#~ msgid "To" -#~ msgstr "Al" - -#~ msgid "CC" -#~ msgstr "Kopio" - -#, fuzzy -#~ msgid "BCC" -#~ msgstr "&Krome-al:" - -#, fuzzy -#~| msgid "Address Selection" -#~ msgid "EMail Address Selection" -#~ msgstr "Adreselekto" - -#, fuzzy -#~| msgid "&Filter on:" -#~ msgid "Filter on:" -#~ msgstr "&Filtri Äe:" - -#, fuzzy -#~ msgid "BCC >>" -#~ msgstr "&Krome-al:" - -#, fuzzy -#~| msgid "<< &Remove" -#~ msgid "<< Remove" -#~ msgstr "<< Fo&rigi" - -#, fuzzy -#~| msgid "New Distribution List" -#~ msgid "Save as Distribution List..." -#~ msgstr "Nova dissendolisto" - -#~ msgid "" -#~ "You must select a LDAP server before searching.\n" -#~ "You can do this from the menu Settings/Configure KAddressBook." -#~ msgstr "" -#~ "Vi devas elekti LDAP-servilon antaÅ la serÄado.\n" -#~ "Vi povas fari tiun kun menuo Agordo/Agordu Adresaron." - -#~ msgid "&Selected Addresses" -#~ msgstr "&Selektitaj adresoj" - -#~ msgid "&Filter on:" -#~ msgstr "&Filtri Äe:" - -#~ msgid "SMS" -#~ msgstr "SMS" - -#~ msgid "Homepage" -#~ msgstr "TTT-hejmpaÄo" - -#~ msgid "Notes" -#~ msgstr "Notoj" - -#~ msgid "Profession" -#~ msgstr "Profesio" - -#~ msgid "Assistant's Name" -#~ msgstr "Nomo de asistanto" - -#~ msgid "Manager's Name" -#~ msgstr "Nomo de direktoro" - -#, fuzzy -#~| msgid "Partner's Name" -#~ msgctxt "Wife/Husband/..." -#~ msgid "Partner's Name" -#~ msgstr "Nomo de pertnero" - -#~ msgid "Office" -#~ msgstr "Laborejo:" - -#~ msgid "IM Address" -#~ msgstr "IM-adreso" - -#~ msgid "Anniversary" -#~ msgstr "Jubileo" - -#, fuzzy -#~| msgid "&Address Book" -#~ msgctxt "@title:column address books overview" -#~ msgid "Address Books" -#~ msgstr "&Adresaro" - -#, fuzzy -#~| msgid "Name" -#~ msgctxt "@title:column name of a person" -#~ msgid "Name" -#~ msgstr "Nomo" - -#, fuzzy -#~| msgid "Full Name" -#~ msgctxt "@title:column family name of a person" -#~ msgid "Family Name" -#~ msgstr "Plena nomo" - -#, fuzzy -#~| msgid "Homepage" -#~ msgctxt "@title:column home address of a person" -#~ msgid "Home" -#~ msgstr "TTT-hejmpaÄo" - -#, fuzzy -#~| msgid "Home Number" -#~ msgctxt "@title:column phone numbers of a person" -#~ msgid "Phone Numbers" -#~ msgstr "Telefono" - -#, fuzzy -#~| msgid "Preferred address" -#~ msgctxt "@title:column the preferred email addresses of a person" -#~ msgid "Preferred EMail" -#~ msgstr "Preferata adreso" - -#, fuzzy -#~| msgid "Email" -#~ msgctxt "@title:column all email addresses of a person" -#~ msgid "All EMails" -#~ msgstr "RetpoÅto" - -#~ msgid "New Distribution List" -#~ msgstr "Nova dissendolisto" - -#~ msgid "Please enter name:" -#~ msgstr "Bonvolu doni nomon:" - -#~ msgid "" -#~ "<qt>Distribution list with the given name <b>%1</b> already exists. " -#~ "Please select a different name.</qt>" -#~ msgstr "" -#~ "<qt>Distribulisto kun la donita nomo <b>%1</b> jam ekzistas. Bonvolu doni " -#~ "alian nomon.</qt>" - -#~ msgid "Distribution Lists" -#~ msgstr "Dissendolistoj" - -#, fuzzy -#~| msgid "Category" -#~ msgid "New subcategory" -#~ msgstr "Kategorio" - -#~ msgid "Text" -#~ msgstr "Teksto" - -#~ msgid "Boolean" -#~ msgstr "Bulea" - -#~ msgid "Date & Time" -#~ msgstr "Dato kaj tempo" - -#~ msgid "Date" -#~ msgstr "Dato" - -#~ msgid "Cornelius Schumacher" -#~ msgstr "Cornelius Schumacher" - -#~ msgid "Delete Page" -#~ msgstr "Forigi PaÄon" - -#~ msgid "Key:" -#~ msgstr "Ålosilo:" - -#~ msgid "Type:" -#~ msgstr "Tipo:" - -#~ msgid "Description:" -#~ msgstr "Priskribo:" - -#, fuzzy -#~| msgid "Selection" -#~ msgctxt "incidence category" -#~ msgid "Meeting" -#~ msgstr "Elektaĵo" - -#, fuzzy -#~| msgid "Duration" -#~ msgctxt "incidence category" -#~ msgid "Education" -#~ msgstr "DaÅro" - -#, fuzzy -#~| msgid "Location" -#~ msgctxt "" -#~ "incidence category: a lengthy time away from work or school, a trip " -#~ "abroad, or simply a pleasure trip away from home" -#~ msgid "Vacation" -#~ msgstr "Loko" - -#~ msgid "Unnamed plugin" -#~ msgstr "Sennoma kromprogrameto" - -#~ msgid "Category" -#~ msgstr "Kategorio" - -#~ msgid "UID" -#~ msgstr "UID" - -#~ msgid "Summary" -#~ msgstr "Resumo" - -#~ msgid "Status" -#~ msgstr "Stato" - -#~ msgid "Priority" -#~ msgstr "Prioritato" - -#~ msgid "Location" -#~ msgstr "Loko" - -#~ msgid "Categories" -#~ msgstr "Kategorioj" - -#~ msgid "Alarms" -#~ msgstr "Alarmoj" - -#~ msgid "Attachments" -#~ msgstr "Kunsendaĵoj" - -#~ msgid "Local" -#~ msgstr "Loka" - -#~ msgid "IMAP" -#~ msgstr "IMAP" - -#~ msgid "None" -#~ msgstr "Neniu" - -#~ msgctxt "@item IMAP account" -#~ msgid "IMAP" -#~ msgstr "IMAP" - -#~ msgctxt "@item mbox account" -#~ msgid "MBOX" -#~ msgstr "MBOX" - -#~ msgctxt "@item pop3 account" -#~ msgid "POP3" -#~ msgstr "POP3" - -#~ msgid "Do not show this message again" -#~ msgstr "Ne remontri tiun mesaÄon" - -#~ msgid "Matches Regular Expression" -#~ msgstr "Kongruas kun regula esprimo" - -#~ msgid "Properties" -#~ msgstr "Ecoj" - -#~ msgid "&Groups:" -#~ msgstr "&Grupoj:" - -#~ msgid "Conditions" -#~ msgstr "KondiÄoj" - -#~ msgid "Actions" -#~ msgstr "Agoj" - -#~ msgid "S&earch:" -#~ msgstr "S&erÄi:" - -#~ msgid "Disable &tree view" -#~ msgstr "Malaktivigi &arborigardon" - -#~ msgid "&Subscribed only" -#~ msgstr "Nur &abonitajn" - -#~ msgid "&New only" -#~ msgstr "Nur &novajn" - -#~ msgid "Current changes:" -#~ msgstr "Nunaj ÅanÄoj:" - -#~ msgid "Subscribe To" -#~ msgstr "Aboni al" - -#~ msgid "Unsubscribe From" -#~ msgstr "Malaboni de" - -#~ msgid "View Columns" -#~ msgstr "Rigardi kolumnojn" - -#, fuzzy -#~| msgid "Name" -#~ msgctxt "@title:column, name of a person" -#~ msgid "Name" -#~ msgstr "Nomo" +msgstr "Pli malmultaj" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/po/fa/libkdepim.po new/libkdepim-23.08.0/po/fa/libkdepim.po --- old/libkdepim-23.04.3/po/fa/libkdepim.po 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/po/fa/libkdepim.po 2023-08-12 08:00:19.000000000 +0200 @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Lokalize 1.1\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" #: multiplyingline/multiplyinglineview_p.cpp:63 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/po/zh_CN/libkdepim.po new/libkdepim-23.08.0/po/zh_CN/libkdepim.po --- old/libkdepim-23.04.3/po/zh_CN/libkdepim.po 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/po/zh_CN/libkdepim.po 2023-08-12 08:00:19.000000000 +0200 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2023-02-22 00:59+0000\n" -"PO-Revision-Date: 2023-07-03 11:41\n" +"PO-Revision-Date: 2023-08-02 12:45\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/CMakeLists.txt new/libkdepim-23.08.0/src/CMakeLists.txt --- old/libkdepim-23.04.3/src/CMakeLists.txt 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/CMakeLists.txt 2023-08-12 08:00:19.000000000 +0200 @@ -2,7 +2,6 @@ # SPDX-License-Identifier: BSD-3-Clause add_library(KPim${KF_MAJOR_VERSION}Libkdepim) add_library(KPim${KF_MAJOR_VERSION}::Libkdepim ALIAS KPim${KF_MAJOR_VERSION}Libkdepim) -add_library(KF5::Libkdepim ALIAS KPim${KF_MAJOR_VERSION}Libkdepim) ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKDEPIM VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimConfigVersion.cmake" @@ -62,7 +61,6 @@ PRIVATE KF${KF_MAJOR_VERSION}::Completion KF${KF_MAJOR_VERSION}::I18n - KF${KF_MAJOR_VERSION}::ConfigGui KF${KF_MAJOR_VERSION}::WidgetsAddons ) @@ -158,23 +156,6 @@ install(FILES interfaces/org.kde.addressbook.service.xml interfaces/org.kde.mailtransport.service.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) -set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}Libkdepim") -set(LIBKDEPIM_KF5_COMPAT FALSE) -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KPimLibkdepimConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - ) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}LibkdepimConfigVersion.cmake" - DESTINATION "${CMAKECONFIG_INSTALL_DIR}" - COMPONENT Devel - ) - -install(EXPORT KPim${KF_MAJOR_VERSION}LibkdepimTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim${KF_MAJOR_VERSION}LibkdepimTargets.cmake NAMESPACE KPim${KF_MAJOR_VERSION}::) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/Libkdepim COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/KPimLibkdepimConfig.cmake.in new/libkdepim-23.08.0/src/KPimLibkdepimConfig.cmake.in --- old/libkdepim-23.04.3/src/KPimLibkdepimConfig.cmake.in 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/KPimLibkdepimConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -# SPDX-FileCopyrightText: 2017 Montel Laurent <[email protected]> -# SPDX-License-Identifier: BSD-3-Clause - -@PACKAGE_INIT@ -include(CMakeFindDependencyMacro) - -if (@LIBKDEPIM_KF5_COMPAT@) - message(WARNING "\n" - "************* DEPRECATION WARNING *************\n" - "Using find_package(KF5Libkdepim) and KF5::Libkdepim targets is deprecated. " - "Please use find_package(KPim@KF_MAJOR_VERSION@Libkdepim) and KPim@KF_MAJOR_VERSION@::Libkdepim instead. This backwards " - "compatibility will be removed in the next major version.\n" - "***********************************************\n") -endif() - -include("${CMAKE_CURRENT_LIST_DIR}/KPim@[email protected]") - -@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/progresswidget/progressdialog.h new/libkdepim-23.08.0/src/progresswidget/progressdialog.h --- old/libkdepim-23.04.3/src/progresswidget/progressdialog.h 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/progresswidget/progressdialog.h 2023-08-12 08:00:19.000000000 +0200 @@ -50,7 +50,7 @@ bool eventFilter(QObject *o, QEvent *e) override; private: - void reposition(); + KDEPIM_NO_EXPORT void reposition(); private: std::unique_ptr<OverlayWidgetPrivate> const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/progresswidget/progressmanager.h new/libkdepim-23.08.0/src/progresswidget/progressmanager.h --- old/libkdepim-23.04.3/src/progresswidget/progressmanager.h 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/progresswidget/progressmanager.h 2023-08-12 08:00:19.000000000 +0200 @@ -401,26 +401,26 @@ void slotTransactionCompleted(KPIM::ProgressItem *item); private: - ProgressManager(); + KDEPIM_NO_EXPORT ProgressManager(); // prevent unsolicited copies - ProgressManager(const ProgressManager &); + KDEPIM_NO_EXPORT ProgressManager(const ProgressManager &); - ProgressItem *createProgressItemImpl(ProgressItem *parent, - const QString &id, - const QString &label, - const QString &status, - bool cancellable, - ProgressItem::CryptoStatus cryptoStatus, - unsigned int progressType = 0); + KDEPIM_NO_EXPORT ProgressItem *createProgressItemImpl(ProgressItem *parent, + const QString &id, + const QString &label, + const QString &status, + bool cancellable, + ProgressItem::CryptoStatus cryptoStatus, + unsigned int progressType = 0); - ProgressItem *createProgressItemImpl(const QString &parent, - const QString &id, - const QString &label, - const QString &status, - bool cancellable, - ProgressItem::CryptoStatus cryptoStatus, - unsigned int progressType = 0); - void emitShowProgressDialogImpl(); + KDEPIM_NO_EXPORT ProgressItem *createProgressItemImpl(const QString &parent, + const QString &id, + const QString &label, + const QString &status, + bool cancellable, + ProgressItem::CryptoStatus cryptoStatus, + unsigned int progressType = 0); + KDEPIM_NO_EXPORT void emitShowProgressDialogImpl(); QHash<QString, ProgressItem *> mTransactions; static unsigned int uID; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/progresswidget/statusbarprogresswidget.h new/libkdepim-23.08.0/src/progresswidget/statusbarprogresswidget.h --- old/libkdepim-23.04.3/src/progresswidget/statusbarprogresswidget.h 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/progresswidget/statusbarprogresswidget.h 2023-08-12 08:00:19.000000000 +0200 @@ -58,10 +58,10 @@ private: enum Mode { Progress, Clean }; - void setMode(Mode mode); - void updateProgressButton(bool showingProgress); - void connectSingleItem(); - void activateSingleItemMode(); + KDEPIM_NO_EXPORT void setMode(Mode mode); + KDEPIM_NO_EXPORT void updateProgressButton(bool showingProgress); + KDEPIM_NO_EXPORT void connectSingleItem(); + KDEPIM_NO_EXPORT void activateSingleItemMode(); unsigned int mShowTypeProgressItem = 0; QProgressBar *mProgressBar = nullptr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/tests/CMakeLists.txt new/libkdepim-23.08.0/src/tests/CMakeLists.txt --- old/libkdepim-23.04.3/src/tests/CMakeLists.txt 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/tests/CMakeLists.txt 2023-08-12 08:00:19.000000000 +0200 @@ -3,4 +3,4 @@ ########### next target ############### add_executable(kcheckcomboboxtest_gui kcheckcomboboxtest_gui.cpp) -target_link_libraries(kcheckcomboboxtest_gui KPim${KF_MAJOR_VERSION}::Libkdepim KF${KF_MAJOR_VERSION}::I18n KF${KF_MAJOR_VERSION}::Completion KF${KF_MAJOR_VERSION}::CoreAddons) +target_link_libraries(kcheckcomboboxtest_gui KPim${KF_MAJOR_VERSION}::Libkdepim KF${KF_MAJOR_VERSION}::I18n KF${KF_MAJOR_VERSION}::Completion) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/widgets/kcheckcombobox.cpp new/libkdepim-23.08.0/src/widgets/kcheckcombobox.cpp --- old/libkdepim-23.04.3/src/widgets/kcheckcombobox.cpp 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/widgets/kcheckcombobox.cpp 2023-08-12 08:00:19.000000000 +0200 @@ -103,8 +103,9 @@ void KCheckComboBox::KCheckComboBoxPrivate::toggleCheckState() { - if (q->view()->isVisible()) { - const QModelIndex index = q->view()->currentIndex(); + int selected = q->currentIndex(); + if (q->view()->isVisible() && q->itemEnabled(selected)) { + const QModelIndex index = q->view()->currentIndex().siblingAtRow(selected); const QVariant value = index.data(Qt::CheckStateRole); if (value.isValid()) { const auto state = static_cast<Qt::CheckState>(value.toInt()); @@ -343,9 +344,4 @@ } } -void KCheckComboBox::updateCheckedItems(const QModelIndex &topLeft, const QModelIndex &bottomRight, int role) -{ - d->updateCheckedItems(topLeft, bottomRight, role); -} - #include "moc_kcheckcombobox.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/widgets/kcheckcombobox.h new/libkdepim-23.08.0/src/widgets/kcheckcombobox.h --- old/libkdepim-23.04.3/src/widgets/kcheckcombobox.h 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/widgets/kcheckcombobox.h 2023-08-12 08:00:19.000000000 +0200 @@ -137,14 +137,6 @@ */ Q_REQUIRED_RESULT QStringList checkedItems(int role = Qt::DisplayRole) const; - /** - * Update the KCheckComboBox text with Item belonging to the role. - * @param topLeft Currently unused. - * @param bottomRight Currently unused. - * @param role The role the updated values belong to. - */ - void updateCheckedItems(const QModelIndex &topLeft = QModelIndex(), const QModelIndex &bottomRight = QModelIndex(), int role = Qt::DisplayRole); - public Q_SLOTS: /** * Sets the currently selected items. Items that are not found in the model diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkdepim-23.04.3/src/widgets/kwidgetlister.h new/libkdepim-23.08.0/src/widgets/kwidgetlister.h --- old/libkdepim-23.04.3/src/widgets/kwidgetlister.h 2023-07-04 07:19:04.000000000 +0200 +++ new/libkdepim-23.08.0/src/widgets/kwidgetlister.h 2023-08-12 08:00:19.000000000 +0200 @@ -152,7 +152,7 @@ virtual void addWidgetAfterThisWidget(QWidget *currentWidget, QWidget *widget = nullptr); private: - void init(bool fewerMoreButton = true); + KDEPIM_NO_EXPORT void init(bool fewerMoreButton = true); Q_SIGNALS: /**
