Changeset f432d0bb

Timestamp:

03/03/2012 03:36:42 PM (12 years ago)

Author:

Ragnar Thomsen <rthomsen@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 7.10, 7.4, 7.5, 7.6, 7.6-blfs, 7.6-systemd, 7.7, 7.8, 7.9, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, gnome, kde5-13430, kde5-14269, kde5-14686, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, krejzi/svn, lazarus, lxqt, nosym, perl-modules, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, systemd-11177, systemd-13485, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

55b40b3a

Parents:

3bb53bb

Message:

updated and added patch for strigi.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9573 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:

• general.ent (modified) (1 diff)
• general/sysutils/strigi.xml (modified) (7 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)

general.ent

@@ -336 +336 @@
 <!ENTITY rasqal-version               "0.9.20">
 <!ENTITY redland-version              "1.0.12">
-<!ENTITY strigi-version               "0.6.4">
+<!ENTITY strigi-version               "0.7.5">
 <!ENTITY packagekit-version           "0.7.1">
 <!ENTITY tracker-version              "0.12.3">

general/sysutils/strigi.xml

@@ -7 +7 @@
   <!ENTITY strigi-download-http "&sourceforge-repo;/strigi/strigi-&strigi-version;.tar.bz2">
   <!ENTITY strigi-download-ftp  " ">
-  <!ENTITY strigi-md5sum        "ddbd274cb31d65be6a78da58fc09079a">
-  <!ENTITY strigi-size          "890 KB">
-  <!ENTITY strigi-buildsize     "127 MB">
-  <!ENTITY strigi-time          "1.7 SBU">
+  <!ENTITY strigi-md5sum        "0559e2ab65d187d30916e9ffe36e0fb6">
+  <!ENTITY strigi-size          "783 KB">
+  <!ENTITY strigi-buildsize     "30 MB">
+  <!ENTITY strigi-time          "2.0 SBU">
 ]>
 
@@ -32 +32 @@
     <para><application>Strigi</application> is a desktop search engine.</para>
 
-    &lfs67_checked;
+    &lfs70_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -55 +55 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
         <para>Required patch: <ulink
-        url="&patch-root;/strigi-&strigi-version;-fixes-1.patch"/></para>
+        url="&patch-root;/strigi/strigi-&strigi-version;-ffmpeg.patch"/></para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">strigi Dependencies</bridgehead>
 
@@ -69 +69 @@
     <para role="required">
     <xref linkend="cmake"/>,
-    <xref linkend="expat"/> or <xref linkend="libxml2"/>,
-    <xref linkend="clucene"/>
+    <xref linkend="expat"/> or <xref linkend="libxml2"/>
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-    <xref linkend="gamin"/> (or FAM),
-    <xref linkend="exiv2"/>,
-    <xref linkend="qt4"/>
+    <xref linkend="qt4"/> and
+    <xref linkend="dbus"/>    
     </para>
 
+    <bridgehead renderas="sect4">Optional</bridgehead>
+    <para role="optional">
+    <xref linkend="clucene"/>, 
+    <xref linkend="gamin"/> (or FAM), 
+    <xref linkend="ffmpeg"/>, 
+    <xref linkend="exiv2"/> and 
+    <ulink url="http://logging.apache.org/log4cxx/">log4cxx</ulink>
+    </para>
+    
     <para condition="html" role="usernotes">User Notes:
     <ulink url="&blfs-wiki;/strigi"/></para>
@@ -88 +95 @@
     <title>Installation of Strigi</title>
 
-    <para>Add missing header files to some includes:</para>
+    <para>Create a build directory:</para>
     
-<screen><userinput>sed -i "s;#include \"jsgzipcompressstream.h\";#include &lt;stdio.h&gt;\n&amp;;" \
-           src/luceneindexer/jsgzipcompressstream.cpp &amp;&amp;
-sed -i "s;#include \"sqliteindexmanager.h\";#include &lt;stdio.h&gt;\n&amp;;" \
-           src/sqliteindexer/sqliteindexmanager.cpp &amp;&amp;
-sed -i "s;#include &lt;cerrno&gt;;#include &lt;stdio.h&gt;\n&amp;;" \
-           src/daemon/eventlistener/famlistener.cpp &amp;&amp;
-sed -i "s;#include &lt;stdlib.h&gt;;&amp;\n#include &lt;stdio.h&gt;;" \
-           src/daemon/strigithread.cpp</userinput></screen>
+    <screen><userinput>mkdir build &amp;&amp;
+cd build</userinput></screen>
 
     <para>Install <application>strigi</application> by running the following
     commands:</para>
-
-<screen><userinput>mkdir build &amp;&amp;
-cd build</userinput></screen>
-
-    <para>Prepare the package for compilation:</para>
        
-<screen><userinput>cmake -DCMAKE_INSTALL_PREFIX=/usr \
-          -DENABLE_EXPAT=ON \
-          -DENABLE_FAM=ON \
-          -DENABLE_SQLITE=OFF .. &amp;&amp;
+    <screen><userinput>patch -Np0 -i ../strigi-&strigi-version;-ffmpeg.patch &amp;&amp;
+cmake -DCMAKE_INSTALL_PREFIX=/usr .. &amp;&amp;
 make</userinput></screen>
 
@@ -122 +116 @@
     <title>Command Explanations</title>
 
-    <para><option>-DENABLE_SQLITE=OFF</option>: Even though there is a sed on a sqlite related
-    source file, this option switches building the sqlite backend off because the support of
-    sqlite is entirely broken.</para>
+  <para><option>patch -Np0 -i ../strigi-&strigi-version;-ffmpeg.patch</option>: This
+    patch fixes compiling with <application>ffmpeg</application>. It is safe to omit 
+    if you don't have <application>ffmpeg</application>.</para>
 
   </sect2>
@@ -133 +127 @@
       <segtitle>Installed Programs</segtitle>
       <segtitle>Installed Libraries</segtitle>
-      <segtitle>Installed Directory</segtitle>
+      <segtitle>Installed Directories</segtitle>
 
       <seglistitem>
-        <seg>deepfind, xmlindexer, strigicmd, luceneindexer, strigiclient, strigidaemon</seg>
-        <seg>several static and shared libraries</seg>
-        <seg>/usr/lib/strigi</seg>
+        <seg>deepfind, deepgrep, rdfindexer, strigiclient, strigicmd, strigidaemon and xmlindexer</seg>
+        <seg>libsearchclient.so, libstreamanalyzer.so, libstreams.so, libstrigihtmlgui.so, 
+          libstrigiqtdbusclient.so and several in /usr/lib/strigi</seg>
+        <seg>/usr/include/strigi, /usr/lib/strigi, /usr/lib/libsearchclient, /usr/lib/libstreamanalyzer, 
+          /usr/lib/libstreams and /usr/share/strigi</seg>
       </seglistitem>
     </segmentedlist>

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[rthomsen] - Updated to Strigi 0.7.5.</para>
+        </listitem>
+        <listitem>
+          <para>[rthomsen] - Added patch for Raptor 1.4.21.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Updated to Soprano 2.7.4.</para>
         </listitem>