Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kontactinterface for
openSUSE:Factory checked in at 2022-08-19 17:52:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kontactinterface (Old)
and /work/SRC/openSUSE:Factory/.kontactinterface.new.2083 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kontactinterface"
Fri Aug 19 17:52:15 2022 rev:83 rq:997879 version:22.08.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kontactinterface/kontactinterface.changes
2022-07-09 17:01:23.268648032 +0200
+++
/work/SRC/openSUSE:Factory/.kontactinterface.new.2083/kontactinterface.changes
2022-08-19 17:52:52.167646529 +0200
@@ -1,0 +2,20 @@
+Sun Aug 14 09:43:04 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 22.08.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/22.08.0/
+
+-------------------------------------------------------------------
+Fri Aug 5 12:11:12 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 22.07.90
+ * New feature release
+
+-------------------------------------------------------------------
+Sat Jul 16 08:28:26 UTC 2022 - Christophe Giboudeaux <[email protected]>
+
+- Update to 22.07.80
+ * New feature release
+
+-------------------------------------------------------------------
Old:
----
kontactinterface-22.04.3.tar.xz
kontactinterface-22.04.3.tar.xz.sig
New:
----
kontactinterface-22.08.0.tar.xz
kontactinterface-22.08.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kontactinterface.spec ++++++
--- /var/tmp/diff_new_pack.izunPG/_old 2022-08-19 17:52:52.803647862 +0200
+++ /var/tmp/diff_new_pack.izunPG/_new 2022-08-19 17:52:52.811647879 +0200
@@ -21,7 +21,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without released
Name: kontactinterface
-Version: 22.04.3
+Version: 22.08.0
Release: 0
Summary: KDE PIM Libraries: Interface to Contacts
License: LGPL-2.1-or-later
++++++ kontactinterface-22.04.3.tar.xz -> kontactinterface-22.08.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/.codespellrc
new/kontactinterface-22.08.0/.codespellrc
--- old/kontactinterface-22.04.3/.codespellrc 1970-01-01 01:00:00.000000000
+0100
+++ new/kontactinterface-22.08.0/.codespellrc 2022-08-05 13:32:38.000000000
+0200
@@ -0,0 +1,4 @@
+[codespell]
+skip = ./build*,.git,*.notifyrc,*.desktop,*.json,*.xml
+interactive = 3
+ignore-words-list = accessort
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/.codespellrc.license
new/kontactinterface-22.08.0/.codespellrc.license
--- old/kontactinterface-22.04.3/.codespellrc.license 1970-01-01
01:00:00.000000000 +0100
+++ new/kontactinterface-22.08.0/.codespellrc.license 2022-08-05
13:32:38.000000000 +0200
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: 2022 Laurent Montel <[email protected]>
+# SPDX-License-Identifier: CC0-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/.gitlab-ci.yml
new/kontactinterface-22.08.0/.gitlab-ci.yml
--- old/kontactinterface-22.04.3/.gitlab-ci.yml 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/.gitlab-ci.yml 2022-08-05 13:32:38.000000000
+0200
@@ -5,3 +5,4 @@
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/reuse-lint.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/freebsd.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/windows.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/.kde-ci.yml
new/kontactinterface-22.08.0/.kde-ci.yml
--- old/kontactinterface-22.04.3/.kde-ci.yml 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/.kde-ci.yml 2022-08-05 13:32:38.000000000
+0200
@@ -10,3 +10,6 @@
'frameworks/kwindowsystem': '@latest'
'frameworks/ki18n': '@latest'
'frameworks/kxmlgui': '@latest'
+
+Options:
+ require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/CMakeLists.txt
new/kontactinterface-22.08.0/CMakeLists.txt
--- old/kontactinterface-22.04.3/CMakeLists.txt 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/CMakeLists.txt 2022-08-05 13:32:38.000000000
+0200
@@ -1,12 +1,12 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.20.3")
+set(PIM_VERSION "5.21.0")
project(KontactInterface VERSION ${PIM_VERSION})
# ECM setup
-set(KF5_MIN_VERSION "5.91.0")
+set(KF5_MIN_VERSION "5.95.0")
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -93,7 +93,7 @@
install(EXPORT KF5KontactInterfaceTargets DESTINATION
"${CMAKECONFIG_INSTALL_DIR}" FILE KF5KontactInterfaceTargets.cmake NAMESPACE
KF5::)
ecm_set_disabled_deprecation_versions(QT 5.15.2
- KF 5.92.0
+ KF 5.96.0
KPARTS 5.76 # componentData()
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/CMakePresets.json
new/kontactinterface-22.08.0/CMakePresets.json
--- old/kontactinterface-22.04.3/CMakePresets.json 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/CMakePresets.json 2022-08-05
13:32:38.000000000 +0200
@@ -2,81 +2,89 @@
"version": 3,
"configurePresets": [
{
+ "name": "base",
+ "displayName": "base preset",
+ "generator": "Ninja",
+ "binaryDir": "${sourceDir}/build-${presetName}",
+ "installDir": "$env{KF5}",
+ "hidden": true
+ },
+ {
"name": "dev",
"displayName": "Build as debug",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
+
},
{
"name": "coverage",
"displayName": "Build as debug",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"BUILD_COVERAGE": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "dev-qt6",
"displayName": "Build against qt6",
- "generator": "Ninja",
"binaryDir": "${sourceDir}/build-qt6",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"BUILD_WITH_QT6": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
- "installDir": "$env{KF6}"
+ "inherits": [
+ "base"
+ ]
},
{
"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}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "asan",
"displayName": "Build with Asan support.",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build-asan",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"ECM_ENABLE_SANITIZERS" : "'address;undefined'",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
},
{
"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}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "dev-clang",
"displayName": "dev-clang",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build-clang",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
@@ -85,46 +93,46 @@
"CXX": "clang++",
"CCACHE_DISABLE": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "unity",
"displayName": "Build with CMake unity support.",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build-unity",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"USE_UNITY_CMAKE_SUPPORT": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "release",
"displayName": "Build as release mode.",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build-release",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "profile",
"displayName": "profile",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build-profile",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
},
{
"name": "clazy",
"displayName": "clazy",
- "generator": "Ninja",
- "binaryDir": "${sourceDir}/build-clazy",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
},
@@ -132,7 +140,9 @@
"CXX": "clazy",
"CCACHE_DISABLE": "ON"
},
- "installDir": "$env{KF5}"
+ "inherits": [
+ "base"
+ ]
}
],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/po/vi/kontactinterfaces5.po
new/kontactinterface-22.08.0/po/vi/kontactinterfaces5.po
--- old/kontactinterface-22.04.3/po/vi/kontactinterfaces5.po 1970-01-01
01:00:00.000000000 +0100
+++ new/kontactinterface-22.08.0/po/vi/kontactinterfaces5.po 2022-08-12
02:11:18.000000000 +0200
@@ -0,0 +1,28 @@
+# Copyright (C) YEAR This file is copyright:
+# This file is distributed under the same license as the kontactinterface
package.
+#
+# Phu Hung Nguyen <[email protected]>, 2022.
+msgid ""
+msgstr ""
+"Project-Id-Version: kontactinterface\n"
+"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
+"POT-Creation-Date: 2019-05-20 03:17+0200\n"
+"PO-Revision-Date: 2022-05-12 16:39+0200\n"
+"Last-Translator: Phu Hung Nguyen <[email protected]>\n"
+"Language-Team: Vietnamese <[email protected]>\n"
+"Language: vi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 21.12.2\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Nguy???n H??ng Ph??"
+
+#, kde-format
+msgctxt "EMAIL OF TRANSLATORS"
+msgid "Your emails"
+msgstr "[email protected]"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-22.04.3/po/zh_CN/kontactinterfaces5.po
new/kontactinterface-22.08.0/po/zh_CN/kontactinterfaces5.po
--- old/kontactinterface-22.04.3/po/zh_CN/kontactinterfaces5.po 2022-07-05
06:40:29.000000000 +0200
+++ new/kontactinterface-22.08.0/po/zh_CN/kontactinterfaces5.po 2022-08-12
02:11:18.000000000 +0200
@@ -1,13 +1,9 @@
-# Copyright (C) YEAR This_file_is_part_of_KDE
-# This file is distributed under the same license as the PACKAGE package.
-#
-# Xuetian Weng <[email protected]>, 2014.
msgid ""
msgstr ""
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:17+0200\n"
-"PO-Revision-Date: 2022-07-02 11:03\n"
+"PO-Revision-Date: 2022-08-07 13:32\n"
"Last-Translator: \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/core.cpp
new/kontactinterface-22.08.0/src/core.cpp
--- old/kontactinterface-22.04.3/src/core.cpp 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/src/core.cpp 2022-08-05 13:32:38.000000000
+0200
@@ -65,7 +65,6 @@
return it.value();
}
-
qCDebug(KONTACTINTERFACE_LOG) << "Creating new KPart";
const auto result =
KPluginFactory::instantiatePlugin<KParts::Part>(KPluginMetaData(QString::fromLatin1(libname)),
this);
if (result.plugin) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/core.h
new/kontactinterface-22.08.0/src/core.h
--- old/kontactinterface-22.04.3/src/core.h 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/src/core.h 2022-08-05 13:32:38.000000000
+0200
@@ -100,4 +100,3 @@
};
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/kontactplugin.desktop
new/kontactinterface-22.08.0/src/kontactplugin.desktop
--- old/kontactinterface-22.04.3/src/kontactplugin.desktop 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/kontactplugin.desktop 2022-08-05
13:32:38.000000000 +0200
@@ -3,7 +3,7 @@
X-KDE-ServiceType=Kontact/Plugin
Name=Kontact Plugin
Name[ar]=?????????? ??????????????????
-Name[az]=Kontakt Qo??mas??
+Name[az]=??laq?? Qo??mas??
Name[bg]=?????????????????? Kontact
Name[bs]=Priklju??ak za kontakt
Name[ca]=Connector del Kontact
@@ -24,8 +24,10 @@
Name[hi]=??????????????????????????? ??????????????????
Name[hu]=Kontact-modul
Name[ia]=Plug-in de Kontact
+Name[is]=Kontact ??forrit
Name[it]=Estensione di Kontact
Name[ja]=Kontact ???????????????
+Name[ka]=Kontact-?????? ????????????????????????
Name[kk]=Kontact ??????????????
Name[km]=?????????????????????????????????????????? Kontact
Name[ko]=Kontact ????????????
@@ -53,6 +55,7 @@
Name[th]=???????????????????????????????????? Kontact
Name[tr]=Kontact Eklentisi
Name[uk]=?????????????? ???? Kontact
+Name[vi]=Ph???n c??i c???m Kontact
Name[wa]=Tch??ke divins di Kontact
Name[x-test]=xxKontact Pluginxx
Name[zh_CN]=Kontact ??????
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-22.04.3/src/pimuniqueapplication.cpp
new/kontactinterface-22.08.0/src/pimuniqueapplication.cpp
--- old/kontactinterface-22.04.3/src/pimuniqueapplication.cpp 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/pimuniqueapplication.cpp 2022-08-05
13:32:38.000000000 +0200
@@ -112,17 +112,19 @@
const QString serviceName = QLatin1String("org.kde.") + appName;
if
(QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName)) {
QByteArray new_asn_id;
-#if KONTACTINTERFACE_HAVE_X11
- KStartupInfoId id;
- if (!KStartupInfo::startupId().isEmpty()) {
- id.initId(KStartupInfo::startupId());
- } else {
- id = KStartupInfo::currentStartupIdEnv();
+ if (KWindowSystem::isPlatformX11()) {
+ KStartupInfoId id;
+ if (!KStartupInfo::startupId().isEmpty()) {
+ id.initId(KStartupInfo::startupId());
+ } else {
+ id = KStartupInfo::currentStartupIdEnv();
+ }
+ if (!id.isNull()) {
+ new_asn_id = id.id();
+ }
+ } else if (KWindowSystem::isPlatformWayland()) {
+ new_asn_id = qgetenv("XDG_ACTIVATION_TOKEN");
}
- if (!id.isNull()) {
- new_asn_id = id.id();
- }
-#endif
KWindowSystem::allowExternalProcessWindowActivation();
@@ -142,31 +144,26 @@
return true;
}
-bool PimUniqueApplication::activateApplication(const QString &appName, const
QStringList &additionalArguments)
-{
- const QString serviceName = QLatin1String("org.kde.") + appName;
- QStringList arguments{appName};
- arguments += additionalArguments;
- // Start it standalone if not already running (if kontact is running, then
this will do nothing)
- QDBusConnection::sessionBus().interface()->startService(serviceName);
- return callNewInstance(appName, serviceName,
KStartupInfo::createNewStartupId(), arguments);
-}
-
// This is called via DBus either by another instance that has just been
// started or by Kontact when the module is activated
int PimUniqueApplication::newInstance(const QByteArray &startupId, const
QStringList &arguments, const QString &workingDirectory)
{
- KStartupInfo::setStartupId(startupId);
+ if (KWindowSystem::isPlatformX11()) {
+ KStartupInfo::setStartupId(startupId);
+ } else if (KWindowSystem::isPlatformWayland()) {
+
KWindowSystem::setCurrentXdgActivationToken(QString::fromUtf8(startupId));
+ }
const QWidgetList tlws = topLevelWidgets();
for (QWidget *win : tlws) {
if (qobject_cast<QMainWindow *>(win)) {
win->show();
win->setAttribute(Qt::WA_NativeWindow, true);
- KStartupInfo::setNewStartupId(win->windowHandle(), startupId); //
this moves 'win' to the current desktop
-#ifdef Q_OS_WIN
- KWindowSystem::forceActiveWindow(win->winId());
-#endif
+ if (KWindowSystem::isPlatformX11()) {
+ KStartupInfo::setNewStartupId(win->windowHandle(), startupId);
// this moves 'win' to the current desktop
+ } else if (KWindowSystem::isPlatformWayland()) {
+ KWindowSystem::activateWindow(win->windowHandle());
+ }
break;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/pimuniqueapplication.h
new/kontactinterface-22.08.0/src/pimuniqueapplication.h
--- old/kontactinterface-22.04.3/src/pimuniqueapplication.h 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/pimuniqueapplication.h 2022-08-05
13:32:38.000000000 +0200
@@ -41,11 +41,6 @@
*/
static bool start(const QStringList &arguments);
- /**
- * Ensure that another PIM application is running.
- */
- static bool activateApplication(const QString &application, const
QStringList &additionalArguments = {});
-
Q_REQUIRED_RESULT QCommandLineParser *cmdArgs() const;
public Q_SLOTS:
@@ -63,4 +58,3 @@
};
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/plugin.cpp
new/kontactinterface-22.08.0/src/plugin.cpp
--- old/kontactinterface-22.04.3/src/plugin.cpp 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/src/plugin.cpp 2022-08-05 13:32:38.000000000
+0200
@@ -49,12 +49,11 @@
QByteArray partLibraryName;
QByteArray pluginName;
KParts::Part *part = nullptr;
- bool hasPart;
- bool disabled;
+ bool hasPart = true;
+ bool disabled = false;
};
//@endcond
-
-Plugin::Plugin(Core *core, QObject *parent, const char *appName, const char
*pluginName)
+Plugin::Plugin(Core *core, QObject *parent, const KPluginMetaData &, const
char *appName, const char *pluginName)
: KXMLGUIClient(core)
, QObject(parent)
, d(new PluginPrivate)
@@ -64,9 +63,6 @@
d->pluginName = pluginName ? pluginName : appName;
d->core = core;
- d->hasPart = true;
- d->part = nullptr;
- d->disabled = false;
}
Plugin::~Plugin()
@@ -131,7 +127,7 @@
const KAboutData Plugin::aboutData()
{
- return part()->componentData();
+ return KAboutData();
}
KParts::Part *Plugin::part()
@@ -250,8 +246,8 @@
// actions don't appear in "edit toolbars". #207296
const QStringList hideActions = plugin->invisibleToolbarActions();
// qCDebug(KONTACTINTERFACE_LOG) << "Hiding actions" << hideActions <<
"from" << pluginName << part;
- QDomDocument doc = part->domDocument();
- QDomElement docElem = doc.documentElement();
+ const QDomDocument doc = part->domDocument();
+ const QDomElement docElem = doc.documentElement();
// 1. Iterate over containers
for (QDomElement containerElem = docElem.firstChildElement();
!containerElem.isNull(); containerElem = containerElem.nextSiblingElement()) {
if (QString::compare(containerElem.tagName(),
QLatin1String("ToolBar"), Qt::CaseInsensitive) == 0) {
@@ -279,7 +275,7 @@
const QString newAppFile =
QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) +
QLatin1String("/kontact/default-")
+ QLatin1String(pluginName) + QLatin1String(".rc");
- QFileInfo fileInfo(newAppFile);
+ const QFileInfo fileInfo(newAppFile);
QDir().mkpath(fileInfo.absolutePath());
QFile file(newAppFile);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/plugin.h
new/kontactinterface-22.08.0/src/plugin.h
--- old/kontactinterface-22.04.3/src/plugin.h 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/src/plugin.h 2022-08-05 13:32:38.000000000
+0200
@@ -34,7 +34,7 @@
/**
Increase this version number whenever you make a change in the API.
*/
-#define KONTACT_PLUGIN_VERSION 10
+#define KONTACT_PLUGIN_VERSION 11
/**
Exports Kontact plugin.
@@ -45,12 +45,12 @@
class Instance
\
{
\
public:
\
- static QObject *createInstance(QWidget *, QObject *parent, const
QVariantList &list)
\
+ static QObject *createInstance(QWidget *, QObject *parent, const
KPluginMetaData &data, const QVariantList &list)
\
{
\
- return new pluginclass(static_cast<KontactInterface::Core
*>(parent), list);
\
+ return new pluginclass(static_cast<KontactInterface::Core
*>(parent), data, list);
\
}
\
};
\
- K_PLUGIN_FACTORY_WITH_JSON(KontactPluginFactory, jsonFile,
registerPlugin<pluginclass>(QString(), Instance::createInstance);)
+ K_PLUGIN_FACTORY_WITH_JSON(KontactPluginFactory, jsonFile,
registerPlugin<pluginclass>(Instance::createInstance);)
namespace KontactInterface
{
@@ -77,8 +77,7 @@
* It's ok to have several plugins using the same application name.
* @param pluginName The unique name of the plugin. Defaults to appName if
not set.
*/
- Plugin(Core *core, QObject *parent, const char *appName, const char
*pluginName = nullptr);
-
+ Plugin(Core *core, QObject *parent, const KPluginMetaData &data, const
char *appName, const char *pluginName = nullptr);
/**
* Destroys the plugin.
*/
@@ -313,4 +312,3 @@
};
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/processes.cpp
new/kontactinterface-22.08.0/src/processes.cpp
--- old/kontactinterface-22.04.3/src/processes.cpp 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/processes.cpp 2022-08-05
13:32:38.000000000 +0200
@@ -21,10 +21,13 @@
#ifdef Q_OS_WIN
+// windows.h needs to come first
+// clang-format off
+#include <windows.h>
#include <psapi.h>
#include <signal.h>
#include <tlhelp32.h>
-#include <windows.h>
+// clang-format on
#include <QtDebug>
@@ -117,47 +120,6 @@
CloseHandle(h);
}
-bool KontactInterface::otherProcessesExist(const QString &processName)
-{
- QList<int> pids;
- getProcessesIdForName(processName, pids);
- int myPid = QCoreApplication::applicationPid();
- for (int pid : std::as_const(pids)) {
- if (myPid != pid) {
- // qCDebug(KONTACTINTERFACE_LOG) << "Process ID is " << pid;
- return true;
- }
- }
- return false;
-}
-
-bool KontactInterface::killProcesses(const QString &processName)
-{
- QList<int> pids;
- getProcessesIdForName(processName, pids);
- if (pids.empty()) {
- return true;
- }
-
- qCWarning(KONTACTINTERFACE_LOG) << "Killing process \"" << processName <<
" (pid=" << pids[0] << ")..";
- int overallResult = 0;
- qDebug() << "NEED TO PORT KILL PROCESS ON WINDOWS";
-#if 0
- for (int pid : std::as_const(pids)) {
- int result;
- result = kill(pid, SIGTERM);
- if (result == 0) {
- continue;
- }
- result = kill(pid, SIGKILL);
- if (result != 0) {
- overallResult = result;
- }
- }
-#endif
- return overallResult == 0;
-}
-
struct EnumWindowsStruct {
EnumWindowsStruct()
: windowId(0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/processes.h
new/kontactinterface-22.08.0/src/processes.h
--- old/kontactinterface-22.04.3/src/processes.h 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/processes.h 2022-08-05
13:32:38.000000000 +0200
@@ -33,20 +33,6 @@
KONTACTINTERFACE_EXPORT void getProcessesIdForName(const QString &processName,
QList<int> &pids);
/**
- * @return true if one or more processes (other than the current process) exist
- * for name @a processName; false otherwise.
- */
-KONTACTINTERFACE_EXPORT bool otherProcessesExist(const QString &processName);
-
-/**
- * Terminates or kills all processes with name @a processName.
- * First, SIGTERM is sent to a process, then if that fails, we try with
SIGKILL.
- * @return true on successful termination of all processes or false if at least
- * one process failed to terminate.
- */
-KONTACTINTERFACE_EXPORT bool killProcesses(const QString &processName);
-
-/**
* Activates window for first found process with executable @a executableName
* (without path and .exe extension)
*/
@@ -54,4 +40,3 @@
#endif
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/summary.h
new/kontactinterface-22.08.0/src/summary.h
--- old/kontactinterface-22.04.3/src/summary.h 2022-06-13 06:20:15.000000000
+0200
+++ new/kontactinterface-22.08.0/src/summary.h 2022-08-05 13:32:38.000000000
+0200
@@ -106,4 +106,3 @@
};
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/uniqueapphandler.cpp
new/kontactinterface-22.08.0/src/uniqueapphandler.cpp
--- old/kontactinterface-22.04.3/src/uniqueapphandler.cpp 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/uniqueapphandler.cpp 2022-08-05
13:32:38.000000000 +0200
@@ -68,7 +68,7 @@
class UniqueAppHandler::UniqueAppHandlerPrivate
{
public:
- Plugin *mPlugin;
+ Plugin *mPlugin = nullptr;
};
//@endcond
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.04.3/src/uniqueapphandler.h
new/kontactinterface-22.08.0/src/uniqueapphandler.h
--- old/kontactinterface-22.04.3/src/uniqueapphandler.h 2022-06-13
06:20:15.000000000 +0200
+++ new/kontactinterface-22.08.0/src/uniqueapphandler.h 2022-08-05
13:32:38.000000000 +0200
@@ -75,7 +75,8 @@
* The template argument is the UniqueAppHandler-derived class.
* This allows to remove the need to subclass UniqueAppWatcher.
*/
-template<class T> class UniqueAppHandlerFactory : public
UniqueAppHandlerFactoryBase
+template<class T>
+class UniqueAppHandlerFactory : public UniqueAppHandlerFactoryBase
{
public:
UniqueAppHandler *createHandler(Plugin *plugin) override
@@ -121,4 +122,3 @@
};
} // namespace
-
