[arch-commits] Commit in strigi/trunk (PKGBUILD gcc48.patch)

[Andrea Scarpino]

    Date: Monday, June 3, 2013 @ 10:51:13
  Author: andrea
Revision: 187011

upgpkg: strigi 0.7.8-3

Fix build with GCC 4.8; Remove not needed Qt4 deps

Added:
  strigi/trunk/gcc48.patch
Modified:
  strigi/trunk/PKGBUILD

-------------+
 PKGBUILD    |   35 ++++++++++++++---------------------
 gcc48.patch |   12 ++++++++++++
 2 files changed, 26 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-03 08:50:04 UTC (rev 187010)
+++ PKGBUILD	2013-06-03 08:51:13 UTC (rev 187011)
@@ -4,21 +4,26 @@
 
 pkgname=strigi
 pkgver=0.7.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Fast crawling desktop search engine with Qt GUI"
 arch=('i686' 'x86_64')
 url='http://strigi.sourceforge.net/'
 license=('GPL2')
-depends=('exiv2' 'libxml2' 'boost-libs' 'qt4')
+depends=('dbus' 'exiv2' 'libxml2' 'boost-libs')
 makedepends=('cmake' 'pkg-config' 'boost')
 optdepends=('kdegraphics-strigi-analyzer: strigi analyzers for various graphics file'
             'kdesdk-strigi-analyzer: strigi analyzer for KDE SDK')
-source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('d69443234f4286d71997db9de543331a')
+source=("http://www.vandenoever.info/software/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'gcc48.patch')
+md5sums=('d69443234f4286d71997db9de543331a'
+         'd48d65014650644ba61821813101c2f4')
 
+prepare() {
+  cd ${pkgname}-${pkgver}/libstreams
+  patch -p1 -i "${srcdir}"/gcc48.patch
+}
+
 build() {
-  . /etc/profile.d/qt4.sh
-
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver} \
@@ -31,24 +36,12 @@
     -DENABLE_FAM=OFF \
     -DENABLE_CLUCENE=OFF \
     -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
+    -DENABLE_FFMPEG=OFF \
+    -DENABLE_QT4=OFF
   make
 }
 
 package() {
-  pushd build/libstreams
+  cd build
   make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/libstreamanalyzer
-  make DESTDIR="${pkgdir}" install
-  popd
-
-  pushd build/strigiclient/lib/searchclient/qtdbus
-  make DESTDIR="${pkgdir}" install
-  popd
-  
-  pushd build/strigiutils
-  make DESTDIR="${pkgdir}" install
-  popd
 }

Added: gcc48.patch
===================================================================
--- gcc48.patch	                        (rev 0)
+++ gcc48.patch	2013-06-03 08:51:13 UTC (rev 187011)
@@ -0,0 +1,12 @@
+--- a/include/strigi/bufferedstream.h
++++ b/include/strigi/bufferedstream.h
+@@ -34,7 +34,7 @@
+  * BufferedStream will do the rest.
+  */
+ template <class T>
+-class BufferedStream : public StreamBase<T> {
++class STREAMS_EXPORT BufferedStream : public StreamBase<T> {
+ private:
+     StreamBuffer<T> buffer;
+     bool finishedWritingToBuffer;
+