20.11.90
OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/akonadi-server?expand=0&rev=259
This commit is contained in:
Wolfgang Bauer
Git OBS Bridge
parent
5776f23b32
commit
f22304e1dd
@ -1,29 +0,0 @@
|
||||
From 35c64fc2244821297d512fb5ff15cd342d5150f7 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Mon, 23 Nov 2020 08:29:34 +0100
|
||||
Subject: [PATCH 1/3] Revert "Fix building akonadiprivate_obj with out of
|
||||
system lzma libs on macOS"
|
||||
|
||||
Using target_link_libraries with 'OBJECT' libraries breaks the build with older
|
||||
CMake versions.
|
||||
|
||||
This reverts commit 2faa9de706d250be62689a4efebe8a143d6da47c.
|
||||
---
|
||||
src/private/CMakeLists.txt | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt
|
||||
index 14eba9da5..1e40a1d61 100644
|
||||
--- a/src/private/CMakeLists.txt
|
||||
+++ b/src/private/CMakeLists.txt
|
||||
@@ -62,7 +62,6 @@ if (WIN32)
|
||||
set(akonadiprivate_buildsources ${akonadiprivate_SRCS})
|
||||
else()
|
||||
add_library(akonadiprivate_obj OBJECT ${akonadiprivate_SRCS})
|
||||
- target_link_libraries(akonadiprivate_obj ${akonadiprivate_LIBS})
|
||||
update_include_directories(akonadiprivate_obj)
|
||||
set_target_properties(akonadiprivate_obj PROPERTIES POSITION_INDEPENDENT_CODE 1)
|
||||
add_dependencies(akonadiprivate_obj generate_protocol)
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 0586ae9d4f4fc5ef27b11e6c397f049bbd405e19 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Giboudeaux <christophe@krop.fr>
|
||||
Date: Mon, 23 Nov 2020 08:40:10 +0100
|
||||
Subject: [PATCH 2/3] CMake: Don't use the LZMA imported targets
|
||||
|
||||
LibLZMA::LibLZMA was introduced in CMake 3.14.
|
||||
We need to use the old style link targets. This should also
|
||||
fix a build issue on macOS when LZMA is not installed into
|
||||
standard locations.
|
||||
|
||||
amends commit 2bf3a5c9
|
||||
---
|
||||
src/private/CMakeLists.txt | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt
|
||||
index 1e40a1d61..23f172e47 100644
|
||||
--- a/src/private/CMakeLists.txt
|
||||
+++ b/src/private/CMakeLists.txt
|
||||
@@ -1,5 +1,7 @@
|
||||
add_subdirectory(protocolgen)
|
||||
|
||||
+include_directories(${LIBLZMA_INCLUDE_DIRS})
|
||||
+
|
||||
if(NOT XMLLINT_EXECUTABLE)
|
||||
message(STATUS "xmllint not found, skipping protocol.xml validation")
|
||||
else()
|
||||
@@ -34,7 +36,7 @@ PUBLIC
|
||||
Qt5::Core
|
||||
Qt5::DBus
|
||||
PRIVATE
|
||||
- LibLZMA::LibLZMA
|
||||
+ ${LIBLZMA_LIBRARIES}
|
||||
)
|
||||
if (WIN32)
|
||||
set(akonadiprivate_LIBS
|
||||
--
|
||||
2.29.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:05b7fa5cc8f919c0f7b7d2db4747b27e4365348851109d84d51c58ba9df3a45b
|
||||
size 1592728
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl+uoloACgkQOmpNuDnq
|
||||
ptdxrg//cVzA6ZFxovd6hoCy8OjdIpTPmzKBjFCWfCDZXDop2XcNKlozJpDolDNy
|
||||
4CmqWACSzAu3K3G1PNm9270jf1QRI0VNf5jHUAgPxeK6px5WWyDTw/8k45K9MkZZ
|
||||
X6J0z6LoukPU9QHvufw2MS09Fb7L8LHW1z9uTvA9neZvElQUq5FX9FwJyxHfpzbI
|
||||
3e0XYpAuNCt8x6DM3BVH7HXrYx1h/q/dfIWP8M6xxjxchnR1IuOQZLBrckgbzqy9
|
||||
Y6kTuzK8u3j/QSf+U9EVIVKCOyC58VnRow9OMo4eRQn0IAjRinA2HfrzYdQnREcT
|
||||
Rwb6bxa072Vb1tJEOGz+WTAndZFpQOi5VH6AwFBO2EO4RFarwFerFNGl2S3+BP1u
|
||||
yVqZPhg7+nSs0hiQswdf59/DNT50xbjlE3r5i0g8xoCOwKRIRjGVW3N3Qlu+T//9
|
||||
PjBWemCOp2p7ZNVWicL/LIQEiIHzkgDPciGbVtHx8aKle9qya5jjkU+GpIT1LMut
|
||||
xkug3OX9EBDDk17irzdPpFktFhmiI38kovVko6s+MmMVSt4bgQTwzrJuyOzTZWGZ
|
||||
XJp0TbIgIyMZ5nN0n4RUdQftuq1GErHU6La3NZtmV/rdiFYZralwzI0ghWZE2etW
|
||||
wnpn+Z0BjKwAtw3p4JFY3qJjMVQQqYwKZrqtIj3mMu8v35jNfxo=
|
||||
=Y+Px
|
||||
-----END PGP SIGNATURE-----
|
||||
3
akonadi-20.11.90.tar.xz
Normal file
3
akonadi-20.11.90.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:10a4ef1b51ee1095b3fb91d9781018a552533070f7a10c4ab7de56550dc17632
|
||||
size 1593040
|
||||
11
akonadi-20.11.90.tar.xz.sig
Normal file
11
akonadi-20.11.90.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl/ATqcACgkQ29LOiT4t
|
||||
HIf0AAf/RPSVzcgv5NfhaBO82n66eXc8ZQXoyCjNI0NFFcJK4NW6LLc7p8UZ23X1
|
||||
YaR/VkCjJmEcEKqsZxA7mL0f+3UVGiMtZ2ERNE0Te38bfWthn6rCP+8jPmxm6XU2
|
||||
tO754E9ii2irWep++3BvlvFtZ24QAA9tqxir63eJ2XeweDn/duUbWUCftIr+4XaS
|
||||
9HlA7gLxfYeMVxF5u0EPy5mUWCAFIj3+C74EJ3Kn4vFyn8oLHXjySnlrOT4aSQRq
|
||||
HlMmp9vlmL9LUuzf62GH4IB8WF8NtGCeflvIyQ/yAdwh4UfKGeDwBwxy0GnegM2f
|
||||
6PfJTJ3M63Gd2ipwltedKLURp2aAwA==
|
||||
=U7iG
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 27 15:15:25 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
- Update to 20.11.90
|
||||
* New feature release
|
||||
- Changes since 20.11.80:
|
||||
* Check if external library is needed to have atomic support.
|
||||
* CMake: Don't use the LZMA imported targets
|
||||
* Install compressionstream private header
|
||||
* Introduce Config class, disable payload comp. by default
|
||||
- Drop obsolete patches:
|
||||
* 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch
|
||||
* 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 23 12:54:23 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')}
|
||||
%bcond_without lang
|
||||
Name: akonadi-server
|
||||
Version: 20.11.80
|
||||
Version: 20.11.90
|
||||
Release: 0
|
||||
Summary: PIM Storage Service
|
||||
License: LGPL-2.1-or-later
|
||||
@ -30,9 +30,6 @@ Group: System/GUI/KDE
|
||||
URL: https://akonadi-project.org
|
||||
Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz
|
||||
Source99: akonadi-server-rpmlintrc
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-Revert-Fix-building-akonadiprivate_obj-with-out-of-s.patch
|
||||
Patch1: 0002-CMake-Don-t-use-the-LZMA-imported-targets.patch
|
||||
BuildRequires: extra-cmake-modules >= %{kf5_version}
|
||||
BuildRequires: kf5-filesystem
|
||||
BuildRequires: libQt5Sql-private-headers-devel
|
||||
|
||||
Loading…
Reference in New Issue
Block a user