The following commit has been merged in the master branch:
commit 3abcb36c99344c899f0ee686e22485592a59ccb0
Author: David Paleino <da...@debian.org>
Date:   Tue Mar 16 21:02:05 2010 +0100

    Patches refreshed

diff --git a/debian/patches/00-fix_build.patch 
b/debian/patches/00-fix_build.patch
index 98842c4..7f37400 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -3,17 +3,17 @@ Subject: fix include paths and libraries
 Forwarded: no
 
 ---
- viewer.pro |   14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
+ viewer.pro |   15 ++++++++-------
+ 1 file changed, 8 insertions(+), 7 deletions(-)
 
---- mapnik-viewer-0.0~svn1351.orig/viewer.pro
-+++ mapnik-viewer-0.0~svn1351/viewer.pro
-@@ -4,15 +4,17 @@
+--- mapnik-viewer.orig/viewer.pro
++++ mapnik-viewer/viewer.pro
+@@ -4,15 +4,16 @@
  CC = g++
  TEMPLATE = app
  
--INCLUDEPATH += /opt/mapnik/include
--INCLUDEPATH += /opt/boost/include/boost-1_39
+-INCLUDEPATH += /opt/mapnik2/include
+-INCLUDEPATH += /opt/boost/include/
 -INCLUDEPATH += /usr/X11/include/
 -INCLUDEPATH += /usr/X11/include/freetype2
 +INCLUDEPATH += /usr/include/mapnik
@@ -22,13 +22,13 @@ Forwarded: no
 +INCLUDEPATH += /usr/include/freetype2
  INCLUDEPATH += .
  
- #QMAKE_CXXFLAGS +=' -DDARWIN'
--unix:LIBS =  -L/opt/mapnik/lib -L/usr/X11/lib -lmapnik -lfreetype 
-L/usr/local/lib -licuuc
--unix:LIBS += -lboost_system-xgcc40-mt -lboost_filesystem-xgcc40-mt 
-L/opt/boost/lib
-+#QMAKE_CXXFLAGS += "-ansi -Wall -ftemplate-depth-100 -DLINUX 
-DBOOST_SPIRIT_THREADSAFE -DMAPNIK_THREADSAFE -O2 -finline-functions 
-Wno-inline -DNDEBUG -Wno-missing-field-initializers"
+-QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers'
+-unix:LIBS =  -L/opt/mapnik2/lib -L/usr/X11/lib -lmapnik -lfreetype 
-L/usr/local/lib -licuuc
+-unix:LIBS += -lboost_system -lboost_filesystem -lboost_regex -L/opt/boost/lib
++#QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers'
 +QMAKE_CXXFLAGS += "-ansi -Wall -ftemplate-depth-100 -DLINUX 
-DMAPNIK_THREADSAFE -O2 -finline-functions -Wno-inline -DNDEBUG 
-Wno-missing-field-initializers"
 +unix:LIBS =  -L/usr/lib/ -lmapnik -lfreetype -licuuc
-+unix:LIBS += -lboost_system-mt -lboost_filesystem-mt -lboost_thread-mt
++unix:LIBS += -lboost_system -lboost_filesystem -lboost_regex
  
  # Input
  
diff --git a/debian/patches/01-fix_mapnik_paths.patch 
b/debian/patches/01-fix_mapnik_paths.patch
index 6f7bbfd..f23eea9 100644
--- a/debian/patches/01-fix_mapnik_paths.patch
+++ b/debian/patches/01-fix_mapnik_paths.patch
@@ -6,13 +6,13 @@ Forwarded: not-needed
  main.cpp |    6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
---- mapnik-viewer-0.0~svn1351.orig/main.cpp
-+++ mapnik-viewer-0.0~svn1351/main.cpp
+--- mapnik-viewer.orig/main.cpp
++++ mapnik-viewer/main.cpp
 @@ -39,10 +39,10 @@ int main( int argc, char **argv )
        using mapnik::freetype_engine;
        
        // modify this prefix based on your install location
--      std::string mapnik_dir = "/opt/mapnik";
+-      std::string mapnik_dir = "/opt/mapnik2";
 +      std::string mapnik_dir = "/usr";
        
 -      datasource_cache::instance()->register_datasources(mapnik_dir + 
"/lib/mapnik/input");

-- 
mapnik-viewer

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to