[arch-commits] Commit in pinot/trunk (PKGBUILD namespace_clash.patch pinot.changelog)

[Jaroslav Lichtblau]

Date: Saturday, June 28, 2014 @ 18:17:06
  Author: jlichtblau
Revision: 113712

upgpkg: pinot 1.07-1

Modified:
  pinot/trunk/PKGBUILD
  pinot/trunk/pinot.changelog
Deleted:
  pinot/trunk/namespace_clash.patch

---+
 PKGBUILD  |   44 +++-
 namespace_clash.patch |   12 
 pinot.changelog   |3 +++
 3 files changed, 34 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-06-28 15:47:26 UTC (rev 113711)
+++ PKGBUILD2014-06-28 16:17:06 UTC (rev 113712)
@@ -6,8 +6,8 @@
 # Contributor: Alexander Rødseth rods...@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 @@
 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 @@
 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=()
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
+_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
+
   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 @@
 ${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:

Deleted: namespace_clash.patch
===
--- namespace_clash.patch   2014-06-28 15:47:26 UTC (rev 113711)
+++ namespace_clash.patch   2014-06-28 16:17:06 UTC (rev 113712)
@@ -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.0 
+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)

Modified: pinot.changelog
===
--- pinot.changelog 2014-06-28 15:47:26 UTC (rev 113711)
+++ pinot.changelog 2014-06-28 16:17:06 UTC (rev 113712)
@@ -1,3 +1,6 @@
+2014-06-28 Jaroslav Lichtblau dragonl...@aur.archlinux.org
+   * pinot 1.07-1
+
 2012-09-29 Alexander Rødseth rods...@gmail.com
* fix FS#31510, adding --enable-mempool=no
 

[arch-commits] Commit in pinot/trunk (PKGBUILD namespace_clash.patch)

[Jelle van der Waa]

Date: Saturday, November 30, 2013 @ 19:33:14
  Author: jelle
Revision: 101754

upgpkg: pinot 1.06-2

boost 1.55.0 rebuild

Added:
  pinot/trunk/namespace_clash.patch
Modified:
  pinot/trunk/PKGBUILD

---+
 PKGBUILD  |   10 +++---
 namespace_clash.patch |   12 
 2 files changed, 19 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-30 18:10:16 UTC (rev 101753)
+++ PKGBUILD2013-11-30 18:33:14 UTC (rev 101754)
@@ -7,7 +7,7 @@
 
 pkgname=pinot
 pkgver=1.06
-pkgrel=1
+pkgrel=2
 pkgdesc='Personal search and metasearch tool'
 arch=('i686' 'x86_64')
 url='http://code.google.com/p/pinot-search/'
@@ -26,8 +26,9 @@
 options=('!emptydirs')
 install=$pkgname.install
 changelog=$pkgname.changelog
-source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d')
+source=(http://pinot-search.googlecode.com/files/$pkgname-$pkgver.tar.gz 
namespace_clash.patch)
+sha256sums=('bba6f412553890ef7cccd6d7bb28df9a6c4d122ea74a2902e5de33953cd1872d'
+'7b4fee7b43f73539803954075af2ce577b65ca732ab8115d257068ffaa5a750f')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -42,6 +43,9 @@
 ${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
+
+
   LIBS=-lboost_system ./configure \
 --prefix=/usr \
 --sysconfdir=/etc \

Added: namespace_clash.patch
===
--- namespace_clash.patch   (rev 0)
+++ namespace_clash.patch   2013-11-30 18:33:14 UTC (rev 101754)
@@ -0,0 +1,12 @@
+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.0 
+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)