Fri Jul 13 00:01:54 UTC 2012

4 files changed, 95 insertions, 10 deletions

diff --git a/community-staging/gnash/PKGBUILD b/community-staging/gnash/PKGBUILD
index ef02d4658..3ef2282bb 100644
--- a/community-staging/gnash/PKGBUILD
+++ b/community-staging/gnash/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71943 2012-06-03 22:41:22Z heftig $
+# $Id: PKGBUILD 73602 2012-07-11 09:20:26Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.10
-pkgrel=3
+pkgrel=4
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
@@ -15,16 +15,21 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool mesa
              pkgconfig boost)
 options=(!libtool !emptydirs)
 source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        nodebug.patch)
+        nodebug.patch gnash-0.8.10-boost-1.50.patch)
 sha256sums=('9625072e45df92baa2c28fc9999d4e2deb66bc827530baedfad2e4e2292d1224'
-            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551')
+            '0ebb104a7632af997c7e6b268755949fa0c1eea5e32015b95a22d63d0e431551'
+            'ac3e7dbcb2ea30b8a263168462e739aa07706e0e3cdc672410a42a4357dbf54c')
 
 build() {
-  cd "$srcdir/gnash-$pkgver"
+  cd gnash-$pkgver
 
   # Disable very, very verbose debugging (gigabytes of logs)
-  patch -Np1 -i "$srcdir/nodebug.patch"
+  patch -Np1 -i ../nodebug.patch
 
+  # Link to libboost_system.so
+  patch -Np1 -i ../gnash-0.8.10-boost-1.50.patch
+
+  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
@@ -48,7 +53,7 @@ package_gnash-common() {
            boost-libs)
   backup=(etc/gnashrc etc/gnashthumbnailrc)
 
-  cd "$srcdir/gnash-$pkgver"
+  cd gnash-$pkgver
 
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
 
@@ -69,9 +74,9 @@ package_gnash-gtk() {
   install=gnash-gtk.install
   backup=(etc/gnashpluginrc)
 
-  mv "$srcdir"/gtk/* "$pkgdir"
-  
-  cd "$srcdir/gnash-$pkgver"
+  mv gtk/* "$pkgdir"
+
+  cd gnash-$pkgver
   make DESTDIR="$pkgdir" install-plugin
 
   install -m755 -d "$pkgdir/usr/share/gconf/schemas"
diff --git a/community-staging/gnash/gnash-0.8.10-boost-1.50.patch b/community-staging/gnash/gnash-0.8.10-boost-1.50.patch
new file mode 100644
index 000000000..a422ce932
--- /dev/null
+++ b/community-staging/gnash/gnash-0.8.10-boost-1.50.patch
@@ -0,0 +1,12 @@
+diff -u -r gnash-0.8.10/macros/boost.m4 gnash-0.8.10-boost1.50/macros/boost.m4
+--- gnash-0.8.10/macros/boost.m4	2012-01-19 20:17:49.000000000 +0100
++++ gnash-0.8.10-boost-1.50/macros/boost.m4	2012-07-11 10:56:11.089137186 +0200
+@@ -37,7 +37,7 @@
+   boost_headers="detail/lightweight_mutex.hpp thread/thread.hpp multi_index_container.hpp multi_index/key_extractors.hpp thread/mutex.hpp program_options/options_description.hpp iostreams/stream.hpp"
+   dnl this is a list of *required* libraries. If any of these are missing, this
+   dnl test will return a failure, and Gnash won't build.
+-  boost_libs="thread program_options iostreams"
++  boost_libs="thread program_options iostreams system"
+ 
+   dnl this is a list of *recommended* libraries. If any of these are missing, this
+   dnl test will return a warning, and Gnash will build, but testing won't work.
diff --git a/community-staging/gpsdrive/PKGBUILD b/community-staging/gpsdrive/PKGBUILD
new file mode 100644
index 000000000..e299cc3be
--- /dev/null
+++ b/community-staging/gpsdrive/PKGBUILD
@@ -0,0 +1,64 @@
+# $Id: PKGBUILD 73599 2012-07-11 07:49:53Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: damir <damir@archlinux.org>
+
+pkgname=gpsdrive
+pkgver=2.11
+_pkgver=20120711
+pkgrel=13
+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/2012/${pkgname}-${_pkgver}.tar.xz")
+md5sums=('48fe20e111c10d0826d9f05746c9cf74')
+
+build() {
+  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
+
+  rm -rf build
+  mkdir build
+  cd build
+
+  sed -i 's|GdkGC \*kontext_map;|extern GdkGC *kontext_map;|' $srcdir/gpsdrive-${_pkgver}/src/gpsdrive.c
+
+  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 \
+    "$srcdir/gpsdrive-${_pkgver}"
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/community-staging/gpsdrive/gpsdrive.install b/community-staging/gpsdrive/gpsdrive.install
new file mode 100644
index 000000000..8ea63912e
--- /dev/null
+++ b/community-staging/gpsdrive/gpsdrive.install
@@ -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"
+}