Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libgravatar for openSUSE:Factory checked in at 2021-12-13 20:39:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgravatar (Old) and /work/SRC/openSUSE:Factory/.libgravatar.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgravatar" Mon Dec 13 20:39:57 2021 rev:70 rq:938037 version:21.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libgravatar/libgravatar.changes 2021-11-06 18:16:20.912832309 +0100 +++ /work/SRC/openSUSE:Factory/.libgravatar.new.2520/libgravatar.changes 2021-12-13 20:41:30.752463883 +0100 @@ -1,0 +2,27 @@ +Fri Dec 3 19:22:47 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.12.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/gear/21.12.0/ +- Changes since 21.11.90: + * Enable new GitLab CI on stable branch. + +------------------------------------------------------------------- +Sat Nov 27 10:11:43 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.11.90 + * New feature release +- No code change since 21.11.80 + +------------------------------------------------------------------- +Sat Nov 13 17:56:21 UTC 2021 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 21.11.80 + * New feature release +- Changes since 21.08.3: + * Allow to show header in qtc6 + * Add KDE CI file + * Check Qt5Test only on autotest area + +------------------------------------------------------------------- Old: ---- libgravatar-21.08.3.tar.xz libgravatar-21.08.3.tar.xz.sig New: ---- libgravatar-21.12.0.tar.xz libgravatar-21.12.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgravatar.spec ++++++ --- /var/tmp/diff_new_pack.Rd8M5n/_old 2021-12-13 20:41:31.232463941 +0100 +++ /var/tmp/diff_new_pack.Rd8M5n/_new 2021-12-13 20:41:31.236463942 +0100 @@ -16,12 +16,11 @@ # -%define kf5_version 5.79.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libgravatar -Version: 21.08.3 +Version: 21.12.0 Release: 0 Summary: Library to download and display gravatars License: GPL-2.0-only AND LGPL-2.1-or-later ++++++ libgravatar-21.08.3.tar.xz -> libgravatar-21.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/.gitlab-ci.yml new/libgravatar-21.12.0/.gitlab-ci.yml --- old/libgravatar-21.08.3/.gitlab-ci.yml 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/.gitlab-ci.yml 2021-11-30 21:36:11.000000000 +0100 @@ -1,34 +1,6 @@ # SPDX-FileCopyrightText: 2020-2021 Laurent Montel <mon...@kde.org> -# SPDX-FileCopyrightText: 2021 Laurent Montel <mon...@kde.org> # SPDX-License-Identifier: CC0-1.0 include: - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-before.yml - - https://invent.kde.org/sysadmin/ci-tooling/raw/master/invent/ci-applications-linux.yml - -build_clazy_clang_tidy: - stage: build - image: kdeorg/ci-suse-qt515 - extends: .linux - #only: - # - merge_requests - before_script: - - zypper install -y clazy - - git clone --depth=1 https://invent.kde.org/sysadmin/ci-tooling.git $CI_TOOLING - - git clone --depth=1 https://invent.kde.org/sysadmin/repo-metadata.git $CI_TOOLING/repo-metadata - - git clone --depth=1 https://invent.kde.org/sysadmin/kde-build-metadata.git $CI_TOOLING/kde-build-metadata - - git clone --depth=1 https://invent.kde.org/sdk/kde-dev-scripts.git $CI_TOOLING/kde-dev-scripts - - script: - - export CXX=clazy - - export CC=clang - - export CXXFLAGS="-Wno-deprecated-declarations" - - export CLAZY_HEADER_FILTER='^(?!ui_)\w+.h\$' - - export CLAZY_CHECKS="level0,level1,detaching-member,ifndef-define-typo,isempty-vs-count,qrequiredresult-candidates,reserve-candidates,signal-with-return-value,unneeded-cast,function-args-by-ref,function-args-by-value,returning-void-expression,no-ctor-missing-parent-argument,isempty-vs-count,qhash-with-char-pointer-key,raw-environment-function,qproperty-type-mismatch,old-style-connect,qstring-allocations,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,qstring-varargs" - - python3 -u $CI_TOOLING/helpers/prepare-dependencies.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --environment production --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/configure-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --installTo $INSTALL_PREFIX - - python3 -u $CI_TOOLING/helpers/compile-build.py --product $PRODUCT --project $PROJECT --branchGroup $BRANCH_GROUP --platform $PLATFORM --usingInstall $INSTALL_PREFIX - - cd build && run-clang-tidy - variables: - PLATFORM: SUSEQt5.15 - BRANCH_GROUP: stable-kf5-qt5 + - 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/.kde-ci.yml new/libgravatar-21.12.0/.kde-ci.yml --- old/libgravatar-21.08.3/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/libgravatar-21.12.0/.kde-ci.yml 2021-11-30 21:36:11.000000000 +0100 @@ -0,0 +1,8 @@ +# SPDX-FileCopyrightText: None +# SPDX-License-Identifier: CC0-1.0 + +Dependencies: +- 'on': ['@all'] + 'require': + 'frameworks/extra-cmake-modules': '@latest' + 'pim/pimcommon' : '@same' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/CMakeLists.txt new/libgravatar-21.12.0/CMakeLists.txt --- old/libgravatar-21.08.3/CMakeLists.txt 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/CMakeLists.txt 2021-11-30 21:36:11.000000000 +0100 @@ -1,16 +1,16 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) -set(PIM_VERSION "5.18.3") +set(PIM_VERSION "5.19.0") project(gravatar VERSION ${PIM_VERSION}) -set(KF5_MIN_VERSION "5.83.0") +set(KF5_MIN_VERSION "5.87.0") find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) +include(KDECompilerSettings NO_POLICY_SCOPE) include(GenerateExportHeader) include(ECMSetupVersion) @@ -19,15 +19,22 @@ include(FeatureSummary) include(KDEGitCommitHooks) +include(KDEClangFormat) +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) + include(ECMQtDeclareLoggingCategory) include(ECMAddTests) +include(ECMAddQch) +option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) +add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") -set(QT_REQUIRED_VERSION "5.15.0") +set(QT_REQUIRED_VERSION "5.15.2") set(LIBGRAVATAR_LIB_VERSION ${PIM_VERSION}) -set(PIMCOMMON_LIB_VERSION "5.18.3") -find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network) +set(PIMCOMMON_LIB_VERSION "5.19.0") +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Network) find_package(KF5I18n ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5Config ${KF5_MIN_VERSION} CONFIG REQUIRED) find_package(KF5WidgetsAddons ${KF5_MIN_VERSION} CONFIG REQUIRED) @@ -45,11 +52,9 @@ ########### Targets ########### -add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055400) +add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055800) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED ON) option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF) set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF) @@ -84,10 +89,21 @@ add_subdirectory(src) if (BUILD_TESTING) + find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Test) add_subdirectory(autotests) add_subdirectory(tests) endif() +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5Gravatar_QCH + FILE KF5GravatarQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5GravatarQchTargets.cmake\")") +endif() + kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) ki18n_install(po) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/CMakePresets.json new/libgravatar-21.12.0/CMakePresets.json --- old/libgravatar-21.08.3/CMakePresets.json 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/CMakePresets.json 2021-11-30 21:36:11.000000000 +0100 @@ -1,5 +1,5 @@ { - "version": 2, + "version": 3, "configurePresets": [ { "name": "dev", @@ -8,8 +8,21 @@ "binaryDir": "${sourceDir}/build", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "dev-disable-deprecated", + "displayName": "Build as without deprecated methods", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-disable-deprecated", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON", + "CMAKE_CXX_FLAGS_INIT": "-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x060000" + }, + "installDir": "$env{KF5}" }, { "name": "asan", @@ -19,8 +32,21 @@ "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", "ECM_ENABLE_SANITIZERS" : "'address;undefined'", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" + }, + { + "name": "pch", + "displayName": "Build with PCH support.", + "generator": "Ninja", + "binaryDir": "${sourceDir}/build-pch", + "cacheVariables": { + "CMAKE_BUILD_TYPE": "Debug", + "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "dev-clang", @@ -34,7 +60,8 @@ "environment": { "CXX": "clang++", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" }, { "name": "unity", @@ -43,9 +70,10 @@ "binaryDir": "${sourceDir}/build-unity", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "USE_UNITY_CMAKE_SUPPORT": "ON", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "USE_UNITY_CMAKE_SUPPORT": "ON", + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "release", @@ -54,7 +82,8 @@ "binaryDir": "${sourceDir}/build-release", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release" - } + }, + "installDir": "$env{KF5}" }, { "name": "profile", @@ -63,8 +92,9 @@ "binaryDir": "${sourceDir}/build-profile", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" - } + "CMAKE_EXPORT_COMPILE_COMMANDS": "ON" + }, + "installDir": "$env{KF5}" }, { "name": "clazy", @@ -77,7 +107,8 @@ "environment": { "CXX": "clazy", "CCACHE_DISABLE": "ON" - } + }, + "installDir": "$env{KF5}" } ], @@ -87,6 +118,14 @@ "configurePreset": "dev" }, { + "name": "dev-disable-deprecated", + "configurePreset": "dev-disable-deprecated" + }, + { + "name": "pch", + "configurePreset": "pch" + }, + { "name": "release", "configurePreset": "release" }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatarcachetest.h new/libgravatar-21.12.0/autotests/gravatarcachetest.h --- old/libgravatar-21.08.3/autotests/gravatarcachetest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatarcachetest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarCacheTest(QObject *parent = nullptr); - ~GravatarCacheTest(); + ~GravatarCacheTest() override; private Q_SLOTS: void initTestCase(); void shouldHaveDefaultValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatarconfiguresettingsdialogtest.h new/libgravatar-21.12.0/autotests/gravatarconfiguresettingsdialogtest.h --- old/libgravatar-21.08.3/autotests/gravatarconfiguresettingsdialogtest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatarconfiguresettingsdialogtest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarConfigureSettingsDialogTest(QObject *parent = nullptr); - ~GravatarConfigureSettingsDialogTest(); + ~GravatarConfigureSettingsDialogTest() override; private Q_SLOTS: void shouldHaveDefaultValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatarconfiguresettingswidgettest.h new/libgravatar-21.12.0/autotests/gravatarconfiguresettingswidgettest.h --- old/libgravatar-21.08.3/autotests/gravatarconfiguresettingswidgettest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatarconfiguresettingswidgettest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarConfigureSettingsWidgetTest(QObject *parent = nullptr); - ~GravatarConfigureSettingsWidgetTest() = default; + ~GravatarConfigureSettingsWidgetTest() override = default; private Q_SLOTS: void shouldHaveDefaultValues(); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatarconfigwidgettest.h new/libgravatar-21.12.0/autotests/gravatarconfigwidgettest.h --- old/libgravatar-21.08.3/autotests/gravatarconfigwidgettest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatarconfigwidgettest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarConfigWidgetTest(QObject *parent = nullptr); - ~GravatarConfigWidgetTest(); + ~GravatarConfigWidgetTest() override; private Q_SLOTS: void shouldHaveDefaultValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatardownloadpixmapdialogtest.h new/libgravatar-21.12.0/autotests/gravatardownloadpixmapdialogtest.h --- old/libgravatar-21.08.3/autotests/gravatardownloadpixmapdialogtest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatardownloadpixmapdialogtest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarDownloadPixmapDialogTest(QObject *parent = nullptr); - ~GravatarDownloadPixmapDialogTest(); + ~GravatarDownloadPixmapDialogTest() override; private Q_SLOTS: void shouldHaveDefaultValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatardownloadpixmapwidgettest.h new/libgravatar-21.12.0/autotests/gravatardownloadpixmapwidgettest.h --- old/libgravatar-21.08.3/autotests/gravatardownloadpixmapwidgettest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatardownloadpixmapwidgettest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarDownloadPixmapWidgetTest(QObject *parent = nullptr); - ~GravatarDownloadPixmapWidgetTest(); + ~GravatarDownloadPixmapWidgetTest() override; private Q_SLOTS: void shouldHaveDefaultValue(); void shouldChangeButtonEnableState(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/autotests/gravatarresolvurljobtest.h new/libgravatar-21.12.0/autotests/gravatarresolvurljobtest.h --- old/libgravatar-21.08.3/autotests/gravatarresolvurljobtest.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/autotests/gravatarresolvurljobtest.h 2021-11-30 21:36:11.000000000 +0100 @@ -13,7 +13,7 @@ Q_OBJECT public: explicit GravatarResolvUrlJobTest(QObject *parent = nullptr); - ~GravatarResolvUrlJobTest(); + ~GravatarResolvUrlJobTest() override; private Q_SLOTS: void shouldHaveDefaultValue(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/po/ar/libgravatar.po new/libgravatar-21.12.0/po/ar/libgravatar.po --- old/libgravatar-21.08.3/po/ar/libgravatar.po 2021-11-02 01:19:12.000000000 +0100 +++ new/libgravatar-21.12.0/po/ar/libgravatar.po 2021-12-03 01:17:23.000000000 +0100 @@ -2,25 +2,25 @@ # This file is distributed under the same license as the PACKAGE package. # # Safa Alfulaij <safa1996alful...@gmail.com>, 2018. +# Zayed Al-Saidi <zayed.alsa...@gmail.com>, 2021. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-27 03:10+0100\n" -"PO-Revision-Date: 2018-01-31 23:25+0300\n" -"Last-Translator: Safa Alfulaij <safa1996alful...@gmail.com>\n" -"Language-Team: Arabic <d...@arabeyes.org>\n" +"PO-Revision-Date: 2021-07-26 23:52+0400\n" +"Last-Translator: Zayed Al-Saidi <zayed.alsa...@gmail.com>\n" +"Language-Team: ar\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 21.07.70\n" #: widgets/gravatarconfiguresettingsdialog.cpp:24 -#, fuzzy, kde-format -#| msgid "Configure Gravatar" +#, kde-format msgctxt "@title:window" msgid "Configure Gravatar" msgstr "???????? ????????????????????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/po/zh_CN/libgravatar.po new/libgravatar-21.12.0/po/zh_CN/libgravatar.po --- old/libgravatar-21.08.3/po/zh_CN/libgravatar.po 2021-11-02 01:19:13.000000000 +0100 +++ new/libgravatar-21.12.0/po/zh_CN/libgravatar.po 2021-12-03 01:17:23.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-01-27 03:10+0100\n" -"PO-Revision-Date: 2021-10-29 13:28\n" +"PO-Revision-Date: 2021-11-30 15:24\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/CMakeLists.txt new/libgravatar-21.12.0/src/CMakeLists.txt --- old/libgravatar-21.08.3/src/CMakeLists.txt 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/CMakeLists.txt 2021-11-30 21:36:11.000000000 +0100 @@ -12,6 +12,16 @@ widgets/gravatarconfiguresettingswidget.cpp widgets/gravatarconfiguresettingsdialog.cpp job/gravatarresolvurljob.cpp + job/gravatarresolvurljob.h + misc/hash.h + misc/gravatarcache.h + gravatar_private_export.h + widgets/gravatarconfiguresettingswidget.h + widgets/gravatarconfigwidget.h + widgets/gravatardownloadpixmapdialog.h + widgets/gravatardownloadpixmapwidget.h + widgets/gravatarconfiguresettingsdialog.h + ) ecm_qt_declare_logging_category(KF5Gravatar HEADER gravatar_debug.h IDENTIFIER GRAVATAR_LOG CATEGORY_NAME org.kde.pim.gravatar @@ -107,3 +117,32 @@ DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) ecm_qt_install_logging_categories(EXPORT GRAVATAR FILE libgravatar.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + + +if (BUILD_QCH) + ecm_add_qch( + KF5Gravatar_QCH + NAME KF5Gravatar + BASE_NAME KF5Gravatar + VERSION ${PIM_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${Gravatar_Camelcase_widgets_HEADERS} + ${Gravatar_Camelcase_job_HEADERS} + ${Gravatar_Camelcase_misc_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + #IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics" + LINK_QCHS + Qt5Core_QCH + Qt5Gui_QCH + Qt5Widgets_QCH + Qt5Networks_QCH + INCLUDE_DIRS + ${CMAKE_CURRENT_BINARY_DIR} + BLANK_MACROS + GRAVATAR_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/job/gravatarresolvurljob.cpp new/libgravatar-21.12.0/src/job/gravatarresolvurljob.cpp --- old/libgravatar-21.08.3/src/job/gravatarresolvurljob.cpp 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/job/gravatarresolvurljob.cpp 2021-11-30 21:36:11.000000000 +0100 @@ -17,7 +17,7 @@ using namespace Gravatar; -class Q_DECL_HIDDEN Gravatar::GravatarResolvUrlJobPrivate +class Gravatar::GravatarResolvUrlJobPrivate { public: GravatarResolvUrlJobPrivate() @@ -43,10 +43,7 @@ { } -GravatarResolvUrlJob::~GravatarResolvUrlJob() -{ - delete d; -} +GravatarResolvUrlJob::~GravatarResolvUrlJob() = default; bool GravatarResolvUrlJob::canStart() const { @@ -170,10 +167,11 @@ void GravatarResolvUrlJob::setFallbackGravatar(bool fallbackGravatar) { - if (fallbackGravatar) + if (fallbackGravatar) { d->mBackends |= GravatarResolvUrlJobPrivate::Gravatar; - else + } else { d->mBackends &= ~GravatarResolvUrlJobPrivate::Gravatar; + } } bool GravatarResolvUrlJob::useLibravatar() const @@ -183,10 +181,11 @@ void GravatarResolvUrlJob::setUseLibravatar(bool useLibravatar) { - if (useLibravatar) + if (useLibravatar) { d->mBackends |= GravatarResolvUrlJobPrivate::Libravatar; - else + } else { d->mBackends &= ~GravatarResolvUrlJobPrivate::Libravatar; + } } bool GravatarResolvUrlJob::useDefaultPixmap() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/job/gravatarresolvurljob.h new/libgravatar-21.12.0/src/job/gravatarresolvurljob.h --- old/libgravatar-21.08.3/src/job/gravatarresolvurljob.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/job/gravatarresolvurljob.h 2021-11-30 21:36:11.000000000 +0100 @@ -10,6 +10,9 @@ #include <QObject> #include <QPixmap> #include <QUrl> + +#include <memory> + class QNetworkReply; class GravatarResolvUrlJobTest; namespace Gravatar @@ -23,7 +26,7 @@ Q_OBJECT public: explicit GravatarResolvUrlJob(QObject *parent = nullptr); - ~GravatarResolvUrlJob(); + ~GravatarResolvUrlJob() override; Q_REQUIRED_RESULT bool canStart() const; void start(); @@ -62,7 +65,8 @@ Q_REQUIRED_RESULT QUrl createUrl(bool useLibravatar); Q_REQUIRED_RESULT Hash calculateHash(); Q_REQUIRED_RESULT bool cacheLookup(const Hash &hash); - GravatarResolvUrlJobPrivate *const d; + + std::unique_ptr<GravatarResolvUrlJobPrivate> const d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/misc/gravatarcache.cpp new/libgravatar-21.12.0/src/misc/gravatarcache.cpp --- old/libgravatar-21.08.3/src/misc/gravatarcache.cpp 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/misc/gravatarcache.cpp 2021-11-30 21:36:11.000000000 +0100 @@ -22,7 +22,7 @@ Q_GLOBAL_STATIC(GravatarCache, s_gravatarCache) -class Q_DECL_HIDDEN Gravatar::GravatarCachePrivate +class Gravatar::GravatarCachePrivate { public: template<typename T> inline void insertMissingHash(std::vector<T> &vec, const T &hash) @@ -80,10 +80,7 @@ QDir().mkpath(d->mGravatarPath); } -GravatarCache::~GravatarCache() -{ - delete d; -} +GravatarCache::~GravatarCache() = default; GravatarCache *GravatarCache::self() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/misc/gravatarcache.h new/libgravatar-21.12.0/src/misc/gravatarcache.h --- old/libgravatar-21.08.3/src/misc/gravatarcache.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/misc/gravatarcache.h 2021-11-30 21:36:11.000000000 +0100 @@ -10,6 +10,8 @@ #include <QPixmap> +#include <memory> + namespace Gravatar { class GravatarCachePrivate; @@ -37,7 +39,7 @@ private: Q_DISABLE_COPY(GravatarCache) - GravatarCachePrivate *const d; + std::unique_ptr<GravatarCachePrivate> const d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/widgets/gravatarconfiguresettingsdialog.h new/libgravatar-21.12.0/src/widgets/gravatarconfiguresettingsdialog.h --- old/libgravatar-21.08.3/src/widgets/gravatarconfiguresettingsdialog.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/widgets/gravatarconfiguresettingsdialog.h 2021-11-30 21:36:11.000000000 +0100 @@ -18,7 +18,7 @@ Q_OBJECT public: explicit GravatarConfigureSettingsDialog(QWidget *parent = nullptr); - ~GravatarConfigureSettingsDialog(); + ~GravatarConfigureSettingsDialog() override; private: void slotRestoreDefault(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/widgets/gravatarconfiguresettingswidget.h new/libgravatar-21.12.0/src/widgets/gravatarconfiguresettingswidget.h --- old/libgravatar-21.08.3/src/widgets/gravatarconfiguresettingswidget.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/widgets/gravatarconfiguresettingswidget.h 2021-11-30 21:36:11.000000000 +0100 @@ -19,7 +19,7 @@ Q_OBJECT public: explicit GravatarConfigureSettingsWidget(QWidget *parent = nullptr); - ~GravatarConfigureSettingsWidget(); + ~GravatarConfigureSettingsWidget() override; void slotRestoreDefault(); void save(); void load(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/widgets/gravatarconfigwidget.cpp new/libgravatar-21.12.0/src/widgets/gravatarconfigwidget.cpp --- old/libgravatar-21.08.3/src/widgets/gravatarconfigwidget.cpp 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/widgets/gravatarconfigwidget.cpp 2021-11-30 21:36:11.000000000 +0100 @@ -18,7 +18,7 @@ using namespace Gravatar; using namespace PimCommon::ConfigureImmutableWidgetUtils; -class Q_DECL_HIDDEN Gravatar::GravatarConfigWidgetPrivate +class Gravatar::GravatarConfigWidgetPrivate { public: GravatarConfigWidgetPrivate() @@ -51,10 +51,7 @@ updateWidgetState(false); } -GravatarConfigWidget::~GravatarConfigWidget() -{ - delete d; -} +GravatarConfigWidget::~GravatarConfigWidget() = default; void GravatarConfigWidget::slotConfigureSettings() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/widgets/gravatarconfigwidget.h new/libgravatar-21.12.0/src/widgets/gravatarconfigwidget.h --- old/libgravatar-21.08.3/src/widgets/gravatarconfigwidget.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/widgets/gravatarconfigwidget.h 2021-11-30 21:36:11.000000000 +0100 @@ -8,6 +8,9 @@ #include "gravatar_export.h" #include <QWidget> + +#include <memory> + namespace Gravatar { class GravatarConfigWidgetPrivate; @@ -18,7 +21,7 @@ Q_OBJECT public: explicit GravatarConfigWidget(QWidget *parent = nullptr); - ~GravatarConfigWidget(); + ~GravatarConfigWidget() override; void save(); void doLoadFromGlobalSettings(); @@ -31,7 +34,8 @@ void slotGravatarEnableChanged(bool state); void slotConfigureSettings(); void updateWidgetState(bool state); - GravatarConfigWidgetPrivate *const d; + + std::unique_ptr<GravatarConfigWidgetPrivate> const d; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/widgets/gravatardownloadpixmapdialog.h new/libgravatar-21.12.0/src/widgets/gravatardownloadpixmapdialog.h --- old/libgravatar-21.08.3/src/widgets/gravatardownloadpixmapdialog.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/widgets/gravatardownloadpixmapdialog.h 2021-11-30 21:36:11.000000000 +0100 @@ -19,7 +19,7 @@ Q_OBJECT public: explicit GravatarDownloadPixmapDialog(QWidget *parent = nullptr); - ~GravatarDownloadPixmapDialog(); + ~GravatarDownloadPixmapDialog() override; Q_REQUIRED_RESULT QPixmap gravatarPixmap() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libgravatar-21.08.3/src/widgets/gravatardownloadpixmapwidget.h new/libgravatar-21.12.0/src/widgets/gravatardownloadpixmapwidget.h --- old/libgravatar-21.08.3/src/widgets/gravatardownloadpixmapwidget.h 2021-10-09 09:27:03.000000000 +0200 +++ new/libgravatar-21.12.0/src/widgets/gravatardownloadpixmapwidget.h 2021-11-30 21:36:11.000000000 +0100 @@ -22,7 +22,7 @@ Q_OBJECT public: explicit GravatarDownloadPixmapWidget(QWidget *parent = nullptr); - ~GravatarDownloadPixmapWidget(); + ~GravatarDownloadPixmapWidget() override; Q_REQUIRED_RESULT QPixmap gravatarPixmap() const;
