[arch-commits] Commit in gpsdrive/trunk (PKGBUILD)

[Sergej Pupykin]

    Date: Monday, June 17, 2013 @ 14:06:45
  Author: spupykin
Revision: 92873

upgpkg: gpsdrive 2.11-18

upd

Modified:
  gpsdrive/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-17 11:26:17 UTC (rev 92872)
+++ PKGBUILD	2013-06-17 12:06:45 UTC (rev 92873)
@@ -6,7 +6,7 @@
 pkgname=gpsdrive
 pkgver=2.11
 _pkgver=20120928
-pkgrel=17
+pkgrel=18
 pkgdesc="A car (bike, ship, plane) navigation system"
 arch=("i686" "x86_64")
 url="http://www.gpsdrive.de/"
@@ -20,22 +20,24 @@
 source=("http://arch.p5n.pp.ru/~sergej/dl/2012/${pkgname}-${_pkgver}.tar.gz")
 md5sums=('bc53792529788b81c291a32d628a4850')
 
-build() {
+prepare() {
   cd "$srcdir"
-
   # python2 fix
   for file in $(find . -name '*.py' -print); do
     sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
     sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
   done
+  sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
+  sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
+  sed -i 's|datasource_cache::instance()->|datasource_cache::instance().|' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
+}
 
-  rm -rf build
-  mkdir build
+build() {
+  cd "$srcdir"
+
+  mkdir -p build
   cd build
 
-  sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
-  sed -i '22,1i#include <mapnik/graphics.hpp>' $srcdir/gpsdrive-${_pkgver}/src/mapnik.cpp
-
   export CFLAGS=-I/usr/include/gdk-pixbuf-2.0/
   export CPPFLAGS=-I/usr/include/gdk-pixbuf-2.0/
   export CXXFLAGS=-I/usr/include/gdk-pixbuf-2.0/