Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/, kde-apps/kdepim-runtime/
Date: Wed, 14 Aug 2019 08:47:32
Message-Id: 1565772429.f23e06f706f5af1a23a0616588bda96e005f6dc0.asturm@gentoo
1 commit: f23e06f706f5af1a23a0616588bda96e005f6dc0
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 14 08:45:38 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 14 08:47:09 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23e06f7
7
8 kde-apps/kdepim-runtime: Add another upstream race condition fix
9
10 It still may not be enough, but let's add it anyway.
11
12 Bug: https://bugs.gentoo.org/691938
13 Package-Manager: Portage-2.3.71, Repoman-2.3.17
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 ...me-19.04.3-ui_lockfilepage-race-condition.patch | 27 ++++++++++++++++++++++
17 .../kdepim-runtime/kdepim-runtime-19.04.3.ebuild | 2 ++
18 2 files changed, 29 insertions(+)
19
20 diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
21 new file mode 100644
22 index 00000000000..850c65862be
23 --- /dev/null
24 +++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
25 @@ -0,0 +1,27 @@
26 +From 4585292dd34f894505f8fc19e2bf51263768d688 Mon Sep 17 00:00:00 2001
27 +From: Christophe Giboudeaux <christophe@××××.fr>
28 +Date: Fri, 9 Aug 2019 12:54:01 +0200
29 +Subject: Fix another race condition found while packaging the 19.08.0 release
30 +
31 +BUG: 410474
32 +FIXED-IN: 19.08.0
33 +
34 +CCMAIL: cfeck@×××.org
35 +---
36 + resources/mbox/CMakeLists.txt | 1 +
37 + 1 file changed, 1 insertion(+)
38 +
39 +diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
40 +index c6fa693..c52230f 100644
41 +--- a/resources/mbox/CMakeLists.txt
42 ++++ b/resources/mbox/CMakeLists.txt
43 +@@ -17,6 +17,7 @@ set( mboxresource_SRCS
44 + # Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
45 + # Make sure the ui file is generated before building the akonadi_mbox_resource target.
46 + set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
47 ++set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
48 +
49 + ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
50 +
51 +--
52 +cgit v1.1
53
54 diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
55 index 5b9598cec0a..a187fe09102 100644
56 --- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
57 +++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
58 @@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
59 !kde-misc/akonadi-ews
60 "
61
62 +PATCHES=( "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch" )
63 +
64 RESTRICT+=" test"
65
66 src_prepare() {