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
commit:     f23e06f706f5af1a23a0616588bda96e005f6dc0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 08:45:38 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 08:47:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f23e06f7

kde-apps/kdepim-runtime: Add another upstream race condition fix

It still may not be enough, but let's add it anyway.

Bug: https://bugs.gentoo.org/691938
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...me-19.04.3-ui_lockfilepage-race-condition.patch | 27 ++++++++++++++++++++++
 .../kdepim-runtime/kdepim-runtime-19.04.3.ebuild   |  2 ++
 2 files changed, 29 insertions(+)

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
new file mode 100644
index 00000000000..850c65862be
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-19.04.3-ui_lockfilepage-race-condition.patch
@@ -0,0 +1,27 @@
+From 4585292dd34f894505f8fc19e2bf51263768d688 Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@××××.fr>
+Date: Fri, 9 Aug 2019 12:54:01 +0200
+Subject: Fix another race condition found while packaging the 19.08.0 release
+
+BUG: 410474
+FIXED-IN: 19.08.0
+
+CCMAIL: cfeck@×××.org
+---
+ resources/mbox/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/resources/mbox/CMakeLists.txt b/resources/mbox/CMakeLists.txt
+index c6fa693..c52230f 100644
+--- a/resources/mbox/CMakeLists.txt
++++ b/resources/mbox/CMakeLists.txt
+@@ -17,6 +17,7 @@ set( mboxresource_SRCS
+ # Fix a race condition. mboxresource.cpp needs compactpage.h which includes ui_compactpage.h.
+ # Make sure the ui file is generated before building the akonadi_mbox_resource target.
+ set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_compactpage.h)
++set_source_files_properties(mboxresource.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ui_lockfilepage.h)
+ 
+ ecm_qt_declare_logging_category(mboxresource_SRCS HEADER mboxresource_debug.h IDENTIFIER MBOXRESOURCE_LOG CATEGORY_NAME org.kde.pim.mboxresource)
+ 
+-- 
+cgit v1.1

diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
index 5b9598cec0a..a187fe09102 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-19.04.3.ebuild
@@ -74,6 +74,8 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-misc/akonadi-ews
 "
 
+PATCHES=( "${FILESDIR}/${P}-ui_lockfilepage-race-condition.patch" )
+
 RESTRICT+=" test"
 
 src_prepare() {