From 3c986b5747cb149ff879ead706ff62dbaf0b5e27 Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Tue, 8 Mar 2022 12:57:43 +0100
Subject: [PATCH 1/2] Don't install the same headers to multiple locations

This seems to break the build on some systems due to one definition rule
violations if the same header gets included from different locations. The
use of pragma once rather than conventional include guards doesn't catch
this.
---
 core/CMakeLists.txt | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 1fe7f92..bcf0617 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -45,6 +45,7 @@ ecm_generate_headers(KF5AkonadiSearchCore_CamelCasecore_HEADERS
     Term
     Query
     ResultIterator
+    SearchStore
     REQUIRED_HEADERS KF5AkonadiSearchCore_core_HEADERS
     PREFIX Core
     )
@@ -53,21 +54,16 @@ install(TARGETS KF5AkonadiSearchCore EXPORT KF5AkonadiSearchTargets ${KF5_INSTAL
 
 install(FILES
     ${KF5AkonadiSearchCore_CamelCasecore_HEADERS}
-    ${KF5AkonadiSearchCore_core_HEADERS}
-    searchstore.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiSearch/Core
     COMPONENT Devel
 )
 install(FILES
     ${KF5AkonadiSearchCore_core_HEADERS}
-    searchstore.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiSearch/core
     COMPONENT Devel
 )
 
 install(FILES
-    ${KF5AkonadiSearchCore_core_HEADERS}
-    searchstore.h
     ${CMAKE_CURRENT_BINARY_DIR}/search_core_export.h
     DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/AkonadiSearch
     COMPONENT Devel
-- 
GitLab


From 076fefba65b25ed4e900c4d64260349fc019fdec Mon Sep 17 00:00:00 2001
From: Volker Krause <vkrause@kde.org>
Date: Tue, 8 Mar 2022 13:23:43 +0100
Subject: [PATCH 2/2] "core" is no longer in the include search path

So includes from there aren't found without the right path anymore.
---
 xapian/xapiansearchstore.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xapian/xapiansearchstore.h b/xapian/xapiansearchstore.h
index 83187af..bf3b2ab 100644
--- a/xapian/xapiansearchstore.h
+++ b/xapian/xapiansearchstore.h
@@ -10,9 +10,9 @@
 
 #include <xapian.h>
 
+#include "core/searchstore.h"
+#include "core/term.h"
 #include "search_xapian_export.h"
-#include "searchstore.h"
-#include "term.h"
 
 #include <QMutex>
 
-- 
GitLab