No OneTemporary
Actions

Size

24 KB

Subscribers

None

View Options

	diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
	index 6a5adc5..703c843 100644
	--- a/.gitlab-ci.yml
	+++ b/.gitlab-ci.yml
	@@ -1,7 +1,7 @@
	# SPDX-FileCopyrightText: 2020-2021 Laurent Montel <montel@kde.org>
	# SPDX-License-Identifier: CC0-1.0

	include:
	- 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/linux-qt6.yml
	+ - https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd-qt6.yml
	diff --git a/.kde-ci.yml b/.kde-ci.yml
	index e191b12..356f3fd 100644
	--- a/.kde-ci.yml
	+++ b/.kde-ci.yml
	@@ -1,13 +1,13 @@
	# SPDX-FileCopyrightText: None
	# SPDX-License-Identifier: CC0-1.0

	Dependencies:
	-- 'on': ['Linux/Qt5', 'FreeBSD/Qt5']
	+- 'on': ['Linux', 'FreeBSD']
	'require':
	- 'frameworks/extra-cmake-modules': '@latest'
	- 'frameworks/kcalendarcore' : '@latest'
	- 'pim/kmime' : '@same'
	- 'pim/kmbox' : '@same'
	+ 'frameworks/extra-cmake-modules': '@latest-kf6'
	+ 'frameworks/kcalendarcore' : '@latest-kf6'
	+ 'pim/kmime' : '@latest-kf6'
	+ 'pim/kmbox' : '@latest-kf6'

	Options:
	require-passing-tests-on: ['Linux']
	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 44e7b20..47af441 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,111 +1,107 @@
	# SPDX-FileCopyrightText: 2023 Carl Schwan <carl.schwan@gnupg.com>
	# SPDX-License-Identifier: BSD-3-Clause

	cmake_minimum_required(VERSION 3.16 FATAL_ERROR)

	-set(PIM_VERSION "5.23.42")
	+set(PIM_VERSION "5.240.0")
	project(MimeTreeParserNG VERSION ${PIM_VERSION})

	# ECM setup
	-set(KF_MIN_VERSION "5.105.0")
	+set(KF_MIN_VERSION "5.240.0")
	find_package(ECM ${KF_MIN_VERSION} CONFIG REQUIRED)
	set(CMAKE_MODULE_PATH
	${CMAKE_MODULE_PATH}
	${ECM_MODULE_PATH}
	${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules
	)
	-set(QT_REQUIRED_VERSION "5.15.2")
	+set(QT_REQUIRED_VERSION "4.4.0")
	if (QT_MAJOR_VERSION STREQUAL "6")
	set(QT_REQUIRED_VERSION "6.4.0")
	endif()

	include(KDEInstallDirs)
	include(KDECMakeSettings)
	include(KDECompilerSettings NO_POLICY_SCOPE)

	include(GenerateExportHeader)
	include(ECMGenerateHeaders)
	include(ECMGeneratePriFile)

	include(ECMQmlModule)
	include(ECMSetupVersion)
	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(ECMDeprecationSettings)
	include(ECMAddQch)

	-if (QT_MAJOR_VERSION STREQUAL "6")
	- set(QT_REQUIRED_VERSION "6.4.0")
	- set(KF_MIN_VERSION "5.240.0")
	- set(KF_MAJOR_VERSION "6")
	-else()
	- set(KF_MAJOR_VERSION "5")
	-endif()
	-
	-set(KPIM_MIME_VERSION "5.23.40")
	+set(QT_REQUIRED_VERSION "6.4.0")
	+set(KF_MIN_VERSION "5.240.0")
	+set(KF_MAJOR_VERSION "6")
	+set(KPIM_MIME_VERSION "5.240.0")

	ecm_setup_version(PROJECT
	VARIABLE_PREFIX MIMETREEPARSERNG
	VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mimetreeparserng_version.h"
	PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCoreConfigVersion.cmake"
	- SOVERSION 5
	+ SOVERSION 6
	)

	configure_file(mimetreeparserng-version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/mimetreeparserng-version.h @ONLY)

	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)")

	if(BUILD_TESTING)
	add_definitions(-DBUILD_TESTING)
	endif()

	########### Find packages ###########
	-find_package(Qt${KF_MAJOR_VERSION}Gui ${QT_MIN_VERSION} CONFIG REQUIRED)
	-find_package(KF${KF_MAJOR_VERSION}I18n ${KF_MIN_VERSION} CONFIG REQUIRED)
	-find_package(KF${KF_MAJOR_VERSION}Codecs ${KF_MIN_VERSION} CONFIG REQUIRED)
	-find_package(KF${KF_MAJOR_VERSION}CalendarCore ${KF_MIN_VERSION} CONFIG REQUIRED)
	-find_package(KPim${KF_MAJOR_VERSION}Mime ${KPIM_MIME_VERSION} CONFIG REQUIRED)
	+find_package(Qt6Gui ${QT_MIN_VERSION} CONFIG REQUIRED)
	+find_package(KF6I18n ${KF_MIN_VERSION} CONFIG REQUIRED)
	+find_package(KF6Codecs ${KF_MIN_VERSION} CONFIG REQUIRED)
	+find_package(KF6CalendarCore ${KF_MIN_VERSION} CONFIG REQUIRED)
	+find_package(KPim6Mime ${KPIM_MIME_VERSION} CONFIG REQUIRED)
	find_package(Gpgme REQUIRED)

	-find_package(Qt${KF_MAJOR_VERSION}Quick ${QT_MIN_VERSION} CONFIG)
	-find_package(Qt${KF_MAJOR_VERSION}Widgets ${QT_MIN_VERSION} CONFIG)
	+find_package(Qt6Quick ${QT_MIN_VERSION} CONFIG)
	+find_package(Qt6Widgets ${QT_MIN_VERSION} CONFIG)
	+find_package(Qt6Core5Compat ${QT_MIN_VERSION} CONFIG)

	if (BUILD_TESTING)
	find_package(Qt${KF_MAJOR_VERSION}Test ${QT_MIN_VERSION} CONFIG REQUIRED)
	endif()

	########### Targets ###########

	ecm_set_disabled_deprecation_versions(QT 6.4 KF 5.105.0)

	option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" OFF)

	set(COMPILE_WITH_UNITY_CMAKE_SUPPORT OFF)
	if (USE_UNITY_CMAKE_SUPPORT)
	set(COMPILE_WITH_UNITY_CMAKE_SUPPORT ON)
	add_definitions(-DCOMPILE_WITH_UNITY_CMAKE_SUPPORT)
	endif()

	add_subdirectory(src)
	add_subdirectory(examples)

	install(FILES
	${CMAKE_CURRENT_BINARY_DIR}/mimetreeparserng_version.h
	DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserCore
	COMPONENT Devel
	)
	ecm_qt_install_logging_categories(
	EXPORT MIMETREEPARSERNG
	FILE mimetreeparser2.categories
	DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
	)

	kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT)
	ki18n_install(po)
	feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
	diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
	index 9d04bee..251a302 100644
	--- a/src/core/CMakeLists.txt
	+++ b/src/core/CMakeLists.txt
	@@ -1,190 +1,190 @@
	# SPDX-FileCopyrightText: 2023 Carl Schwan <carl.schwan@gnupg.com>
	# SPDX-License-Identifier: BSD-3-Clause

	ecm_setup_version(PROJECT
	VARIABLE_PREFIX MIMETREEPARSER_CORE
	VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_core_version.h"
	- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCoreConfigVersion.cmake"
	- SOVERSION 5
	+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfigVersion.cmake"
	+ SOVERSION 6
	)

	# private library

	add_library(mimetreeparserprivate STATIC)
	set_target_properties(mimetreeparserprivate PROPERTIES POSITION_INDEPENDENT_CODE ON)
	target_sources(mimetreeparserprivate PUBLIC
	messagepart.h
	messagepart.cpp
	crypto.h
	crypto.cpp
	cryptohelper.h
	cryptohelper.cpp
	utils.h
	utils.cpp
	)
	target_link_libraries(mimetreeparserprivate
	PUBLIC
	- KPim${KF_MAJOR_VERSION}::Mime
	- KF${KF_MAJOR_VERSION}::I18n
	- Qt${KF_MAJOR_VERSION}::Gui
	- KF${KF_MAJOR_VERSION}::Codecs
	+ KPim6::Mime
	+ KF6::I18n
	+ Qt6::Gui
	+ KF6::Codecs
	Gpgme::Gpgme
	)

	ecm_qt_declare_logging_category(mimetreeparserprivate
	HEADER mimetreeparser_core_debug.h
	IDENTIFIER MIMETREEPARSER_CORE_LOG
	CATEGORY_NAME org.kde.pim.mimetreeparser.core
	DESCRIPTION "mimetreeparser (pim lib)"
	EXPORT MIMETREEPARSERNG
	)

	# public dynamic library


	-add_library(KPim${KF_MAJOR_VERSION}MimeTreeParserCore)
	-add_library(KPim${KF_MAJOR_VERSION}::MimeTreeParserCore
	- ALIAS KPim${KF_MAJOR_VERSION}MimeTreeParserCore
	+add_library(KPim6MimeTreeParserCore)
	+add_library(KPim6::MimeTreeParserCore
	+ ALIAS KPim6MimeTreeParserCore
	)

	-target_sources(KPim${KF_MAJOR_VERSION}MimeTreeParserCore PRIVATE
	+target_sources(KPim6MimeTreeParserCore PRIVATE
	errors.h
	async.h
	attachmentmodel.h
	bodypartformatter.h
	bodypartformatterbasefactory.h
	bodypartformatterbasefactory_p.h
	enums.h
	htmlutils.h
	mailcrypto.h
	messageparser.h
	objecttreeparser.h
	partmetadata.h
	partmodel.h
	attachmentmodel.cpp
	bodypartformatter.cpp
	bodypartformatter_impl.cpp
	bodypartformatterbasefactory.cpp
	htmlutils.cpp
	mailcrypto.cpp
	messageparser.cpp
	objecttreeparser.cpp
	partmodel.cpp
	)

	if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	- set_target_properties(KPim${KF_MAJOR_VERSION}MimeTreeParserCore PROPERTIES UNITY_BUILD ON)
	+ set_target_properties(KPim6MimeTreeParserCore PROPERTIES UNITY_BUILD ON)
	endif()
	-generate_export_header(KPim${KF_MAJOR_VERSION}MimeTreeParserCore BASE_NAME mimetreeparser_core)
	+generate_export_header(KPim6MimeTreeParserCore BASE_NAME mimetreeparser_core)


	-target_include_directories(KPim${KF_MAJOR_VERSION}MimeTreeParserCore
	- INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserCore>")
	+target_include_directories(KPim6MimeTreeParserCore
	+ INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserCore>")

	-target_link_libraries(KPim${KF_MAJOR_VERSION}MimeTreeParserCore
	+target_link_libraries(KPim6MimeTreeParserCore
	PUBLIC
	- KPim${KF_MAJOR_VERSION}::Mime
	- KF${KF_MAJOR_VERSION}::I18n
	- Qt${KF_MAJOR_VERSION}::Gui
	+ KPim6::Mime
	+ KF6::I18n
	+ Qt6::Gui
	PRIVATE
	mimetreeparserprivate
	)

	-set_target_properties(KPim${KF_MAJOR_VERSION}MimeTreeParserCore PROPERTIES
	+set_target_properties(KPim6MimeTreeParserCore PROPERTIES
	VERSION ${MIMETREEPARSERNG_VERSION}
	SOVERSION ${MIMETREEPARSERNG_SOVERSION}
	EXPORT_NAME MimeTreeParserCore
	)

	ecm_generate_pri_file(BASE_NAME MimeTreeParserCore
	- LIB_NAME KPim${KF_MAJOR_VERSION}MimeTreeParserCore
	+ LIB_NAME KPim6MimeTreeParserCore
	DEPS "MimeTreeParserCore"
	FILENAME_VAR PRI_FILENAME
	)

	install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})

	install(TARGETS
	- KPim${KF_MAJOR_VERSION}MimeTreeParserCore
	- EXPORT KPim${KF_MAJOR_VERSION}MimeTreeParserCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
	+ KPim6MimeTreeParserCore
	+ EXPORT KPim6MimeTreeParserCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
	)

	ecm_generate_headers(MimeTreeParserCore_CamelCase_HEADERS
	HEADER_NAMES
	AttachmentModel
	ObjectTreeParser
	MessageParser
	PartModel
	REQUIRED_HEADERS MimeTreeParserCore_HEADERS
	PREFIX MimeTreeParserCore
	)

	install(FILES
	${MimeTreeParserCore_CamelCase_HEADERS}
	- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserCore/MimeTreeParserCore
	+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserCore/MimeTreeParserCore
	COMPONENT Devel
	)
	install(FILES
	${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_core_export.h
	${MimeTreeParserCore_HEADERS}
	- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserCore/mimetreeparsercore
	+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserCore/mimetreeparsercore
	COMPONENT Devel
	)

	if (BUILD_QCH)
	ecm_add_qch(
	- KPim${KF_MAJOR_VERSION}MimeTreeParserCore_QCH
	+ KPim6MimeTreeParserCore_QCH
	NAME MimeTreeParserCore
	- BASE_NAME KPim${KF_MAJOR_VERSION}MimeTreeParserCore
	+ BASE_NAME KPim6MimeTreeParserCore
	VERSION ${PIM_VERSION}
	ORG_DOMAIN org.kde
	# using only public headers, to cover only public API
	SOURCES ${MimeTreeParser_HEADERS}
	MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
	LINK_QCHS
	Qt${QT_MAJOR_VERSION}Core_QCH
	INCLUDE_DIRS
	${CMAKE_CURRENT_BINARY_DIR}
	BLANK_MACROS
	MIMETREEPARSERCORE_EXPORT
	TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
	QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
	COMPONENT Devel
	)
	endif()

	########### CMake Config Files ###########
	-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCore")
	+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6MimeTreeParserCore")

	if (BUILD_QCH)
	ecm_install_qch_export(
	- TARGETS KPim${KF_MAJOR_VERSION}MimeTreeParserCore_QCH
	- FILE KPim${KF_MAJOR_VERSION}MimeTreeParserCoreQchTargets.cmake
	+ TARGETS KPim6MimeTreeParserCore_QCH
	+ FILE KPim6MimeTreeParserCoreQchTargets.cmake
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	COMPONENT Devel
	)
	- set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCoreQchTargets.cmake\")")
	+ set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6MimeTreeParserCoreQchTargets.cmake\")")
	endif()

	configure_package_config_file(
	"${CMAKE_CURRENT_SOURCE_DIR}/KPimMimeTreeParserCoreConfig.cmake.in"
	- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCoreConfig.cmake"
	+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfig.cmake"
	INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
	)

	install(FILES
	- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCoreConfig.cmake"
	- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserCoreConfigVersion.cmake"
	+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfig.cmake"
	+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserCoreConfigVersion.cmake"
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	COMPONENT Devel
	)

	-install(EXPORT KPim${KF_MAJOR_VERSION}MimeTreeParserCoreTargets
	+install(EXPORT KPim6MimeTreeParserCoreTargets
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	- FILE KPim${KF_MAJOR_VERSION}MimeTreeParserCoreTargets.cmake
	- NAMESPACE KPim${KF_MAJOR_VERSION}::
	+ FILE KPim6MimeTreeParserCoreTargets.cmake
	+ NAMESPACE KPim6::
	)

	if (BUILD_TESTING)
	add_subdirectory(autotests)
	endif()
	diff --git a/src/core/autotests/CMakeLists.txt b/src/core/autotests/CMakeLists.txt
	index b4bdba0..9f2291d 100644
	--- a/src/core/autotests/CMakeLists.txt
	+++ b/src/core/autotests/CMakeLists.txt
	@@ -1,69 +1,65 @@
	# SPDX-FileCopyrightText: 2017 Christian Mollekopf <mollekopf@kolabsys.com>
	# SPDX-License-Identifier: BSD-3-Clause

	set(AUTOMOC ON)
	set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
	add_definitions(-DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../testdata" )

	include(ECMAddTests)
	include(${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake)

	function(add_mimetreeparser_class_unittest _name _additionalSource)
	add_executable(${_name} ${_name}.cpp setupenv.cpp ${_additionalSource})
	target_link_libraries(${_name} PRIVATE
	Qt::Test
	mimetreeparserprivate
	- KPim${KF_MAJOR_VERSION}::MimeTreeParserCore
	+ KPim6::MimeTreeParserCore
	)
	target_include_directories(${_name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
	add_test(NAME ${_name} COMMAND $<TARGET_FILE:${_name}>)
	endfunction()

	function(add_mimetreeparser_crypto_unittest _name)
	add_executable(${_name} ${_name}.cpp setupenv.cpp)
	- if (QT_MAJOR_VERSION STREQUAL "6")
	- target_link_libraries(${_name} PRIVATE QGpgmeQt6 Qt6::Core5Compat)
	- else()
	- target_link_libraries(${_name} PRIVATE Gpgme::Gpgme)
	- endif()
	+ target_link_libraries(${_name} PRIVATE QGpgmeQt6 Qt6::Core5Compat)
	target_include_directories(${_name} PRIVATE
	${CMAKE_CURRENT_SOURCE_DIR}/..
	${GPGME_INCLUDE_DIRS}
	)
	target_link_libraries(${_name} PRIVATE
	Qt::Test
	mimetreeparserprivate
	- KPim${KF_MAJOR_VERSION}::MimeTreeParserCore
	+ KPim6::MimeTreeParserCore
	)
	add_gpg_crypto_test(${_name} mimetreeparser-${_name})
	endfunction()

	add_subdirectory(gnupg_home)
	add_mimetreeparser_crypto_unittest(attachmenttest)
	add_mimetreeparser_class_unittest(cryptohelpertest "../cryptohelper.cpp")

	add_definitions( -DMAIL_DATA_DIR="${CMAKE_CURRENT_SOURCE_DIR}/../testdata" )
	include(${CMAKE_SOURCE_DIR}/cmake/modules/add_gpg_crypto_test.cmake)
	include_directories(
	${CMAKE_CURRENT_BINARY_DIR}
	${CMAKE_CURRENT_SOURCE_DIR}/..
	)
	include_directories(${GPGME_INCLUDE_DIRS})

	include(ECMAddTests)

	add_executable(mimetreeparsertest mimetreeparsertest.cpp)
	add_gpg_crypto_test(mimetreeparsertest mimetreeparsertest)
	target_link_libraries(mimetreeparsertest PUBLIC
	Qt::Test
	mimetreeparserprivate
	- KPim${KF_MAJOR_VERSION}::MimeTreeParserCore
	+ KPim6::MimeTreeParserCore
	)

	add_executable(gpgerrortest gpgerrortest.cpp)
	target_link_libraries(gpgerrortest PUBLIC
	Qt::Test
	mimetreeparserprivate
	- KPim${KF_MAJOR_VERSION}::MimeTreeParserCore
	+ KPim6::MimeTreeParserCore
	)
	add_test(NAME gpgerrortest COMMAND $<TARGET_FILE:gpgerrortest>)
	diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
	index d2ff548..804ea61 100644
	--- a/src/widgets/CMakeLists.txt
	+++ b/src/widgets/CMakeLists.txt
	@@ -1,146 +1,146 @@
	# SPDX-FileCopyrightText: 2023 Carl Schwan <carl.schwan@gnupg.com>
	# SPDX-License-Identifier: BSD-3-Clause

	ecm_setup_version(PROJECT
	VARIABLE_PREFIX MIMETREEPARSER_WIDGETS
	VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_widgets_version.h"
	- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsConfigVersion.cmake"
	- SOVERSION 5
	+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfigVersion.cmake"
	+ SOVERSION 6
	)

	-add_library(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets)
	-add_library(KPim${KF_MAJOR_VERSION}::MimeTreeParserWidgets
	- ALIAS KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets)
	+add_library(KPim6MimeTreeParserWidgets)
	+add_library(KPim6::MimeTreeParserWidgets
	+ ALIAS KPim6MimeTreeParserWidgets)

	-target_sources(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets PRIVATE
	+target_sources(KPim6MimeTreeParserWidgets PRIVATE
	messageviewer.h
	messageviewer.cpp
	attachmentview_p.h
	attachmentview.cpp
	)

	-ecm_qt_declare_logging_category(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets
	+ecm_qt_declare_logging_category(KPim6MimeTreeParserWidgets
	HEADER mimetreeparser_widgets_debug.h
	IDENTIFIER MIMETREEPARSER_WIDGET_LOG
	CATEGORY_NAME org.kde.pim.mimetreeparser.widgets
	DESCRIPTION "mimetreeparser (pim lib)"
	EXPORT MIMETREEPARSER
	)

	if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	- set_target_properties(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets PROPERTIES UNITY_BUILD ON)
	+ set_target_properties(KPim6MimeTreeParserWidgets PROPERTIES UNITY_BUILD ON)
	endif()
	-generate_export_header(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets BASE_NAME mimetreeparser_widgets)
	+generate_export_header(KPim6MimeTreeParserWidgets BASE_NAME mimetreeparser_widgets)


	-target_include_directories(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserWidgets>")
	-target_include_directories(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets PUBLIC "$<BUILD_INTERFACE:${MimeTreeParserWidgets_SOURCE_DIR}/src;${MimeTreeParserWidgets_BINARY_DIR}/src>")
	+target_include_directories(KPim6MimeTreeParserWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserWidgets>")
	+target_include_directories(KPim6MimeTreeParserWidgets PUBLIC "$<BUILD_INTERFACE:${MimeTreeParserWidgets_SOURCE_DIR}/src;${MimeTreeParserWidgets_BINARY_DIR}/src>")

	-target_link_libraries(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets
	+target_link_libraries(KPim6MimeTreeParserWidgets
	PUBLIC
	- Qt${KF_MAJOR_VERSION}::Widgets
	- KPim${KF_MAJOR_VERSION}::MimeTreeParserCore
	+ Qt6::Widgets
	+ KPim6::MimeTreeParserCore
	PRIVATE
	- KF${KF_MAJOR_VERSION}::Codecs
	- KF${KF_MAJOR_VERSION}::I18n
	- KF${KF_MAJOR_VERSION}::CalendarCore
	+ KF6::Codecs
	+ KF6::I18n
	+ KF6::CalendarCore
	Gpgme::Gpgme
	)

	-set_target_properties(KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets PROPERTIES
	+set_target_properties(KPim6MimeTreeParserWidgets PROPERTIES
	VERSION ${MIMETREEPARSER_VERSION}
	SOVERSION ${MIMETREEPARSER_SOVERSION}
	EXPORT_NAME MimeTreeParserWidgets
	)

	ecm_generate_pri_file(BASE_NAME MimeTreeParserWidgets
	- LIB_NAME KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets
	+ LIB_NAME KPim6MimeTreeParserWidgets
	DEPS "MimeTreeParserWidgets"
	FILENAME_VAR PRI_FILENAME
	)

	install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})

	install(TARGETS
	- KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets
	- EXPORT KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
	+ KPim6MimeTreeParserWidgets
	+ EXPORT KPim6MimeTreeParserWidgetsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}
	)

	ecm_generate_headers(MimeTreeParserWidgets_CamelCase_HEADERS
	HEADER_NAMES
	MessageViewer
	REQUIRED_HEADERS MimeTreeParserWidgets_HEADERS
	PREFIX MimeTreeParserWidgets
	)

	install(FILES
	${MimeTreeParserWidgets_CamelCase_HEADERS}
	- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserWidgets/MimeTreeParserWidgets
	+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets/MimeTreeParserWidgets
	COMPONENT Devel
	)
	install(FILES
	${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_widgets_export.h
	${MimeTreeParserWidgets_HEADERS}
	- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserWidgets/mimetreeparserwidgets
	+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets/mimetreeparserwidgets
	COMPONENT Devel
	)

	if (BUILD_QCH)
	ecm_add_qch(
	- KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets_QCH
	+ KPim6MimeTreeParserWidgets_QCH
	NAME MimeTreeParserWidgets
	- BASE_NAME KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets
	+ BASE_NAME KPim6MimeTreeParserWidgets
	VERSION ${PIM_VERSION}
	ORG_DOMAIN org.kde
	# using only public headers, to cover only public API
	SOURCES ${MimeTreeParserWidget_HEADERS}
	MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md"
	LINK_QCHS
	Qt${QT_MAJOR_VERSION}Core_QCH
	INCLUDE_DIRS
	${CMAKE_CURRENT_BINARY_DIR}
	BLANK_MACROS
	MIMETREEPARSER_WIDGETS_EXPORT
	TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
	QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR}
	COMPONENT Devel
	)
	endif()

	########### CMake Config Files ###########
	-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets")
	+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6MimeTreeParserWidgets")

	if (BUILD_QCH)
	ecm_install_qch_export(
	- TARGETS KPim${KF_MAJOR_VERSION}MimeTreeParserWidgets_QCH
	- FILE KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsQchTargets.cmake
	+ TARGETS KPim6MimeTreeParserWidgets_QCH
	+ FILE KPim6MimeTreeParserWidgetsQchTargets.cmake
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	COMPONENT Devel
	)
	- set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserQchTargets.cmake\")")
	+ set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6MimeTreeParserQchTargets.cmake\")")
	endif()

	configure_package_config_file(
	"${CMAKE_CURRENT_SOURCE_DIR}/KPimMimeTreeParserWidgetsConfig.cmake.in"
	- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsConfig.cmake"
	+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfig.cmake"
	INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
	)

	install(FILES
	- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsConfig.cmake"
	- "${CMAKE_CURRENT_BINARY_DIR}/KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsConfigVersion.cmake"
	+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfig.cmake"
	+ "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeTreeParserWidgetsConfigVersion.cmake"
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	COMPONENT Devel
	)

	-install(EXPORT KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsTargets
	+install(EXPORT KPim6MimeTreeParserWidgetsTargets
	DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
	- FILE KPim${KF_MAJOR_VERSION}MimeTreeParserWidgetsTargets.cmake
	- NAMESPACE KPim${KF_MAJOR_VERSION}::
	+ FILE KPim6MimeTreeParserWidgetsTargets.cmake
	+ NAMESPACE KPim6::
	)

	install(FILES
	${CMAKE_CURRENT_BINARY_DIR}/mimetreeparser_widgets_version.h
	- DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim${KF_MAJOR_VERSION}/MimeTreeParserWidgets
	+ DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/MimeTreeParserWidgets
	COMPONENT Devel
	)

File Metadata

Mime Type: text/x-diff
Expires: Sat, May 10, 8:50 AM (1 d, 19 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: e0/80/85a8f81b96454d54541085dfc73a

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions