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

[Andrea Scarpino]

    Date: Monday, December 12, 2011 @ 04:08:25
  Author: andrea
Revision: 144964

upgpkg: strigi 0.7.7-1

upstream release

Modified:
  strigi/trunk/PKGBUILD
Deleted:
  strigi/trunk/libstreamanalyzer_pdf.patch

-----------------------------+
 PKGBUILD                    |   15 +++++----------
 libstreamanalyzer_pdf.patch |   27 ---------------------------
 2 files changed, 5 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-12-12 09:03:37 UTC (rev 144963)
+++ PKGBUILD	2011-12-12 09:08:25 UTC (rev 144964)
@@ -3,26 +3,21 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=strigi
-pkgver=0.7.6
-pkgrel=2
+pkgver=0.7.7
+pkgrel=1
 pkgdesc="Fast crawling desktop search engine with Qt4 GUI"
 arch=('i686' 'x86_64')
 url="http://www.vandenoever.info/software/strigi/"
 license=('GPL2')
-depends=('bzip2' 'exiv2' 'libxml2' 'boost-libs')
+depends=('exiv2' 'libxml2' 'boost-libs')
 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"
-        'libstreamanalyzer_pdf.patch')
-md5sums=('41cddd39e4ae3f590d82c859a14e9261'
-         '3e722a93cf5c6238e625ca58463afac2')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('ca0a0fd5c2b99879f6330837aeede996')
 
 build() {
-  cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer
-  patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch
-
   cd "${srcdir}"
   mkdir build
   cd build

Deleted: libstreamanalyzer_pdf.patch
===================================================================
--- libstreamanalyzer_pdf.patch	2011-12-12 09:03:37 UTC (rev 144963)
+++ libstreamanalyzer_pdf.patch	2011-12-12 09:08:25 UTC (rev 144964)
@@ -1,27 +0,0 @@
-commit 23d5ce636b7897dc3f233a5293f3164dac50566d
-Author: Jos van den Oever <jos at 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;
- }