Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kontactinterface for
openSUSE:Factory checked in at 2023-04-23 22:44:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kontactinterface (Old)
and /work/SRC/openSUSE:Factory/.kontactinterface.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kontactinterface"
Sun Apr 23 22:44:56 2023 rev:91 rq:1081187 version:23.04.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kontactinterface/kontactinterface.changes
2023-03-03 22:26:32.114957524 +0100
+++
/work/SRC/openSUSE:Factory/.kontactinterface.new.1533/kontactinterface.changes
2023-04-23 22:46:37.442426845 +0200
@@ -1,0 +2,20 @@
+Sat Apr 15 08:46:08 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.04.0
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/gear/23.04.0/
+
+-------------------------------------------------------------------
+Fri Mar 31 16:42:17 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.03.90
+ * New feature release
+
+-------------------------------------------------------------------
+Fri Mar 17 20:43:54 UTC 2023 - Christophe Marin <[email protected]>
+
+- Update to 23.03.80
+ * New feature release
+
+-------------------------------------------------------------------
Old:
----
kontactinterface-22.12.3.tar.xz
kontactinterface-22.12.3.tar.xz.sig
New:
----
kontactinterface-23.04.0.tar.xz
kontactinterface-23.04.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kontactinterface.spec ++++++
--- /var/tmp/diff_new_pack.esCbaL/_old 2023-04-23 22:46:38.854434822 +0200
+++ /var/tmp/diff_new_pack.esCbaL/_new 2023-04-23 22:46:38.858434846 +0200
@@ -17,11 +17,9 @@
%define kf5_version 5.99.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 released
Name: kontactinterface
-Version: 22.12.3
+Version: 23.04.0
Release: 0
Summary: KDE PIM Libraries: Interface to Contacts
License: LGPL-2.1-or-later
@@ -39,55 +37,59 @@
BuildRequires: cmake(KF5Parts) >= %{kf5_version}
BuildRequires: cmake(KF5WindowSystem) >= %{kf5_version}
BuildRequires: cmake(KF5XmlGui) >= %{kf5_version}
+BuildRequires: cmake(Qt5X11Extras)
%description
This package contains additional libraries for KDE PIM applications.
-%package -n libKF5KontactInterface5
+%package -n libKPim5KontactInterface5
Summary: KDE PIM Libraries: Interface to Contacts
-Recommends: %{name}-lang
Provides: %{name} = %{version}
+# Renamed
+Obsoletes: kontactinterface-lang <= 23.04.0
-%description -n libKF5KontactInterface5
+%description -n libKPim5KontactInterface5
This package provides the interface to contacts for KDE PIM applications
%package devel
Summary: KDE PIM Libraries: Build Environment
-Requires: libKF5KontactInterface5 = %{version}
+Requires: libKPim5KontactInterface5 = %{version}
Requires: cmake(KF5Parts) >= %{kf5_version}
%description devel
This package contains necessary include files and libraries needed
to develop KDE PIM applications.
-%lang_package
+%lang_package -n libKPim5KontactInterface5
%prep
%autosetup -p1
%build
-%cmake_kf5 -d build -- -DBUILD_TESTING=OFF
-DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir}
+%cmake_kf5 -d build -- -DBUILD_TESTING=OFF
%cmake_build
%install
%kf5_makeinstall -C build
-%find_lang %{name} --with-man --all-name
+%find_lang libKPim5KontactInterface5 --with-man --all-name
-%ldconfig_scriptlets -n libKF5KontactInterface5
+%ldconfig_scriptlets -n libKPim5KontactInterface5
-%files -n libKF5KontactInterface5
+%files -n libKPim5KontactInterface5
%license LICENSES/*
%{_kf5_debugdir}/*.categories
%{_kf5_debugdir}/*.renamecategories
-%{_kf5_libdir}/libKF5KontactInterface.so.*
+%{_kf5_libdir}/libKPim5KontactInterface.so.*
%files devel
+%dir %{_includedir}/KPim5
+%{_includedir}/KPim5/KontactInterface/
%{_kf5_cmakedir}/KF5KontactInterface/
-%{_kf5_includedir}/KontactInterface/
-%{_kf5_libdir}/libKF5KontactInterface.so
+%{_kf5_cmakedir}/KPim5KontactInterface/
+%{_kf5_libdir}/libKPim5KontactInterface.so
%{_kf5_mkspecsdir}/qt_KontactInterface.pri
-%files lang -f %{name}.lang
+%files -n libKPim5KontactInterface5-lang -f libKPim5KontactInterface5.lang
%changelog
++++++ kontactinterface-22.12.3.tar.xz -> kontactinterface-23.04.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/.codespellrc.license
new/kontactinterface-23.04.0/.codespellrc.license
--- old/kontactinterface-22.12.3/.codespellrc.license 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/.codespellrc.license 2023-04-11
06:37:52.000000000 +0200
@@ -1,2 +1,2 @@
-# SPDX-FileCopyrightText: 2022 Laurent Montel <[email protected]>
+# SPDX-FileCopyrightText: 2022-2023 Laurent Montel <[email protected]>
# SPDX-License-Identifier: CC0-1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/.gitlab-ci.yml
new/kontactinterface-23.04.0/.gitlab-ci.yml
--- old/kontactinterface-22.12.3/.gitlab-ci.yml 2023-02-25 06:11:18.000000000
+0100
+++ new/kontactinterface-23.04.0/.gitlab-ci.yml 2023-04-11 06:37:52.000000000
+0200
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2020-2022 Laurent Montel <[email protected]>
+# SPDX-FileCopyrightText: 2020-2023 Laurent Montel <[email protected]>
# SPDX-License-Identifier: CC0-1.0
include:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/.kde-ci.yml
new/kontactinterface-23.04.0/.kde-ci.yml
--- old/kontactinterface-22.12.3/.kde-ci.yml 2023-02-25 06:11:18.000000000
+0100
+++ new/kontactinterface-23.04.0/.kde-ci.yml 2023-04-11 06:37:52.000000000
+0200
@@ -2,7 +2,7 @@
# SPDX-License-Identifier: CC0-1.0
Dependencies:
-- 'on': ['@all']
+- 'on': ['Linux/Qt5', 'FreeBSD/Qt5', 'Windows/Qt5']
'require':
'frameworks/extra-cmake-modules': '@latest'
'frameworks/kcoreaddons': '@latest'
@@ -11,5 +11,14 @@
'frameworks/ki18n': '@latest'
'frameworks/kxmlgui': '@latest'
+- 'on': ['Linux/Qt6', 'FreeBSD/Qt6', 'Windows/Qt6']
+ 'require':
+ 'frameworks/extra-cmake-modules': '@latest-kf6'
+ 'frameworks/kcoreaddons': '@latest-kf6'
+ 'frameworks/kparts': '@latest-kf6'
+ 'frameworks/kwindowsystem': '@latest-kf6'
+ 'frameworks/ki18n': '@latest-kf6'
+ 'frameworks/kxmlgui': '@latest-kf6'
+
Options:
require-passing-tests-on: [ 'Linux', 'FreeBSD', 'Windows' ]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/CMakeLists.txt
new/kontactinterface-23.04.0/CMakeLists.txt
--- old/kontactinterface-22.12.3/CMakeLists.txt 2023-02-25 06:11:18.000000000
+0100
+++ new/kontactinterface-23.04.0/CMakeLists.txt 2023-04-11 06:37:52.000000000
+0200
@@ -1,14 +1,14 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
cmake_minimum_required(VERSION 3.16 FATAL_ERROR)
-set(PIM_VERSION "5.22.3")
+set(PIM_VERSION "5.23.0")
project(KontactInterface VERSION ${PIM_VERSION})
# ECM setup
-set(KF5_MIN_VERSION "5.99.0")
+set(KF_MIN_VERSION "5.103.0")
-find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
+find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
include(KDEInstallDirs)
@@ -30,17 +30,27 @@
include(ECMDeprecationSettings)
include(ECMSetupQtPluginMacroNames)
include(ECMAddQch)
+
+if (QT_MAJOR_VERSION STREQUAL "6")
+ set(QT_MIN_VERSION "6.4.0")
+ set(KF_MIN_VERSION "5.240.0")
+ set(KF_MAJOR_VERSION "6")
+else()
+ set(KF_MAJOR_VERSION "5")
+endif()
+
+option(BUILD_WITH_COMPAT_LIBS "Generate compat cmake file (Set at false will
allow to co-install lib)" ON)
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)")
add_definitions(-DTRANSLATION_DOMAIN=\"kontactinterfaces5\")
set(KONTACTINTERFACE_LIB_VERSION ${PIM_VERSION})
-set(CMAKECONFIG_INSTALL_DIR
"${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KontactInterface")
+set(CMAKECONFIG_INSTALL_DIR
"${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}KontactInterface")
ecm_setup_version(PROJECT VARIABLE_PREFIX KONTACTINTERFACE
VERSION_HEADER
"${CMAKE_CURRENT_BINARY_DIR}/kontactinterface_version.h"
- PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KF5KontactInterfaceConfigVersion.cmake"
+ PACKAGE_VERSION_FILE
"${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceConfigVersion.cmake"
SOVERSION 5
)
@@ -52,7 +62,7 @@
)
########### Find packages ###########
-find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+find_package(KF${KF_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS
CoreAddons
Parts
WindowSystem
@@ -60,24 +70,27 @@
XmlGui
)
-if (NOT APPLE)
- find_package(X11)
+if (NOT APPLE AND NOT WIN32)
+ find_package(X11 REQUIRED)
+ if (QT_MAJOR_VERSION STREQUAL "5")
+ find_package(Qt5X11Extras REQUIRED)
+ endif()
endif()
set(KONTACTINTERFACE_HAVE_X11 ${X11_FOUND})
configure_file(config-kontactinterface.h.cmake
${CMAKE_CURRENT_BINARY_DIR}/config-kontactinterface.h )
-
+set(KONTACTINTERFACE_KF5_COMPAT FALSE)
configure_package_config_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/KF5KontactInterfaceConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KontactInterfaceConfig.cmake"
+ "${CMAKE_CURRENT_SOURCE_DIR}/KPimKontactInterfaceConfig.cmake.in"
+
"${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
########### Install Files ###########
install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KontactInterfaceConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KF5KontactInterfaceConfigVersion.cmake"
+
"${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceConfig.cmake"
+
"${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
@@ -85,15 +98,16 @@
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kontactinterface_version.h
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KontactInterface
+ DESTINATION
${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KontactInterface
COMPONENT Devel
)
-install(EXPORT KF5KontactInterfaceTargets DESTINATION
"${CMAKECONFIG_INSTALL_DIR}" FILE KF5KontactInterfaceTargets.cmake NAMESPACE
KF5::)
+install(EXPORT KPim${KF_MAJOR_VERSION}KontactInterfaceTargets DESTINATION
"${CMAKECONFIG_INSTALL_DIR}"
+ FILE KPim${KF_MAJOR_VERSION}KontactInterfaceTargets.cmake NAMESPACE
KPim${KF_MAJOR_VERSION}::)
-ecm_set_disabled_deprecation_versions(QT 5.15.2
- KF 5.99.0
+ecm_set_disabled_deprecation_versions(QT 6.4
+ KF 5.104.0
KPARTS 5.76 # componentData()
)
@@ -113,13 +127,51 @@
if (BUILD_QCH)
ecm_install_qch_export(
- TARGETS KF5KontactInterface_QCH
- FILE KF5KontactInterfaceQchTargets.cmake
+ TARGETS KPim${KF_MAJOR_VERSION}KontactInterface_QCH
+ FILE KPim${KF_MAJOR_VERSION}KontactInterfaceQchTargets.cmake
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
- set(PACKAGE_INCLUDE_QCHTARGETS
"include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5KontactInterfaceQchTargets.cmake\")")
+ set(PACKAGE_INCLUDE_QCHTARGETS
"include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceQchTargets.cmake\")")
endif()
+if (BUILD_WITH_COMPAT_LIBS)
+if (QT_MAJOR_VERSION STREQUAL "5")
+##
+# TODO: Backwards compatiblity. Remove in next major version
+##
+set(CMAKECONFIG_INSTALL_DIR_KF5
"${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5KontactInterface")
+set(KONTACTINTERFACE_KF5_COMPAT TRUE)
+configure_package_config_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/KPimKontactInterfaceConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KontactInterfaceConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR_KF5}
+)
+install(FILES
+ "${CMAKE_CURRENT_BINARY_DIR}/KF5KontactInterfaceConfig.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ COMPONENT Devel
+)
+install(FILES
+
"${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceConfigVersion.cmake"
+ RENAME "KF5KontactInterfaceConfigVersion.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ COMPONENT Devel
+)
+install(EXPORT KPim${KF_MAJOR_VERSION}KontactInterfaceTargets
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ FILE KPim${KF_MAJOR_VERSION}KontactInterfaceTargets.cmake
+ NAMESPACE KF5::
+)
+if (BUILD_QCH)
+ install(FILES
+
"${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}KontactInterfaceQchTargets.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR_KF5}"
+ COMPONENT Devel
+ )
+endif()
+
+endif()
+endif()
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/CMakePresets.json
new/kontactinterface-23.04.0/CMakePresets.json
--- old/kontactinterface-22.12.3/CMakePresets.json 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/CMakePresets.json 2023-04-11
06:37:52.000000000 +0200
@@ -5,28 +5,35 @@
"name": "base",
"displayName": "base preset",
"generator": "Ninja",
- "binaryDir": "${sourceDir}/build-${presetName}",
- "installDir": "$env{KF5}",
+ "binaryDir": "${sourceDir}/build-${presetName}",
+ "installDir": "$env{KF5}",
"hidden": true
},
{
- "name": "dev",
- "displayName": "Build as debug",
+ "name": "base-qt6",
+ "displayName": "base preset",
+ "generator": "Ninja",
+ "binaryDir": "${sourceDir}/build-${presetName}",
+ "installDir": "$env{KF6}",
+ "hidden": true
+ },
+ {
+ "name": "dev-mold",
+ "displayName": "Build as debug + using mold linker",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
+ "CMAKE_SHARED_LINKER_FLAGS": "-fuse-ld=mold"
},
"inherits": [
"base"
]
-
},
{
- "name": "coverage",
+ "name": "dev",
"displayName": "Build as debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "BUILD_COVERAGE": "ON",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"inherits": [
@@ -43,19 +50,7 @@
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"inherits": [
- "base"
- ]
- },
- {
- "name": "dev-disable-deprecated",
- "displayName": "Build as without deprecated methods",
- "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"
- },
- "inherits": [
- "base"
+ "base-qt6"
]
},
{
@@ -63,20 +58,7 @@
"displayName": "Build with Asan support.",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "ECM_ENABLE_SANITIZERS" : "'address;undefined'",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
- },
- "inherits": [
- "base"
- ]
- },
- {
- "name": "pch",
- "displayName": "Build with PCH support.",
- "cacheVariables": {
- "CMAKE_BUILD_TYPE": "Debug",
- "COMPILE_WITH_CMAKE_PCH_SUPPORT": "ON",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ "ECM_ENABLE_SANITIZERS" : "'address;undefined'"
},
"inherits": [
"base"
@@ -102,8 +84,7 @@
"displayName": "Build with CMake unity support.",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
- "USE_UNITY_CMAKE_SUPPORT": "ON",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ "USE_UNITY_CMAKE_SUPPORT": "ON"
},
"inherits": [
"base"
@@ -123,8 +104,19 @@
"name": "profile",
"displayName": "profile",
"cacheVariables": {
- "CMAKE_BUILD_TYPE": "RelWithDebInfo",
- "CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
+ "CMAKE_BUILD_TYPE": "RelWithDebInfo"
+ },
+ "inherits": [
+ "base"
+ ]
+ },
+ {
+ "name": "coverage",
+ "displayName": "coverage",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "USE_UNITY_CMAKE_SUPPORT": "OFF",
+ "BUILD_COVERAGE": "ON"
},
"inherits": [
"base"
@@ -143,21 +135,36 @@
"inherits": [
"base"
]
+ },
+ {
+ "name": "pch",
+ "displayName": "pch",
+ "cacheVariables": {
+ "CMAKE_BUILD_TYPE": "Debug",
+ "USE_PRECOMPILED_HEADERS": "ON",
+ "BUILD_COVERAGE": "ON"
+ },
+ "inherits": [
+ "base"
+ ]
}
-
],
"buildPresets": [
{
"name": "dev",
"configurePreset": "dev"
},
+ {
+ "name": "dev-mold",
+ "configurePreset": "dev-mold"
+ },
{
"name": "dev-qt6",
"configurePreset": "dev-qt6"
},
{
- "name": "dev-disable-deprecated",
- "configurePreset": "dev-disable-deprecated"
+ "name": "dev-clang",
+ "configurePreset": "dev-clang"
},
{
"name": "pch",
@@ -168,22 +175,18 @@
"configurePreset": "release"
},
{
- "name": "coverage",
- "configurePreset": "coverage"
+ "name": "unity",
+ "configurePreset": "unity"
},
{
- "name": "dev-clang",
- "configurePreset": "dev-clang"
+ "name": "coverage",
+ "configurePreset": "coverage"
},
- {
+ {
"name": "asan",
"configurePreset": "asan"
},
{
- "name": "unity",
- "configurePreset": "unity"
- },
- {
"name": "clazy",
"configurePreset": "clazy",
"environment": {
@@ -193,17 +196,29 @@
}
],
"testPresets": [
- {
+ {
"name": "dev",
"configurePreset": "dev",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": false}
},
- {
+ {
"name": "asan",
"configurePreset": "asan",
"output": {"outputOnFailure": true},
"execution": {"noTestsAction": "error", "stopOnFailure": true}
+ },
+ {
+ "name": "unity",
+ "configurePreset": "unity",
+ "output": {"outputOnFailure": true},
+ "execution": {"noTestsAction": "error", "stopOnFailure": true}
+ },
+ {
+ "name": "coverage",
+ "configurePreset": "coverage",
+ "output": {"outputOnFailure": true},
+ "execution": {"noTestsAction": "error", "stopOnFailure": true}
}
- ]
+ ]
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/CMakePresets.json.license
new/kontactinterface-23.04.0/CMakePresets.json.license
--- old/kontactinterface-22.12.3/CMakePresets.json.license 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/CMakePresets.json.license 2023-04-11
06:37:52.000000000 +0200
@@ -1,2 +1,2 @@
-# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]>
+# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]>
# SPDX-License-Identifier: BSD-3-Clause
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-22.12.3/KF5KontactInterfaceConfig.cmake.in
new/kontactinterface-23.04.0/KF5KontactInterfaceConfig.cmake.in
--- old/kontactinterface-22.12.3/KF5KontactInterfaceConfig.cmake.in
2023-02-25 06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/KF5KontactInterfaceConfig.cmake.in
1970-01-01 01:00:00.000000000 +0100
@@ -1,10 +0,0 @@
-# SPDX-FileCopyrightText: 2014 Montel Laurent <[email protected]>
-# SPDX-License-Identifier: BSD-3-Clause
-
-@PACKAGE_INIT@
-include(CMakeFindDependencyMacro)
-find_dependency(KF5Parts "@KF5_MIN_VERSION@")
-
-@PACKAGE_SETUP_AUTOMOC_VARIABLES@
-
-include("${CMAKE_CURRENT_LIST_DIR}/KF5KontactInterfaceTargets.cmake")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-22.12.3/KPimKontactInterfaceConfig.cmake.in
new/kontactinterface-23.04.0/KPimKontactInterfaceConfig.cmake.in
--- old/kontactinterface-22.12.3/KPimKontactInterfaceConfig.cmake.in
1970-01-01 01:00:00.000000000 +0100
+++ new/kontactinterface-23.04.0/KPimKontactInterfaceConfig.cmake.in
2023-04-11 06:37:52.000000000 +0200
@@ -0,0 +1,21 @@
+# SPDX-FileCopyrightText: 2014 Montel Laurent <[email protected]>
+# SPDX-License-Identifier: BSD-3-Clause
+
+@PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+find_dependency(KF@KF_MAJOR_VERSION@Parts "@KF_MIN_VERSION@")
+
+@PACKAGE_SETUP_AUTOMOC_VARIABLES@
+
+if (@KONTACTINTERFACE_KF5_COMPAT@)
+ message(WARNING "\n"
+ "************* DEPRECATION WARNING *************\n"
+ "Using find_package(KF5KontactInterface) and
KF5::KontactInterface targets is deprecated. "
+ "Please use
find_package(KPim@KF_MAJOR_VERSION@KontactInterface) and
KPim@KF_MAJOR_VERSION@::KontactInterface 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/kontactinterface-22.12.3/po/is/kontactinterfaces5.po
new/kontactinterface-23.04.0/po/is/kontactinterfaces5.po
--- old/kontactinterface-22.12.3/po/is/kontactinterfaces5.po 1970-01-01
01:00:00.000000000 +0100
+++ new/kontactinterface-23.04.0/po/is/kontactinterfaces5.po 2023-04-11
06:37:52.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.
+#
+# Sveinn à Felli <[email protected]>, 2023.
+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: 2023-02-02 14:42+0000\n"
+"Last-Translator: Sveinn à Felli <[email protected]>\n"
+"Language-Team: Icelandic\n"
+"Language: is\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 21.12.3\n"
+
+#, kde-format
+msgctxt "NAME OF TRANSLATORS"
+msgid "Your names"
+msgstr "Sveinn à Felli"
+
+#, 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.12.3/po/zh_CN/kontactinterfaces5.po
new/kontactinterface-23.04.0/po/zh_CN/kontactinterfaces5.po
--- old/kontactinterface-22.12.3/po/zh_CN/kontactinterfaces5.po 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/po/zh_CN/kontactinterfaces5.po 2023-04-11
06:37:52.000000000 +0200
@@ -3,7 +3,7 @@
"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: 2023-02-24 12:58\n"
+"PO-Revision-Date: 2023-04-10 14:13\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.12.3/sanitizers.supp
new/kontactinterface-23.04.0/sanitizers.supp
--- old/kontactinterface-22.12.3/sanitizers.supp 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/sanitizers.supp 2023-04-11
06:37:52.000000000 +0200
@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021-2022 Laurent Montel <[email protected]>
+# SPDX-FileCopyrightText: 2021-2023 Laurent Montel <[email protected]>
# SPDX-License-Identifier: CC0-1.0
# Suppression file for ASAN/LSAN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/src/CMakeLists.txt
new/kontactinterface-23.04.0/src/CMakeLists.txt
--- old/kontactinterface-22.12.3/src/CMakeLists.txt 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/src/CMakeLists.txt 2023-04-11
06:37:52.000000000 +0200
@@ -1,9 +1,11 @@
# SPDX-FileCopyrightText: none
# SPDX-License-Identifier: BSD-3-Clause
-add_library(KF5KontactInterface)
-add_library(KF5::KontactInterface ALIAS KF5KontactInterface)
-target_sources(KF5KontactInterface PRIVATE
+add_library(KPim${KF_MAJOR_VERSION}KontactInterface)
+add_library(KPim${KF_MAJOR_VERSION}::KontactInterface ALIAS
KPim${KF_MAJOR_VERSION}KontactInterface)
+add_library(KF5::KontactInterface ALIAS
KPim${KF_MAJOR_VERSION}KontactInterface)
+
+target_sources(KPim${KF_MAJOR_VERSION}KontactInterface PRIVATE
core.cpp
plugin.cpp
summary.cpp
@@ -17,37 +19,46 @@
pimuniqueapplication.h
summary.h)
-ecm_qt_declare_logging_category(KF5KontactInterface HEADER
kontactinterface_debug.h IDENTIFIER KONTACTINTERFACE_LOG CATEGORY_NAME
org.kde.pim.kontactinterface
+ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}KontactInterface HEADER
kontactinterface_debug.h IDENTIFIER KONTACTINTERFACE_LOG CATEGORY_NAME
org.kde.pim.kontactinterface
OLD_CATEGORY_NAMES log_kontactinterface
DESCRIPTION "kontactinterface (pim lib)" EXPORT KONTACTINTERFACE)
if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
- set_target_properties(KF5KontactInterface PROPERTIES UNITY_BUILD ON)
+ set_target_properties(KPim${KF_MAJOR_VERSION}KontactInterface PROPERTIES
UNITY_BUILD ON)
endif()
-generate_export_header(KF5KontactInterface BASE_NAME kontactinterface)
+generate_export_header(KPim${KF_MAJOR_VERSION}KontactInterface BASE_NAME
kontactinterface)
-target_include_directories(KF5KontactInterface INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KontactInterface>")
-target_include_directories(KF5KontactInterface PUBLIC
"$<BUILD_INTERFACE:${KontactInterface_SOURCE_DIR}/src;${KontactInterface_BINARY_DIR}/src;${KontactInterface_BINARY_DIR}>")
+target_include_directories(KPim${KF_MAJOR_VERSION}KontactInterface INTERFACE
"$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KontactInterface>")
+target_include_directories(KPim${KF_MAJOR_VERSION}KontactInterface PUBLIC
"$<BUILD_INTERFACE:${KontactInterface_SOURCE_DIR}/src;${KontactInterface_BINARY_DIR}/src;${KontactInterface_BINARY_DIR}>")
-target_link_libraries(KF5KontactInterface
+target_link_libraries(KPim${KF_MAJOR_VERSION}KontactInterface
PUBLIC
- KF5::CoreAddons
- KF5::Parts
- KF5::XmlGui
+ KF${KF_MAJOR_VERSION}::CoreAddons
+ KF${KF_MAJOR_VERSION}::Parts
+ KF${KF_MAJOR_VERSION}::XmlGui
PRIVATE
- KF5::WindowSystem
- KF5::I18n
+ KF${KF_MAJOR_VERSION}::WindowSystem
+ KF${KF_MAJOR_VERSION}::I18n
+ KF${KF_MAJOR_VERSION}::KIOGui
)
-set_target_properties(KF5KontactInterface PROPERTIES
+if (KONTACTINTERFACE_HAVE_X11)
+ if (QT_MAJOR_VERSION STREQUAL "5")
+ target_link_libraries(KPim${KF_MAJOR_VERSION}KontactInterface PRIVATE
Qt::X11Extras)
+ else()
+ target_link_libraries(KPim${KF_MAJOR_VERSION}KontactInterface PRIVATE
Qt::GuiPrivate)
+ endif()
+endif()
+
+set_target_properties(KPim${KF_MAJOR_VERSION}KontactInterface PROPERTIES
VERSION ${KONTACTINTERFACE_VERSION}
SOVERSION ${KONTACTINTERFACE_SOVERSION}
EXPORT_NAME KontactInterface
)
-install(TARGETS KF5KontactInterface EXPORT KF5KontactInterfaceTargets
${KF_INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS KPim${KF_MAJOR_VERSION}KontactInterface EXPORT
KPim${KF_MAJOR_VERSION}KontactInterfaceTargets
${KF_INSTALL_TARGETS_DEFAULT_ARGS})
########### install files ###############
@@ -66,26 +77,27 @@
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/kontactinterface_export.h
${KontactInterface_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KontactInterface/kontactinterface
+ DESTINATION
${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KontactInterface/kontactinterface
COMPONENT Devel
)
install(FILES
${KontactInterface_CamelCase_HEADERS}
- DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KontactInterface/KontactInterface/
+ DESTINATION
${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KontactInterface/KontactInterface/
COMPONENT Devel
)
-ecm_generate_pri_file(BASE_NAME KontactInterface LIB_NAME KF5KontactInterface
DEPS "KParts KCoreAddons KXmlGui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${KDE_INSTALL_INCLUDEDIR_KF}/KontactInterface)
+ecm_generate_pri_file(BASE_NAME KontactInterface LIB_NAME
KPim${KF_MAJOR_VERSION}KontactInterface DEPS "KParts KCoreAddons KXmlGui"
+ FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR
${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/KontactInterface)
install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
ecm_qt_install_logging_categories(EXPORT KONTACTINTERFACE FILE
kontactinterface.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
if (BUILD_QCH)
ecm_add_qch(
- KF5KontactInterface_QCH
- NAME KF5KontactInterface
- BASE_NAME KF5KontactInterface
+ KPim${KF_MAJOR_VERSION}KontactInterface_QCH
+ NAME KPim${KF_MAJOR_VERSION}KontactInterface
+ BASE_NAME KPim${KF_MAJOR_VERSION}KontactInterface
VERSION ${PIM_VERSION}
ORG_DOMAIN org.kde
SOURCES # using only public headers, to cover only public API
@@ -93,9 +105,9 @@
#MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
#IMAGE_DIRS "${CMAKE_SOURCE_DIR}/docs/pics"
LINK_QCHS
- Qt5Core_QCH
- Qt5Gui_QCH
- Qt5Widgets_QCH
+ Qt${QT_MAJOR_VERSION}Core_QCH
+ Qt${QT_MAJOR_VERSION}Gui_QCH
+ Qt${QT_MAJOR_VERSION}Widgets_QCH
INCLUDE_DIRS
${CMAKE_CURRENT_BINARY_DIR}
BLANK_MACROS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kontactinterface-22.12.3/src/pimuniqueapplication.cpp
new/kontactinterface-23.04.0/src/pimuniqueapplication.cpp
--- old/kontactinterface-22.12.3/src/pimuniqueapplication.cpp 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/src/pimuniqueapplication.cpp 2023-04-11
06:37:52.000000000 +0200
@@ -10,9 +10,19 @@
#include "kontactinterface_debug.h"
#include <KAboutData>
-#include <KStartupInfo>
#include <KWindowSystem>
+#include "config-kontactinterface.h"
+#if KONTACTINTERFACE_HAVE_X11
+#include <KStartupInfo>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <private/qtx11extras_p.h>
+#else
+#include <QX11Info>
+#endif
+#endif
+
#include <QCommandLineParser>
#include <QDir>
@@ -50,7 +60,7 @@
// Disable Chromium's own crash handler, which overrides DrKonqi.
auto flags = qgetenv(kChromiumFlagsEnv);
if (!flags.contains(kDisableInProcessStackTraces)) {
- qputenv(kChromiumFlagsEnv, flags + " " +
kDisableInProcessStackTraces);
+ qputenv(kChromiumFlagsEnv, QByteArray(flags + " " +
kDisableInProcessStackTraces));
}
}
@@ -98,7 +108,7 @@
int PimUniqueApplication::newInstance()
{
- return newInstance(KStartupInfo::startupId(), QStringList() <<
QApplication::applicationName(), QDir::currentPath());
+ return newInstance(QByteArray(), QStringList() <<
QApplication::applicationName(), QDir::currentPath());
}
bool PimUniqueApplication::start(const QStringList &arguments)
@@ -113,21 +123,13 @@
if
(QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName)) {
QByteArray new_asn_id;
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();
- }
+#if KONTACTINTERFACE_HAVE_X11
+ new_asn_id = QX11Info::nextStartupId();
+#endif
} else if (KWindowSystem::isPlatformWayland()) {
new_asn_id = qgetenv("XDG_ACTIVATION_TOKEN");
}
- KWindowSystem::allowExternalProcessWindowActivation();
-
if (callNewInstance(appName, serviceName, new_asn_id, arguments)) {
return false; // success means that main() can exit now.
}
@@ -149,7 +151,9 @@
int PimUniqueApplication::newInstance(const QByteArray &startupId, const
QStringList &arguments, const QString &workingDirectory)
{
if (KWindowSystem::isPlatformX11()) {
+#if KONTACTINTERFACE_HAVE_X11
KStartupInfo::setStartupId(startupId);
+#endif
} else if (KWindowSystem::isPlatformWayland()) {
KWindowSystem::setCurrentXdgActivationToken(QString::fromUtf8(startupId));
}
@@ -159,11 +163,8 @@
if (qobject_cast<QMainWindow *>(win)) {
win->show();
win->setAttribute(Qt::WA_NativeWindow, true);
- if (KWindowSystem::isPlatformX11()) {
- KStartupInfo::setNewStartupId(win->windowHandle(), startupId);
// this moves 'win' to the current desktop
- } else if (KWindowSystem::isPlatformWayland()) {
- KWindowSystem::activateWindow(win->windowHandle());
- }
+
+ KWindowSystem::activateWindow(win->windowHandle());
break;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/src/summary.cpp
new/kontactinterface-23.04.0/src/summary.cpp
--- old/kontactinterface-22.12.3/src/summary.cpp 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/src/summary.cpp 2023-04-11
06:37:52.000000000 +0200
@@ -143,7 +143,11 @@
void Summary::dropEvent(QDropEvent *event)
{
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
const int alignment = (event->pos().y() < (height() / 2) ? Qt::AlignTop :
Qt::AlignBottom);
+#else
+ const int alignment = (event->position().y() < (height() / 2) ?
Qt::AlignTop : Qt::AlignBottom);
+#endif
Q_EMIT summaryWidgetDropped(this, event->source(), alignment);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kontactinterface-22.12.3/src/uniqueapphandler.cpp
new/kontactinterface-23.04.0/src/uniqueapphandler.cpp
--- old/kontactinterface-22.12.3/src/uniqueapphandler.cpp 2023-02-25
06:11:18.000000000 +0100
+++ new/kontactinterface-23.04.0/src/uniqueapphandler.cpp 2023-04-11
06:37:52.000000000 +0200
@@ -12,7 +12,6 @@
#include "processes.h"
#include "kontactinterface_debug.h"
-#include <KStartupInfo>
#include <kwindowsystem.h>
#include <QDBusConnection>
@@ -20,6 +19,11 @@
#include <QCommandLineParser>
+#include <config-kontactinterface.h>
+#if KONTACTINTERFACE_HAVE_X11
+#include <KStartupInfo>
+#endif
+
#ifdef Q_OS_WIN
#include <process.h>
#endif
@@ -94,10 +98,14 @@
}
// DBUS call
-int UniqueAppHandler::newInstance(const QByteArray &asn_id, const QStringList
&args, const QString &workingDirectory)
+int UniqueAppHandler::newInstance(const QByteArray &startupId, const
QStringList &args, const QString &workingDirectory)
{
- if (!asn_id.isEmpty()) {
- KStartupInfo::setStartupId(asn_id);
+ if (KWindowSystem::isPlatformX11()) {
+#if KONTACTINTERFACE_HAVE_X11
+ KStartupInfo::setStartupId(startupId);
+#endif
+ } else if (KWindowSystem::isPlatformWayland()) {
+
KWindowSystem::setCurrentXdgActivationToken(QString::fromUtf8(startupId));
}
QCommandLineParser parser;
@@ -117,10 +125,10 @@
if (s_mainWidget) {
s_mainWidget->show();
-#ifdef Q_OS_WIN
- KWindowSystem::forceActiveWindow(s_mainWidget->winId());
-#endif
+ KWindowSystem::activateWindow(s_mainWidget->windowHandle());
+#if KONTACTINTERFACE_HAVE_X11
KStartupInfo::appStarted();
+#endif
}
// Then ensure the part appears in kontact
