[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
===================================================================
--- PKGBUILD	2013-11-30 18:10:16 UTC (rev 101753)
+++ PKGBUILD	2013-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.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)