Date: Tuesday, October 20, 2015 @ 08:30:20
Author: foutrelis
Revision: 144408
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
gpsdrive/repos/community-staging-i686/
gpsdrive/repos/community-staging-i686/PKGBUILD
(from rev 144407, gpsdrive/trunk/PKGBUILD)
gpsdrive/repos/community-staging-i686/gpsd-3.14.patch
(from rev 144407, gpsdrive/trunk/gpsd-3.14.patch)
gpsdrive/repos/community-staging-i686/gpsdrive-perltovendor.patch
(from rev 144407, gpsdrive/trunk/gpsdrive-perltovendor.patch)
gpsdrive/repos/community-staging-i686/gpsdrive.install
(from rev 144407, gpsdrive/trunk/gpsdrive.install)
gpsdrive/repos/community-staging-x86_64/
gpsdrive/repos/community-staging-x86_64/PKGBUILD
(from rev 144407, gpsdrive/trunk/PKGBUILD)
gpsdrive/repos/community-staging-x86_64/gpsd-3.14.patch
(from rev 144407, gpsdrive/trunk/gpsd-3.14.patch)
gpsdrive/repos/community-staging-x86_64/gpsdrive-perltovendor.patch
(from rev 144407, gpsdrive/trunk/gpsdrive-perltovendor.patch)
gpsdrive/repos/community-staging-x86_64/gpsdrive.install
(from rev 144407, gpsdrive/trunk/gpsdrive.install)
------------------------------------------------------+
community-staging-i686/PKGBUILD | 76 +++++++++++++++++
community-staging-i686/gpsd-3.14.patch | 20 ++++
community-staging-i686/gpsdrive-perltovendor.patch | 28 ++++++
community-staging-i686/gpsdrive.install | 4
community-staging-x86_64/PKGBUILD | 76 +++++++++++++++++
community-staging-x86_64/gpsd-3.14.patch | 20 ++++
community-staging-x86_64/gpsdrive-perltovendor.patch | 28 ++++++
community-staging-x86_64/gpsdrive.install | 4
8 files changed, 256 insertions(+)
Copied: gpsdrive/repos/community-staging-i686/PKGBUILD (from rev 144407,
gpsdrive/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-10-20 06:30:20 UTC (rev 144408)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
+# Maintainer: damir <da...@archlinux.org>
+
+pkgname=gpsdrive
+pkgver=2.11
+_pkgver=20150407
+pkgrel=30
+pkgdesc="A car (bike, ship, plane) navigation system"
+arch=("i686" "x86_64")
+url="http://www.gpsdrive.de/";
+license=('GPL2')
+depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik'
'postgresql-libs' 'openstreetmap-map-icons-svn'
+ 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp'
'perl-www-mechanize' 'perl-libwww' 'perl-uri'
+ 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple'
'perl-xml-twig' 'perl-xml-writer')
+makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
+install="gpsdrive.install"
+#source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz";)
+source=("http://arch.p5n.pp.ru/~sergej/dl/2015/${pkgname}-${_pkgver}.tar.xz";
+ "gpsdrive-perltovendor.patch"
+ "gpsd-3.14.patch")
+md5sums=('c363e751ba1e70e49b198a1889142ca5'
+ 'c28bc2dc51a76a39161bf540aebfab6c'
+ '77fa3d6b0437cff54505aedde7ab7230')
+
+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
+ cd gpsdrive-${_pkgver}
+ patch -p1 <$srcdir/gpsdrive-perltovendor.patch
+ patch -p1 <$srcdir/gpsd-3.14.patch
+}
+
+build() {
+ cd "$srcdir"
+
+ mkdir -p build
+ cd build
+
+ 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/
+ export LDFLAGS="`pkg-config --libs gtk+-2.0 gmodule-2.0` -lboost_system
-lboost_thread"
+
+ # see DefineOptions.cmake for a list of common options and defaults
+ # cmake -L for a more in-depth listing
+ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DWITH_SCRIPTS=ON \
+ -DWITH_MAPNIK=ON \
+ -DWITH_POSTGIS=ON \
+ -DWITH_GDAL=ON \
+ -DWITH_BASEMAPS=ON \
+ -DWITH_FRIENDSD=ON \
+ -DWITH_KISMET=ON \
+ -DWITH_NAVIGATION=ON \
+ -DWITH_SPEECH=OFF \
+ -DWITH_DBUS=OFF \
+ -DLIBGPS_OLD=OFF \
+ -DFREETYPE2_INCLUDE_DIRS=/usr/include/freetype2 \
+ -DFREETYPE2_LIBRARIES=/usr/lib \
+ "$srcdir/gpsdrive-${_pkgver}"
+ make
+}
+
+package() {
+ cd "$srcdir/build"
+ make DESTDIR="$pkgdir" install
+}
Copied: gpsdrive/repos/community-staging-i686/gpsd-3.14.patch (from rev 144407,
gpsdrive/trunk/gpsd-3.14.patch)
===================================================================
--- community-staging-i686/gpsd-3.14.patch (rev 0)
+++ community-staging-i686/gpsd-3.14.patch 2015-10-20 06:30:20 UTC (rev
144408)
@@ -0,0 +1,20 @@
+diff -wbBur gpsdrive-20150407/src/gps_handler.c
gpsdrive-20150407.q/src/gps_handler.c
+--- gpsdrive-20150407/src/gps_handler.c 2015-04-07 14:39:04.000000000
+0300
++++ gpsdrive-20150407.q/src/gps_handler.c 2015-05-22 14:40:05.036450732
+0300
+@@ -443,11 +443,11 @@
+ for (i=0;i<data->satellites;i++)
+ #endif
+ {
+- gps_sats[i].used = data->used[i];
+- gps_sats[i].prn = data->PRN[i];
+- gps_sats[i].elevation = data->elevation[i];
+- gps_sats[i].azimuth = data->azimuth[i];
+- gps_sats[i].snr = data->ss[i];
++ gps_sats[i].used = data->skyview[i].used;
++ gps_sats[i].prn = data->skyview[i].PRN;
++ gps_sats[i].elevation = data->skyview[i].elevation;
++ gps_sats[i].azimuth = data->skyview[i].azimuth;
++ gps_sats[i].snr = data->skyview[i].ss;
+ }
+ }
+
Copied: gpsdrive/repos/community-staging-i686/gpsdrive-perltovendor.patch (from
rev 144407, gpsdrive/trunk/gpsdrive-perltovendor.patch)
===================================================================
--- community-staging-i686/gpsdrive-perltovendor.patch
(rev 0)
+++ community-staging-i686/gpsdrive-perltovendor.patch 2015-10-20 06:30:20 UTC
(rev 144408)
@@ -0,0 +1,28 @@
+diff -ru gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt
gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt
+--- gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt 2010-06-24
15:53:32.000000000 -0400
++++ gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt 2014-06-11
18:50:59.000000000 -0400
+@@ -5,10 +5,10 @@
+ MACRO_OPTIONAL_FIND_PACKAGE(Perl)
+
+ if (PERL_FOUND)
+- if (NOT PERL_SITELIB)
++ if (NOT PERL_VENDORLIB)
+ MACRO_OPTIONAL_FIND_PACKAGE(PerlLibs)
+- endif (NOT PERL_SITELIB)
+- #MESSAGE("DEBUG: > PERL_SITELIB: ${PERL_SITELIB}")
++ endif (NOT PERL_VENDORLIB)
++ #MESSAGE("DEBUG: > PERL_VENDORLIB: ${PERL_VENDORLIB}")
+
+ file(GLOB_RECURSE perl_modules ${CMAKE_CURRENT_SOURCE_DIR}/*.pm)
+
+@@ -16,8 +16,8 @@
+ foreach(perl_module ${perl_modules})
+ file(RELATIVE_PATH relative_module_path ${CMAKE_CURRENT_SOURCE_DIR}
${perl_module})
+ get_filename_component(relative_module_path ${relative_module_path}
PATH)
+- install(FILES ${perl_module} DESTINATION
${PERL_SITELIB}/${relative_module_path})
+- #message("DEBUG: install ${perl_module} to
${PERL_SITELIB}/${relative_module_path}")
++ install(FILES ${perl_module} DESTINATION
${PERL_VENDORLIB}/${relative_module_path})
++ #message("DEBUG: install ${perl_module} to
${PERL_VENDORLIB}/${relative_module_path}")
+ endforeach(perl_module ${perl_modules})
+ endif (perl_modules)
+ endif (PERL_FOUND)
Copied: gpsdrive/repos/community-staging-i686/gpsdrive.install (from rev
144407, gpsdrive/trunk/gpsdrive.install)
===================================================================
--- community-staging-i686/gpsdrive.install (rev 0)
+++ community-staging-i686/gpsdrive.install 2015-10-20 06:30:20 UTC (rev
144408)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
+ echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive";
+}
Copied: gpsdrive/repos/community-staging-x86_64/PKGBUILD (from rev 144407,
gpsdrive/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-10-20 06:30:20 UTC (rev 144408)
@@ -0,0 +1,76 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
+# Maintainer: damir <da...@archlinux.org>
+
+pkgname=gpsdrive
+pkgver=2.11
+_pkgver=20150407
+pkgrel=30
+pkgdesc="A car (bike, ship, plane) navigation system"
+arch=("i686" "x86_64")
+url="http://www.gpsdrive.de/";
+license=('GPL2')
+depends=('gtk2' 'gpsd' 'libxml2' 'curl' 'python2' 'boost-libs' 'gdal' 'mapnik'
'postgresql-libs' 'openstreetmap-map-icons-svn'
+ 'perl-date-manip' 'perl-timedate' 'perl-dbi' 'perl-file-slurp'
'perl-www-mechanize' 'perl-libwww' 'perl-uri'
+ 'perl-text-query' 'perl-www-curl' 'perl-xml-parser' 'perl-xml-simple'
'perl-xml-twig' 'perl-xml-writer')
+makedepends=('cmake>=2.4.4' 'boost' 'cfitsio')
+install="gpsdrive.install"
+#source=("http://www.gpsdrive.de/packages/${pkgname}-${pkgver}.tar.gz";)
+source=("http://arch.p5n.pp.ru/~sergej/dl/2015/${pkgname}-${_pkgver}.tar.xz";
+ "gpsdrive-perltovendor.patch"
+ "gpsd-3.14.patch")
+md5sums=('c363e751ba1e70e49b198a1889142ca5'
+ 'c28bc2dc51a76a39161bf540aebfab6c'
+ '77fa3d6b0437cff54505aedde7ab7230')
+
+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
+ cd gpsdrive-${_pkgver}
+ patch -p1 <$srcdir/gpsdrive-perltovendor.patch
+ patch -p1 <$srcdir/gpsd-3.14.patch
+}
+
+build() {
+ cd "$srcdir"
+
+ mkdir -p build
+ cd build
+
+ 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/
+ export LDFLAGS="`pkg-config --libs gtk+-2.0 gmodule-2.0` -lboost_system
-lboost_thread"
+
+ # see DefineOptions.cmake for a list of common options and defaults
+ # cmake -L for a more in-depth listing
+ cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr" \
+ -DWITH_SCRIPTS=ON \
+ -DWITH_MAPNIK=ON \
+ -DWITH_POSTGIS=ON \
+ -DWITH_GDAL=ON \
+ -DWITH_BASEMAPS=ON \
+ -DWITH_FRIENDSD=ON \
+ -DWITH_KISMET=ON \
+ -DWITH_NAVIGATION=ON \
+ -DWITH_SPEECH=OFF \
+ -DWITH_DBUS=OFF \
+ -DLIBGPS_OLD=OFF \
+ -DFREETYPE2_INCLUDE_DIRS=/usr/include/freetype2 \
+ -DFREETYPE2_LIBRARIES=/usr/lib \
+ "$srcdir/gpsdrive-${_pkgver}"
+ make
+}
+
+package() {
+ cd "$srcdir/build"
+ make DESTDIR="$pkgdir" install
+}
Copied: gpsdrive/repos/community-staging-x86_64/gpsd-3.14.patch (from rev
144407, gpsdrive/trunk/gpsd-3.14.patch)
===================================================================
--- community-staging-x86_64/gpsd-3.14.patch (rev 0)
+++ community-staging-x86_64/gpsd-3.14.patch 2015-10-20 06:30:20 UTC (rev
144408)
@@ -0,0 +1,20 @@
+diff -wbBur gpsdrive-20150407/src/gps_handler.c
gpsdrive-20150407.q/src/gps_handler.c
+--- gpsdrive-20150407/src/gps_handler.c 2015-04-07 14:39:04.000000000
+0300
++++ gpsdrive-20150407.q/src/gps_handler.c 2015-05-22 14:40:05.036450732
+0300
+@@ -443,11 +443,11 @@
+ for (i=0;i<data->satellites;i++)
+ #endif
+ {
+- gps_sats[i].used = data->used[i];
+- gps_sats[i].prn = data->PRN[i];
+- gps_sats[i].elevation = data->elevation[i];
+- gps_sats[i].azimuth = data->azimuth[i];
+- gps_sats[i].snr = data->ss[i];
++ gps_sats[i].used = data->skyview[i].used;
++ gps_sats[i].prn = data->skyview[i].PRN;
++ gps_sats[i].elevation = data->skyview[i].elevation;
++ gps_sats[i].azimuth = data->skyview[i].azimuth;
++ gps_sats[i].snr = data->skyview[i].ss;
+ }
+ }
+
Copied: gpsdrive/repos/community-staging-x86_64/gpsdrive-perltovendor.patch
(from rev 144407, gpsdrive/trunk/gpsdrive-perltovendor.patch)
===================================================================
--- community-staging-x86_64/gpsdrive-perltovendor.patch
(rev 0)
+++ community-staging-x86_64/gpsdrive-perltovendor.patch 2015-10-20
06:30:20 UTC (rev 144408)
@@ -0,0 +1,28 @@
+diff -ru gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt
gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt
+--- gpsdrive-2.11/scripts/osm/perl_lib/CMakeLists.txt 2010-06-24
15:53:32.000000000 -0400
++++ gpsdrive-2.11-patched/scripts/osm/perl_lib/CMakeLists.txt 2014-06-11
18:50:59.000000000 -0400
+@@ -5,10 +5,10 @@
+ MACRO_OPTIONAL_FIND_PACKAGE(Perl)
+
+ if (PERL_FOUND)
+- if (NOT PERL_SITELIB)
++ if (NOT PERL_VENDORLIB)
+ MACRO_OPTIONAL_FIND_PACKAGE(PerlLibs)
+- endif (NOT PERL_SITELIB)
+- #MESSAGE("DEBUG: > PERL_SITELIB: ${PERL_SITELIB}")
++ endif (NOT PERL_VENDORLIB)
++ #MESSAGE("DEBUG: > PERL_VENDORLIB: ${PERL_VENDORLIB}")
+
+ file(GLOB_RECURSE perl_modules ${CMAKE_CURRENT_SOURCE_DIR}/*.pm)
+
+@@ -16,8 +16,8 @@
+ foreach(perl_module ${perl_modules})
+ file(RELATIVE_PATH relative_module_path ${CMAKE_CURRENT_SOURCE_DIR}
${perl_module})
+ get_filename_component(relative_module_path ${relative_module_path}
PATH)
+- install(FILES ${perl_module} DESTINATION
${PERL_SITELIB}/${relative_module_path})
+- #message("DEBUG: install ${perl_module} to
${PERL_SITELIB}/${relative_module_path}")
++ install(FILES ${perl_module} DESTINATION
${PERL_VENDORLIB}/${relative_module_path})
++ #message("DEBUG: install ${perl_module} to
${PERL_VENDORLIB}/${relative_module_path}")
+ endforeach(perl_module ${perl_modules})
+ endif (perl_modules)
+ endif (PERL_FOUND)
Copied: gpsdrive/repos/community-staging-x86_64/gpsdrive.install (from rev
144407, gpsdrive/trunk/gpsdrive.install)
===================================================================
--- community-staging-x86_64/gpsdrive.install (rev 0)
+++ community-staging-x86_64/gpsdrive.install 2015-10-20 06:30:20 UTC (rev
144408)
@@ -0,0 +1,4 @@
+post_install() {
+ echo "Don't forget to generate geoinfo.db with geoinfo.pl script"
+ echo "Also you can check http://wiki.archlinux.org/index.php/GpsDrive";
+}
