This commit is contained in:
Rmys
2026-06-14 21:34:53 +03:00
parent 9e449adef0
commit bc8ae83a28
7 changed files with 844 additions and 163 deletions
+2
View File
@@ -5,9 +5,11 @@
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import kde6
def setup():
shelltools.system("sed -e 's|KF_DEP_VERSION VERSION_LESS 6.27|TRUE|' -i CMakeLists.txt")
kde6.configure()
def build():
@@ -0,0 +1,88 @@
From 0be1666328b01754f2ee37b1387b498210490a82 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Wed, 20 May 2026 17:14:46 +0200
Subject: [PATCH] Remove pre-KF backward compatibility target
All consumers have switched to the KF targets meanwhile and we don't want
to have this in a KF release.
---
CMakeLists.txt | 4 ----
compat/CMakeLists.txt | 38 ---------------------------------
compat/KPim6MimeConfig.cmake.in | 5 -----
3 files changed, 47 deletions(-)
delete mode 100644 compat/CMakeLists.txt
delete mode 100644 compat/KPim6MimeConfig.cmake.in
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b81461..8e82783 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,10 +48,6 @@ add_definitions(-DQT_NO_CONTEXTLESS_CONNECT)
ecm_set_disabled_deprecation_versions(QT 6.11.0 KF 6.26.0)
add_subdirectory(src)
-# TODO remove once the Gear master repos are ported and before the first KF release!
-if (KF_DEP_VERSION VERSION_LESS 6.27)
- add_subdirectory(compat)
-endif()
if(BUILD_TESTING)
add_subdirectory(autotests)
add_subdirectory(tests)
diff --git a/compat/CMakeLists.txt b/compat/CMakeLists.txt
deleted file mode 100644
index 2bf85f8..0000000
--- a/compat/CMakeLists.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# TODO temporary until Gear consumers in master are ported to link to KF6::Mime instead
-add_library(KPim6Mime)
-add_library(KPim6::Mime ALIAS KPim6Mime)
-
-set_target_properties(KPim6Mime PROPERTIES
- VERSION ${KMIME_VERSION}
- SOVERSION ${KMIME_SOVERSION}
- EXPORT_NAME Mime
-)
-target_link_libraries(KPim6Mime PUBLIC KF6Mime)
-
-install(TARGETS KPim6Mime EXPORT KPim6MimeTargets ${KF_INSTALL_TARGETS_DEFAULT_ARGS})
-
-set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6Mime")
-
-ecm_setup_version(PROJECT VARIABLE_PREFIX KMIME
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeConfigVersion.cmake"
- SOVERSION 6
-)
-
-configure_package_config_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/KPim6MimeConfig.cmake.in"
- "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeConfig.cmake"
- INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
-)
-
-install(FILES
- "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeConfig.cmake"
- "${CMAKE_CURRENT_BINARY_DIR}/KPim6MimeConfigVersion.cmake"
- DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
- COMPONENT Devel
-)
-
-install(EXPORT KPim6MimeTargets
- DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
- FILE KPim6MimeTargets.cmake
- NAMESPACE KPim6::
-)
diff --git a/compat/KPim6MimeConfig.cmake.in b/compat/KPim6MimeConfig.cmake.in
deleted file mode 100644
index 7641296..0000000
--- a/compat/KPim6MimeConfig.cmake.in
+++ /dev/null
@@ -1,5 +0,0 @@
-@PACKAGE_INIT@
-
-include(CMakeFindDependencyMacro)
-find_dependency(KF6Mime)
-include("${CMAKE_CURRENT_LIST_DIR}/KPim6MimeTargets.cmake")
--
GitLab
+2 -2
View File
@@ -23,7 +23,7 @@
<Dependency versionFrom="6.27.0">extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<!--Patch>qt5.patch</Patch-->
<Patch level="1">0be16663.patch</Patch>
</Patches>
</Source>
<Package>
@@ -64,7 +64,7 @@
</Package>
<History>
<Update release="76">
<Update release="77">
<Date>2026-06-14</Date>
<Version>6.27.0</Version>
<Comment>Version bump.</Comment>
+750 -159
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
04cfb4a90efe385579e1383d69ffa3f0f2dcd834
cd16bd1d6174660f1c73584542e61035f77b82c2
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -1 +1 @@
75cd3e6f6f9bb42efaa0d0b78787abcd11d04560
696410ef26b57aff15260b2157b366fb484f812a