mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 05:10:05 +02:00
strigi: bump version.
* use cmakeDirArgs
This commit is contained in:
Jerome Duval
@@ -1,120 +0,0 @@
|
||||
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
|
||||
|
||||
136
app-misc/strigi/patches/strigi-0.7.8.patchset
Normal file
136
app-misc/strigi/patches/strigi-0.7.8.patchset
Normal file
@@ -0,0 +1,136 @@
|
||||
From 47c483d895550dbef23d8a99423a56ebcfdbe00a 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/CMakeLists.txt b/strigiclient/CMakeLists.txt
|
||||
index 7b7d6c7..859e083 100644
|
||||
--- a/strigiclient/CMakeLists.txt
|
||||
+++ b/strigiclient/CMakeLists.txt
|
||||
@@ -12,9 +12,10 @@ enable_testing()
|
||||
option(ENABLE_QT4 "enable Qt4 GUI" ON)
|
||||
set(QT_MIN_VERSION "4.3.0")
|
||||
|
||||
-# definition of LIB_DESTINATION which is the path where the lib is installed
|
||||
+# Set the installation paths
|
||||
include(GNUInstallDirs)
|
||||
-set(LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||||
+set(LIB_DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||
+set(INCLUDE_DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
|
||||
|
||||
# Set up RPATH handling, so the libs are found if they are installed to a non-standard location.
|
||||
# By default cmake builds the targets with full RPATH to everything in the build directory,
|
||||
diff --git a/strigiclient/lib/htmlgui/CMakeLists.txt b/strigiclient/lib/htmlgui/CMakeLists.txt
|
||||
index 983708d..604ab56 100644
|
||||
--- a/strigiclient/lib/htmlgui/CMakeLists.txt
|
||||
+++ b/strigiclient/lib/htmlgui/CMakeLists.txt
|
||||
@@ -7,6 +7,12 @@ set_target_properties(strigihtmlgui PROPERTIES
|
||||
|
||||
target_link_libraries(strigihtmlgui searchclient streamanalyzer)
|
||||
|
||||
-install(TARGETS strigihtmlgui DESTINATION ${LIB_DESTINATION})
|
||||
+install(TARGETS strigihtmlgui
|
||||
+ LIBRARY DESTINATION ${LIB_DESTINATION}
|
||||
+ RUNTIME DESTINATION bin
|
||||
+ ARCHIVE DESTINATION ${LIB_DESTINATION}
|
||||
+)
|
||||
+
|
||||
install(FILES strigihtmlgui.h
|
||||
- DESTINATION include/strigi)
|
||||
+ DESTINATION ${INCLUDE_DESTINATION}/strigi
|
||||
+)
|
||||
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/strigiclient/lib/searchclient/qtdbus/CMakeLists.txt b/strigiclient/lib/searchclient/qtdbus/CMakeLists.txt
|
||||
index 1f34fc4..604d727 100644
|
||||
--- a/strigiclient/lib/searchclient/qtdbus/CMakeLists.txt
|
||||
+++ b/strigiclient/lib/searchclient/qtdbus/CMakeLists.txt
|
||||
@@ -24,11 +24,11 @@ set_target_properties(strigiqtdbusclient
|
||||
DEFINE_SYMBOL MAKE_STRIGI_QTDBUSCLIENT_LIB
|
||||
)
|
||||
|
||||
-install(TARGETS strigiqtdbusclient RUNTIME DESTINATION bin
|
||||
- LIBRARY DESTINATION ${LIB_DESTINATION}
|
||||
+install(TARGETS strigiqtdbusclient RUNTIME DESTINATION bin
|
||||
+ LIBRARY DESTINATION ${LIB_DESTINATION}
|
||||
ARCHIVE DESTINATION ${LIB_DESTINATION})
|
||||
install(FILES strigiasyncclient.h strigiclient.h strigidbus.h strigitypes.h
|
||||
- DESTINATION include/strigi/qtdbus)
|
||||
+ DESTINATION ${INCLUDE_DESTINATION}/strigi/qtdbus)
|
||||
|
||||
add_executable(strigiqtdbustest strigiqtdbustest.cpp)
|
||||
target_link_libraries(strigiqtdbustest strigiqtdbusclient)
|
||||
diff --git a/strigidaemon/CMakeLists.txt b/strigidaemon/CMakeLists.txt
|
||||
index 6eb4ead..0bd1a6f 100644
|
||||
--- a/strigidaemon/CMakeLists.txt
|
||||
+++ b/strigidaemon/CMakeLists.txt
|
||||
@@ -120,12 +120,12 @@ endif(CppUnit_FOUND)
|
||||
file(GLOB STRIGI_HEADERS include/strigi/*.h)
|
||||
install(FILES
|
||||
${STRIGI_HEADERS}
|
||||
- DESTINATION include/strigi
|
||||
+ DESTINATION ${INCLUDE_DESTINATION}/strigi
|
||||
)
|
||||
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/LibSearchClientConfig.cmake
|
||||
DESTINATION ${LIB_DESTINATION}/cmake/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)
|
||||
diff --git a/strigidaemon/bin/daemon/strigithread.cpp b/strigidaemon/bin/daemon/strigithread.cpp
|
||||
index 6368db1..529eea8 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) {
|
||||
// renice the thread
|
||||
@@ -139,6 +139,7 @@ threadstarter(void *d) {
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
// start the actual work
|
||||
thread->run(0);
|
||||
--
|
||||
2.13.1
|
||||
|
||||
@@ -8,12 +8,12 @@ of a picture; plugins determine what filetypes it is capable of handling."
|
||||
HOMEPAGE="http://strigi.sourceforge.net"
|
||||
COPYRIGHT="2011 Jos van den Oever"
|
||||
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.patchset"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://www.vandenoever.info/software/strigi/strigi-$portVersion.tar.bz2"
|
||||
CHECKSUM_SHA256="43e461a625acdefa59bf58cc9d10aebda9eba920dfbe800fc77e6dcbf1eff989"
|
||||
PATCHES="strigi-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86"
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
@@ -67,8 +67,8 @@ BUILD_PREREQUIRES="
|
||||
|
||||
BUILD()
|
||||
{
|
||||
cmake -DCMAKE_INSTALL_PREFIX=$prefix -DCMAKE_BUILD_TYPE=Release \
|
||||
-DENABLE_DBUS=off
|
||||
cmake $cmakeDirArgs -DCMAKE_BUILD_TYPE=Release \
|
||||
-DENABLE_DBUS=off .
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -76,37 +76,14 @@ INSTALL()
|
||||
{
|
||||
make install
|
||||
|
||||
# Clean up after CMake
|
||||
mkdir -p $includeDir
|
||||
mkdir -p $libDir
|
||||
|
||||
mkdir -p $developLibDir/pkgconfig/
|
||||
mv -f $prefix/lib/pkgconfig/* $developLibDir/pkgconfig/
|
||||
rm -rf $prefix/lib/pkgconfig/
|
||||
|
||||
mv -f $prefix/lib/*.so* $libDir
|
||||
cp -rf $prefix/include/* $includeDir/
|
||||
rm -rf $prefix/include/
|
||||
|
||||
mkdir -p $dataDir/cmake/Modules/
|
||||
mv $prefix/lib/libsearchclient/LibSearchClientConfig.cmake \
|
||||
$dataDir/cmake/Modules/
|
||||
mv $prefix/lib/libstreamanalyzer/LibStreamAnalyzerConfig.cmake \
|
||||
$dataDir/cmake/Modules/
|
||||
mv $prefix/lib/libstreams/LibStreamsConfig.cmake \
|
||||
$dataDir/cmake/Modules/
|
||||
mv $prefix/lib/strigi/StrigiConfig.cmake \
|
||||
$dataDir/cmake/Modules/
|
||||
rm -rf $prefix/lib/libsearchclient/
|
||||
rm -rf $prefix/lib/libstreamanalyzer/
|
||||
rm -rf $prefix/lib/libstreams/
|
||||
|
||||
prepareInstalledDevelLibs \
|
||||
libstreamanalyzer \
|
||||
libstreams \
|
||||
libsearchclient \
|
||||
libstrigihtmlgui
|
||||
fixPkgconfig
|
||||
|
||||
packageEntries devel \
|
||||
$developDir \
|
||||
$dataDir
|
||||
$libDir/cmake
|
||||
}
|
||||
Reference in New Issue
Block a user