Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=boost14.git;a=commitdiff;h=e24b675336974cabd86fb787340bafb9fad16e57

commit e24b675336974cabd86fb787340bafb9fad16e57
Author: Miklos Vajna <vmik...@frugalware.org>
Date:   Mon Apr 25 03:01:19 2011 +0200

mapnik-0.7.1-5-i686

- rebuild with boost>=1.46.1

diff --git a/source/xlib-extra/mapnik/FrugalBuild 
b/source/xlib-extra/mapnik/FrugalBuild
index 181a605..ea8924e 100644
--- a/source/xlib-extra/mapnik/FrugalBuild
+++ b/source/xlib-extra/mapnik/FrugalBuild
@@ -3,18 +3,20 @@

pkgname=mapnik
pkgver=0.7.1
-pkgrel=4
+pkgrel=5
pkgdesc="Free Toolkit for developing mapping applications"
-depends=('libboost-mt' 'libxml2>=2.7.8' 'sqlite3' 'cairomm' \
+depends=('libboost>=1.46.1' 'libxml2>=2.7.8' 'sqlite3' 'cairomm' \
'pycairo' 'proj' 'libtiff' 'libjpeg>=8b' 'libxaw>=1.0.5')
makedepends=('scons' 'boost')
Finclude berlios
groups=('xlib-extra')
archs=('i686' 'x86_64')
-sha1sums=('5fc9152574ac72c4063af9a4716739c793ec7b5b')
+source=($source mapnik-changeset_trunk_r2496.diff)
+sha1sums=('5fc9152574ac72c4063af9a4716739c793ec7b5b' \
+          '51ca87a269c6c42ba349ddd2d80cc5b4713ed31f')

build() {
-       Fcd
+       Fpatchall
Fsed "/usr/local" "/usr" SConstruct
scons configure || Fdie
scons DESTDIR=$Fdestdir install || Fdie
diff --git a/source/xlib-extra/mapnik/mapnik-changeset_trunk_r2496.diff 
b/source/xlib-extra/mapnik/mapnik-changeset_trunk_r2496.diff
new file mode 100644
index 0000000..597da25
--- /dev/null
+++ b/source/xlib-extra/mapnik/mapnik-changeset_trunk_r2496.diff
@@ -0,0 +1,13 @@
+Index: trunk/SConstruct
+===================================================================
+--- trunk/SConstruct (revision 2485)
++++ trunk/SConstruct (revision 2496)
+@@ -1171,5 +1171,7 @@
+         else:
+             # Common flags for GCC.
+-            gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-100 %s' % 
(pthread, common_cxx_flags)
++            # note: starting with boost 1.46 boost filesystem v3 is default 
so force to be v2
++            # by using BOOST_FILESYSTEM_VERSION=2 (until we upgrade)
++            gcc_cxx_flags = '-ansi -Wall %s -ftemplate-depth-200 
-DBOOST_FILESYSTEM_VERSION=2 %s' % (pthread, common_cxx_flags)
+
+             if env['DEBUG']:
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to