[arch-commits] Commit in strigi/repos (6 files)

Andrea Scarpino andrea at archlinux.org
Tue Oct 18 19:07:53 UTC 2011


    Date: Tuesday, October 18, 2011 @ 15:07:53
  Author: andrea
Revision: 140761

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  strigi/repos/extra-i686/PKGBUILD
    (from rev 140760, strigi/trunk/PKGBUILD)
  strigi/repos/extra-i686/libstreamanalyzer_pdf.patch
    (from rev 140760, strigi/trunk/libstreamanalyzer_pdf.patch)
  strigi/repos/extra-x86_64/PKGBUILD
    (from rev 140760, strigi/trunk/PKGBUILD)
  strigi/repos/extra-x86_64/libstreamanalyzer_pdf.patch
    (from rev 140760, strigi/trunk/libstreamanalyzer_pdf.patch)
Deleted:
  strigi/repos/extra-i686/PKGBUILD
  strigi/repos/extra-x86_64/PKGBUILD

------------------------------------------+
 extra-i686/PKGBUILD                      |  101 +++++++++++++++--------------
 extra-i686/libstreamanalyzer_pdf.patch   |   27 +++++++
 extra-x86_64/PKGBUILD                    |  101 +++++++++++++++--------------
 extra-x86_64/libstreamanalyzer_pdf.patch |   27 +++++++
 4 files changed, 160 insertions(+), 96 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-18 19:06:58 UTC (rev 140760)
+++ extra-i686/PKGBUILD	2011-10-18 19:07:53 UTC (rev 140761)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=strigi
-pkgver=0.7.6
-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')
-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')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_INOTIFY=ON \
-    -DENABLE_LOG4CXX=OFF \
-    -DENABLE_FAM=OFF \
-    -DENABLE_CLUCENE=OFF \
-    -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}/build/libstreams"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/libstreamanalyzer"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
-  make DESTDIR="${pkgdir}" install
-  
-  cd "${srcdir}/build/strigiutils"
-  make DESTDIR="${pkgdir}" install
-}

Copied: strigi/repos/extra-i686/PKGBUILD (from rev 140760, strigi/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-18 19:07:53 UTC (rev 140761)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=strigi
+pkgver=0.7.6
+pkgrel=2
+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')
+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')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer
+  patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_INOTIFY=ON \
+    -DENABLE_LOG4CXX=OFF \
+    -DENABLE_FAM=OFF \
+    -DENABLE_CLUCENE=OFF \
+    -DENABLE_CLUCENE_NG=OFF \
+    -DENABLE_FFMPEG=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}/build/libstreams"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/libstreamanalyzer"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
+  make DESTDIR="${pkgdir}" install
+  
+  cd "${srcdir}/build/strigiutils"
+  make DESTDIR="${pkgdir}" install
+}

Copied: strigi/repos/extra-i686/libstreamanalyzer_pdf.patch (from rev 140760, strigi/trunk/libstreamanalyzer_pdf.patch)
===================================================================
--- extra-i686/libstreamanalyzer_pdf.patch	                        (rev 0)
+++ extra-i686/libstreamanalyzer_pdf.patch	2011-10-18 19:07:53 UTC (rev 140761)
@@ -0,0 +1,27 @@
+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;
+ }

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-10-18 19:06:58 UTC (rev 140760)
+++ extra-x86_64/PKGBUILD	2011-10-18 19:07:53 UTC (rev 140761)
@@ -1,48 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-
-pkgname=strigi
-pkgver=0.7.6
-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')
-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')
-
-build() {
-  cd "${srcdir}"
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DENABLE_INOTIFY=ON \
-    -DENABLE_LOG4CXX=OFF \
-    -DENABLE_FAM=OFF \
-    -DENABLE_CLUCENE=OFF \
-    -DENABLE_CLUCENE_NG=OFF \
-    -DENABLE_FFMPEG=OFF
-  make
-}
-
-package() {
-  cd "${srcdir}/build/libstreams"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/libstreamanalyzer"
-  make DESTDIR="${pkgdir}" install
-
-  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
-  make DESTDIR="${pkgdir}" install
-  
-  cd "${srcdir}/build/strigiutils"
-  make DESTDIR="${pkgdir}" install
-}

Copied: strigi/repos/extra-x86_64/PKGBUILD (from rev 140760, strigi/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-10-18 19:07:53 UTC (rev 140761)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+
+pkgname=strigi
+pkgver=0.7.6
+pkgrel=2
+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')
+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')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}/libstreamanalyzer
+  patch -p1 -i "${srcdir}"/libstreamanalyzer_pdf.patch
+
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DENABLE_INOTIFY=ON \
+    -DENABLE_LOG4CXX=OFF \
+    -DENABLE_FAM=OFF \
+    -DENABLE_CLUCENE=OFF \
+    -DENABLE_CLUCENE_NG=OFF \
+    -DENABLE_FFMPEG=OFF
+  make
+}
+
+package() {
+  cd "${srcdir}/build/libstreams"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/libstreamanalyzer"
+  make DESTDIR="${pkgdir}" install
+
+  cd "${srcdir}/build/strigiclient/lib/searchclient/qtdbus"
+  make DESTDIR="${pkgdir}" install
+  
+  cd "${srcdir}/build/strigiutils"
+  make DESTDIR="${pkgdir}" install
+}

Copied: strigi/repos/extra-x86_64/libstreamanalyzer_pdf.patch (from rev 140760, strigi/trunk/libstreamanalyzer_pdf.patch)
===================================================================
--- extra-x86_64/libstreamanalyzer_pdf.patch	                        (rev 0)
+++ extra-x86_64/libstreamanalyzer_pdf.patch	2011-10-18 19:07:53 UTC (rev 140761)
@@ -0,0 +1,27 @@
+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;
+ }




More information about the arch-commits mailing list