From a951bfeae3d64333b93f149d5688de7515a91680 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 4 Nov 2016 21:17:43 +0100
Subject: [PATCH] strigi: fix files installed to /share.

---
 app-misc/strigi/patches/strigi-0.7.5.patch | 105 ---------------------
 app-misc/strigi/strigi-0.7.5.recipe        |   2 +-
 2 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 app-misc/strigi/patches/strigi-0.7.5.patch

diff --git a/app-misc/strigi/patches/strigi-0.7.5.patch b/app-misc/strigi/patches/strigi-0.7.5.patch
deleted file mode 100644
index 68a3ace59..000000000
--- a/app-misc/strigi/patches/strigi-0.7.5.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 963443070677dc28be0edba24053dede8560fb2e Mon Sep 17 00:00:00 2001
-From: Augustin Cavalier <waddlesplash@gmail.com>
-Date: Mon, 14 Jul 2014 16:33:25 -0400
-Subject: [PATCH] Fix Strigi on Haiku.
-
----
- libstreamanalyzer/lib/saxeventanalyzer.cpp                   | 2 +-
- strigiclient/lib/CMakeLists.txt                              | 1 -
- strigiclient/lib/searchclient/CMakeLists.txt                 | 4 +++-
- strigidaemon/CMakeLists.txt                                  | 2 +-
- strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp | 2 +-
- strigidaemon/bin/daemon/strigithread.cpp                     | 3 ++-
- 6 files changed, 8 insertions(+), 6 deletions(-)
-
-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);
--- 
-1.8.3.4
-
diff --git a/app-misc/strigi/strigi-0.7.5.recipe b/app-misc/strigi/strigi-0.7.5.recipe
index 251925670..92a24b56c 100644
--- a/app-misc/strigi/strigi-0.7.5.recipe
+++ b/app-misc/strigi/strigi-0.7.5.recipe
@@ -11,7 +11,7 @@ LICENSE="GNU LGPL v2.1"
 REVISION="2"
 SOURCE_URI="http://downloads.sourceforge.net/project/strigi/strigi/strigi-0.7.5.tar.bz2"
 CHECKSUM_SHA256="111f5e3ede171292302b906418af0175445ca01958d40fb54879f80620b5189b"
-PATCHES="strigi-0.7.5.patch"
+PATCHES="strigi-0.7.5.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86"
 SECONDARY_ARCHITECTURES="x86"