Compare commits
13 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| c114f565a0 | |||
|
|
438b85b8d8 | ||
|
|
8a93804513 | ||
| 69e97154e5 | |||
|
|
bb83080364 | ||
| 4348498482 | |||
|
|
49e816877f | ||
| e54c42bc19 | |||
|
|
d26031663e | ||
| 3c351dc2d3 | |||
|
|
09356b031e | ||
|
|
03af93b83c | ||
|
|
65775d254d |
60
0001-Revert-Explicitly-use-Boost-s-cmake-config-file.patch
Normal file
60
0001-Revert-Explicitly-use-Boost-s-cmake-config-file.patch
Normal file
@@ -0,0 +1,60 @@
|
||||
From 76cb936a1d1216aa4011ab73ac8d8957e9455068 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Wed, 30 Jul 2025 16:59:42 +0200
|
||||
Subject: [PATCH] Revert "Explicitly use Boost's cmake config file for finding
|
||||
it"
|
||||
|
||||
Leap 15.6 doesn't have boost >= 1.70
|
||||
|
||||
This reverts commit 27f8413d7414bab184999bab9083aa1926c013e9.
|
||||
---
|
||||
CMakeLists.txt | 8 ++------
|
||||
src/CMakeLists.txt | 6 +++++-
|
||||
2 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index a3fa95e0..c884e738 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -73,12 +73,8 @@ set_package_properties(LibGpgError PROPERTIES
|
||||
TYPE REQUIRED
|
||||
)
|
||||
|
||||
-find_package(Boost 1.70.0 CONFIG)
|
||||
-set_package_properties(Boost PROPERTIES
|
||||
- TYPE REQUIRED
|
||||
- DESCRIPTION "Boost C++ Libraries"
|
||||
- URL "https://www.boost.org")
|
||||
-
|
||||
+find_package(Boost 1.34.0)
|
||||
+set_package_properties(Boost PROPERTIES DESCRIPTION "Boost C++ Libraries" URL "https://www.boost.org" TYPE REQUIRED PURPOSE "Boost is required for building most KDEPIM applications")
|
||||
ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKLEO
|
||||
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkleo_version.h"
|
||||
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KPim6LibkleoConfigVersion.cmake"
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index c4c471b5..72ab4411 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
+++ b/src/CMakeLists.txt
|
||||
@@ -2,6 +2,7 @@
|
||||
# SPDX-FileCopyrightText: none
|
||||
# target_include_directories does not handle empty include paths
|
||||
include_directories(
|
||||
+ ${Boost_INCLUDE_DIRS}
|
||||
${GPGME_INCLUDES}
|
||||
)
|
||||
add_definitions(-DTRANSLATION_DOMAIN=\"libkleopatra6\")
|
||||
@@ -222,7 +223,10 @@ target_link_libraries(KPim6Libkleo PUBLIC Gpgmepp PRIVATE Qt::Widgets
|
||||
LibGpgError::LibGpgError)
|
||||
|
||||
target_link_libraries(KPim6Libkleo PUBLIC QGpgmeQt6)
|
||||
-target_link_libraries(KPim6Libkleo PRIVATE Boost::headers)
|
||||
+# Boost::headers may not be available for old versions of Boost
|
||||
+if(TARGET Boost::headers)
|
||||
+ target_link_libraries(KPim6Libkleo PRIVATE Boost::headers)
|
||||
+endif()
|
||||
|
||||
if(COMPILE_WITH_UNITY_CMAKE_SUPPORT)
|
||||
set_target_properties(KPim6Libkleo PROPERTIES UNITY_BUILD ON)
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7c9b334b226c990d5193b2e66a3ce8de1c5ea6c2afc9175280e6f44d02a7caa8
|
||||
size 655108
|
||||
@@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmhjchUACgkQu0YzUNbv
|
||||
Me8p1RAAln7H3x1hbWfs8SZq5dglxB3k9F5fa3VeOJiyHtQh7OiMzbWBFaskOo8+
|
||||
A+zYXrPZc9xHPHVZvm82bu3QmgnfJMQd0cnGGuoAamJhGm/ZO0iTyY6Rb0ElbT/m
|
||||
laO0xv5JmeE+KsKuXndCi87Xb1kU2Ly+OS1jEFtV6jtGtfCh3WJYRk/yYGkOCDF3
|
||||
ySOYJeYIsyuXY5XnrNBafUbXEbPSyESVsqmUluXcI3q/ViNaoO1PnYmnXUgank1p
|
||||
vkVWjX+T9/QVuv9OllSqlfYJLUbmwsKhhv2traS5LOoGaayblWZEwnwgpWrJ4ChS
|
||||
wBINDlAeHO5JVM4hPyh8uEhtQbgPgDWJuqOfeTSiL+qFdEl2iQ8K6CMEtGWEwoTs
|
||||
btAwkKCuaux4duhOTNMOGtxk/5p31xdhorL/UL6NFCvBNos8NiWuc4KReJvhCGdP
|
||||
gavsRvi4/cbI2NpL8wvoCKPL9RoVvU3sfW19Gd91xYdo7RGWxyGjp5cL+c6gjwSQ
|
||||
aCjpCEK3WOgxfJMF5kjgNaOe2sSZRFOexQPwrWDRBOOPQ3C8pKUs1+RoF0yijPaW
|
||||
0kYuOo8POHG4W98IfDXQZxPSEwMYJfY2V9AMUNjPeaV5C7Mxh1xt57d2ldRms/Yl
|
||||
opogx6Eyi/EaaJZGU+hjFZSm9BXMYaala5byHGLByNiGbIWVYZA=
|
||||
=t3ci
|
||||
-----END PGP SIGNATURE-----
|
||||
3
libkleo-25.12.0.tar.xz
Normal file
3
libkleo-25.12.0.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ffba9bd563ed23baddc62474760afa262a201064ce1f514c1f269103f135aad9
|
||||
size 678384
|
||||
16
libkleo-25.12.0.tar.xz.sig
Normal file
16
libkleo-25.12.0.tar.xz.sig
Normal file
@@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmkyJz4ACgkQu0YzUNbv
|
||||
Me8IVw//eX9pyXMqGzM39puspvJCxxqoMe+sxSLXjSXic2MZphWQI9BV5tx4Usye
|
||||
kM7VJhnGe7RtVIo33JYkdtLS2IBGpd856cKTfqkQJ/nM77kWB0x5PPX6KcJt7jrq
|
||||
SoQIQYisve4jjzhNKNRlTvOsmBJfTaK4Hu/r4W5DJ/w8ybSMy1a3PqH7sebFwS3k
|
||||
FFua6nUyTWLRjN7oU6x2YXn7QqmgUZEnd+d6QbAil6X2NZoaRcvRdMF1CsaxmzXR
|
||||
kGGsRgMPwWCuQJPq/zKI3fDdDcHnskoQuqz9QuZde8IHVtnqngqsNzAle1kgw9IN
|
||||
XcEy1aZtC95FfaK7Z+Osx254bSizNkss0I6oKz8nK8T/W5dbW6Ia4GyMJP0u4IL2
|
||||
ylP2oDfeNXX3w8C34LjKKl96CNETghMt7qUULKWm7g8slclJ/+T2UwS8uGBMnH7Z
|
||||
6UQIfio3nY7ARIrGba1eSHLDNEewE2lMZYGFgZ39Onwdh2sMRMARr7DpXRksdjhj
|
||||
EeYRnnUmgZG9cQCDicalsnfsBK1torBdoUS/hRVQJjlRThtPtaxpAM7tfG3E/pPv
|
||||
HcTOi6ROZ/nISQs61lfqZYabhCwByJFu/rEq98Urhu7RMmXKF2bZr2JxdQmUIJD7
|
||||
ayJmLsNFtllOfAGk0qKn+QyQhF+fmM0W8bSQX7hIcmyoQxFFXbs=
|
||||
=n9dt
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +1,70 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 6 11:41:08 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.12.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/gear/25.12.0/
|
||||
- No code change since 25.11.80
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Nov 15 19:57:12 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.11.80
|
||||
* New feature release
|
||||
- Too many changes to list here.
|
||||
- Add patch:
|
||||
* 0001-Decrease-minimum-boost-version.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 6 18:38:09 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.08.3
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/gear/25.08.3/
|
||||
- No code change since 25.08.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 7 18:49:34 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.08.2
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/gear/25.08.2/
|
||||
- No code change since 25.08.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Sep 10 09:24:17 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.08.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/gear/25.08.1/
|
||||
- No code change since 25.08.0
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 8 07:48:04 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.08.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/gear/25.08.0/
|
||||
- No code change since 25.07.80
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 30 15:01:46 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Add patch to fix build failure on 15.6:
|
||||
* 0001-Revert-Explicitly-use-Boost-s-cmake-config-file.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 14 14:25:50 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 25.07.80
|
||||
* New feature release
|
||||
- Too many changes to list here.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 1 15:27:29 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
10
libkleo.spec
10
libkleo.spec
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package libkleo
|
||||
#
|
||||
# Copyright (c) 2025 SUSE LLC
|
||||
# Copyright (c) 2025 SUSE LLC and contributors
|
||||
# Copyright (c) 2025 Andreas Stieger <Andreas.Stieger@gmx.de>
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
@@ -17,12 +17,12 @@
|
||||
#
|
||||
|
||||
|
||||
%define kf6_version 6.6.0
|
||||
%define qt6_version 6.6.0
|
||||
%define kf6_version 6.19.0
|
||||
%define qt6_version 6.9.0
|
||||
|
||||
%bcond_without released
|
||||
Name: libkleo
|
||||
Version: 25.04.3
|
||||
Version: 25.12.0
|
||||
Release: 0
|
||||
Summary: Base package of Kleopatra, a key manager by KDE
|
||||
License: GPL-2.0-only AND GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
@@ -32,6 +32,8 @@ Source0: https://download.kde.org/stable/release-service/%{version}/src/%
|
||||
Source1: https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
|
||||
Source2: applications.keyring
|
||||
%endif
|
||||
# PATCH-FIX-OPENSUSE -- Leap 15.6 doesn't have Boost >= 1.70
|
||||
Patch0: 0001-Revert-Explicitly-use-Boost-s-cmake-config-file.patch
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: kf6-extra-cmake-modules >= %{kf6_version}
|
||||
BuildRequires: libboost_headers-devel
|
||||
|
||||
Reference in New Issue
Block a user