Sun Jun 29 04:05:35 UTC 2014

3 files changed, 35 insertions, 26 deletions

diff --git a/community/pinot/PKGBUILD b/community/pinot/PKGBUILD
index d713e14de..b4f97f596 100644
--- a/community/pinot/PKGBUILD
+++ b/community/pinot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 104802 2014-01-26 12:17:40Z andyrtr $
+# $Id: PKGBUILD 113713 2014-06-28 16:17:15Z jlichtblau $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,8 +6,8 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=pinot
-pkgver=1.06
-pkgrel=3
+pkgver=1.07
+pkgrel=1
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/pinot-search/'
@@ -15,7 +15,7 @@ license=('GPL')
 depends=('gtkmm3' 'xapian-core' 'libtextcat' 'sqlite' 'libxml++' 'curl' 'gmime' 
          'dbus-glib' 'shared-mime-info' 'libexif' 'taglib' 'hicolor-icon-theme' 
          'cairo' 'exiv2' 'boost-libs')
-makedepends=('boost' 'desktop-file-utils')
+makedepends=('boost' 'desktop-file-utils' 'svn' 'autoconf' 'automake')
 optdepends=('unzip: ZIP files extraction'
             'poppler: PDF to text conversion'
             'catdvi: DVI to text conversion'
@@ -26,12 +26,23 @@ optdepends=('unzip: ZIP files extraction'
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz namespace_clash.patch)
-sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d'
-            '7b4fee7b43f73539803954075af2ce577b65ca732ab8115d257068ffaa5a750f')
+source=()
+sha256sums=()
+
+_svntrunk=http://pinot-search.googlecode.com/svn/tags/v${pkgver}
+
+prepare() {
+  cd "${srcdir}"
+
+  msg "Connecting to SVN server...."
+  svn co "$_svntrunk"
+  msg "SVN checkout done or server timeout"
+
+  msg "Starting build..."
+  rm -rf "${srcdir}/${pkgver}-build"
+  svn export "${srcdir}/v${pkgver}" "${srcdir}/${pkgver}-build"
+  cd "${srcdir}/${pkgver}-build"
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
   x='/usr/share/libtextcat/'
   sed -i 's|/LM/russian.lm|/LM/russian-windows1251.lm|' textcat_conf.txt
   sed -i "s|$x|${x}LM/|" \
@@ -43,22 +54,29 @@ build() {
 ${x}LM/russian-koi8_r.lm      russian-koi8_r\n\
 ${x}LM/russian-windows1251.lm russian-windows1251|" textcat3_conf.txt
 
-  patch -Np1 -i $srcdir/namespace_clash.patch
+#configure to be run with the desired below args
+  sed -i '$s/^/#/' autogen.sh
+}
+
 
+build() {
+  cd "${srcdir}/${pkgver}-build"
 
+  ./autogen.sh
+  
   LIBS="-lboost_system" ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --libexecdir=/usr/lib \
-    --enable-gtkmm3=yes \
-    --enable-mempool=no
+    --enable-gtkmm3=yes
+
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgver}-build"
 
-  make DESTDIR=$pkgdir install
+  make DESTDIR="${pkgdir}" install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/pinot/namespace_clash.patch b/community/pinot/namespace_clash.patch
deleted file mode 100644
index 40d7c9eac..000000000
--- a/community/pinot/namespace_clash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur pinot-1.06/UI/GTK2/src/mainWindow.cc pinot-1.06.new/UI/GTK2/src/mainWindow.cc
---- pinot-1.06/UI/GTK2/src/mainWindow.cc	2013-01-14 13:47:06.000000000 +0100
-+++ pinot-1.06.new/UI/GTK2/src/mainWindow.cc	2013-11-30 19:22:17.792587309 +0100
-@@ -1766,7 +1766,7 @@
- 						viewDoc = true;
- 					}
- 
--					close(inFd);
-+					::close(inFd);
- 				}
- 
- 				if (viewDoc == true)
diff --git a/community/pinot/pinot.changelog b/community/pinot/pinot.changelog
index 4cf1a68a2..d65e94dcf 100644
--- a/community/pinot/pinot.changelog
+++ b/community/pinot/pinot.changelog
@@ -1,3 +1,6 @@
+2014-06-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+	* pinot 1.07-1
+
 2012-09-29 Alexander Rødseth <rodseth@gmail.com>
 	* fix FS#31510, adding --enable-mempool=no