[arch-commits] Commit in goldendict/trunk (PKGBUILD gcc47.patch)

[Andrea Scarpino]

    Date: Tuesday, February 26, 2013 @ 17:31:48
  Author: andrea
Revision: 84984

upgpkg: goldendict 1.0.1-6

qt4 rebuild

Added:
  goldendict/trunk/gcc47.patch
Modified:
  goldendict/trunk/PKGBUILD

-------------+
 PKGBUILD    |   16 +++++++++-------
 gcc47.patch |   23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-02-26 16:31:14 UTC (rev 84983)
+++ PKGBUILD	2013-02-26 16:31:48 UTC (rev 84984)
@@ -4,28 +4,30 @@
 
 pkgname=goldendict
 pkgver=1.0.1
-pkgrel=5
+pkgrel=6
 pkgdesc="Feature-rich dictionary lookup program"
 arch=('i686' 'x86_64')
 url="http://goldendict.berlios.de/"
 license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon')
-makedepds=('patch')
+depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qtwebkit' 'phonon')
+makedepends=('patch')
 provides=('stardict')
 changelog=$pkgname.changelog
 source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
-        $pkgname-paths.diff)
+        $pkgname-paths.diff
+        gcc47.patch)
 sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
-            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
+            '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589'
+            '2e13857d047186e781c3bd9de3cfdf794f4d44e8e28f9d18dda8df50cfe13c6e')
 
 build(){
   cd ${srcdir}
 
   patch -Np0 -i ${srcdir}/$pkgname-paths.diff
+  patch -p1 -i ${srcdir}/gcc47.patch
 
-  qmake
+  qmake4
   make
-  qmake
 }
 
 package() {

Added: gcc47.patch
===================================================================
--- gcc47.patch	                        (rev 0)
+++ gcc47.patch	2013-02-26 16:31:48 UTC (rev 84984)
@@ -0,0 +1,23 @@
+diff -urN goldendict-1.0.1-src.orig/processwrapper.cc goldendict-1.0.1-src/processwrapper.cc
+--- goldendict-1.0.1-src.orig/processwrapper.cc	2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/processwrapper.cc	2012-08-04 20:51:45.835055609 +0530
+@@ -94,6 +94,8 @@
+ 
+ #else
+ 
++#include <unistd.h>
++
+ unsigned int ProcessWrapper::currentProcessId()
+ {
+     return getpid();
+diff -urN goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp
+--- goldendict-1.0.1-src.orig/qtsingleapplication/src/qtlocalpeer.cpp	2010-12-04 02:42:46.000000000 +0530
++++ goldendict-1.0.1-src/qtsingleapplication/src/qtlocalpeer.cpp	2012-08-04 20:48:47.761593825 +0530
+@@ -50,6 +50,7 @@
+ #endif
+ #if defined(Q_OS_UNIX)
+ #include <time.h>
++#include <unistd.h>
+ #endif
+ 
+ namespace QtLP_Private {