From 6c5c865fa6674610732dd8427bf8f09f3c166299 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Wed, 19 Oct 2011 23:14:52 +0000
Subject: Wed Oct 19 23:14:52 UTC 2011

---
 extra/strigi/PKGBUILD                    | 13 +++++++++----
 extra/strigi/libstreamanalyzer_pdf.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 extra/strigi/libstreamanalyzer_pdf.patch

(limited to 'extra/strigi')

diff --git a/extra/strigi/PKGBUILD b/extra/strigi/PKGBUILD
index 73aa4c242..d94f628a3 100644
--- a/extra/strigi/PKGBUILD
+++ b/extra/strigi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 139891 2011-10-05 19:06:59Z andrea $
+# $Id: PKGBUILD 140761 2011-10-18 19:07:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=strigi
 pkgver=0.7.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
 arch=('i686' 'x86_64')
 url="http://www.vandenoever.info/software/strigi/"
@@ -14,10 +14,15 @@ makedepends=('qt' '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")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('41cddd39e4ae3f590d82c859a14e9261')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'libstreamanalyzer_pdf.patch')
+md5sums=('41cddd39e4ae3f590d82c859a14e9261'
+         '3e722a93cf5c6238e625ca58463afac2')
 
 build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer
+  patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch
+
   cd "${srcdir}"
   mkdir build
   cd build
diff --git a/extra/strigi/libstreamanalyzer_pdf.patch b/extra/strigi/libstreamanalyzer_pdf.patch
new file mode 100644
index 000000000..6871d67fa
--- /dev/null
+++ b/extra/strigi/libstreamanalyzer_pdf.patch
@@ -0,0 +1,27 @@
+commit 23d5ce636b7897dc3f233a5293f3164dac50566d
+Author: Jos van den Oever <jos@vandenoever.info>
+Date:   Sun Jul 31 12:32:44 2011 +0200
+
+    Revert patch that breaks parsing of PDF files.
+    The offending patch was 672c8b7b3cb4400bc505421f4cc70cf742ed9df0.
+
+diff --git a/lib/pdf/pdfparser.cpp b/lib/pdf/pdfparser.cpp
+index c27f691..df2f7e5 100644
+--- a/lib/pdf/pdfparser.cpp
++++ b/lib/pdf/pdfparser.cpp
+@@ -34,12 +34,13 @@ StreamStatus
+ PdfParser::read(int32_t min, int32_t max) {
+     int32_t off = (int32_t)(pos-start);
+     int32_t d = (int32_t)(stream->position() - bufferStart);
+-    bufferStart += off;
++    min += d;
++    if (max > 0) max += d;
+     stream->reset(bufferStart);
+     int32_t n = stream->read(start, min, max);
+ //    printf("objstart %i %i\n", d, n);
+     if (n < min) return stream->status();
+-    pos = start;
++    pos = start + off;
+     end = start + n;
+     return Ok;
+ }
-- 
cgit v1.2.3-54-g00ecf