strigi: add patchset I forgot to add long ago.

This commit is contained in:
Adrien Destugues
2017-04-10 20:04:47 +02:00
parent 2284673490
commit 3810d91be2

View File

@@ -0,0 +1,120 @@
From 18d23a53c49eb056bdba8244fe6a1025435090cb Mon Sep 17 00:00:00 2001
From: Builder kitt <hpkg-builder@haiku-os.org>
Date: Mon, 8 Aug 2016 04:39:06 +0200
Subject: applying patch strigi-0.7.5.patch
diff --git a/libstreamanalyzer/lib/saxeventanalyzer.cpp b/libstreamanalyzer/lib/saxeventanalyzer.cpp
index 1e5b386..d37857c 100644
--- a/libstreamanalyzer/lib/saxeventanalyzer.cpp
+++ b/libstreamanalyzer/lib/saxeventanalyzer.cpp
@@ -27,7 +27,7 @@
#include <cstring>
#ifndef LIBXML_THREAD_ENABLED
-#error Strigi needs a thread safe version of libxml2
+#warning Strigi needs a thread safe version of libxml2
#endif
using namespace Strigi;
diff --git a/strigiclient/lib/CMakeLists.txt b/strigiclient/lib/CMakeLists.txt
index ba07497..c5be26d 100644
--- a/strigiclient/lib/CMakeLists.txt
+++ b/strigiclient/lib/CMakeLists.txt
@@ -1,4 +1,3 @@
if(NOT WIN32)
add_subdirectory(htmlgui)
endif(NOT WIN32)
-add_subdirectory(searchclient)
diff --git a/strigiclient/lib/searchclient/CMakeLists.txt b/strigiclient/lib/searchclient/CMakeLists.txt
index 9ddce18..061f481 100644
--- a/strigiclient/lib/searchclient/CMakeLists.txt
+++ b/strigiclient/lib/searchclient/CMakeLists.txt
@@ -1,4 +1,6 @@
-add_subdirectory(qtdbus)
+if(ENABLE_DBUS)
+ add_subdirectory(qtdbus)
+endif(ENABLE_DBUS)
# disable searchclient for now
if(NOT WIN32)
add_subdirectory(filterwidget)
diff --git a/strigidaemon/CMakeLists.txt b/strigidaemon/CMakeLists.txt
index 759b72c..53d774a 100644
--- a/strigidaemon/CMakeLists.txt
+++ b/strigidaemon/CMakeLists.txt
@@ -115,7 +115,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibSearchClientConfig.cmake
DESTINATION ${LIB_DESTINATION}/libsearchclient)
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "")
add_executable(strigidaemon dummy.cpp)
-target_link_libraries(strigidaemon libstrigidaemon)
+target_link_libraries(strigidaemon libstrigidaemon network)
install(TARGETS strigidaemon
RUNTIME DESTINATION bin)
# library
diff --git a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
index 9fcdcb1..88dae45 100644
--- a/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
+++ b/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp
@@ -27,7 +27,7 @@
#include <iostream>
#include <stdio.h>
-#if defined(__SUNPRO_CC)
+#if defined(__SUNPRO_CC) || defined(__HAIKU__)
#include <unistd.h>
#endif
diff --git a/strigidaemon/bin/daemon/strigithread.cpp b/strigidaemon/bin/daemon/strigithread.cpp
index f2ddaed..ce87f70 100644
--- a/strigidaemon/bin/daemon/strigithread.cpp
+++ b/strigidaemon/bin/daemon/strigithread.cpp
@@ -30,7 +30,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <sys/resource.h>
-#include <sys/syscall.h>
// define two enums and a constant for use of ioprio
enum {
@@ -107,6 +106,7 @@ threadstarter(void *d) {
param.sched_priority = 0;
StrigiThread* thread = static_cast<StrigiThread*>(d);
+#ifndef __HAIKU__
#ifndef __APPLE__
if (thread->getPriority() > 0) {
#ifndef SCHED_BATCH
@@ -138,6 +138,7 @@ threadstarter(void *d) {
#endif
}
#endif
+#endif
// start the actual work
thread->run(0);
--
2.7.0
From 5cb84a57d606bae6322c76ee35570f66474f4714 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 4 Nov 2016 21:16:26 +0100
Subject: strigi: fix files installed to /share.
diff --git a/libstreamanalyzer/CMakeLists.txt b/libstreamanalyzer/CMakeLists.txt
index ded9c2e..c4fe683 100644
--- a/libstreamanalyzer/CMakeLists.txt
+++ b/libstreamanalyzer/CMakeLists.txt
@@ -131,7 +131,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibStreamAnalyzerConfig.cmake
file (GLOB STRIGI_ONTOLOGIES share/strigi/fieldproperties/*.rdfs)
install(FILES
${STRIGI_ONTOLOGIES}
- DESTINATION share/strigi/fieldproperties/
+ DESTINATION data/strigi/fieldproperties/
)
# library
if(NOT WIN32)
--
2.7.0