[SCM] mapnik-viewer branch, master, updated. debian/0.0.svn1697-1-9-g34d4a4a
David Paleino
dapal at debian.org
Tue May 3 10:35:33 UTC 2011
The following commit has been merged in the master branch:
commit eefc2fb80d78541440d14c1a40879671483d1cca
Author: David Paleino <dapal at debian.org>
Date: Tue May 3 12:34:10 2011 +0200
Patches refreshed
diff --git a/debian/changelog b/debian/changelog
index 86fd28a..b9853e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,7 @@ mapnik-viewer (0.0~svn2521-1) UNRELEASED; urgency=low
* debian/patches/:
- *.patch refreshed to cleanly apply
- -- David Paleino <dapal at debian.org> Tue, 29 Jun 2010 08:20:27 +0200
+ -- David Paleino <dapal at debian.org> Tue, 03 May 2011 12:33:40 +0200
mapnik-viewer (0.0~svn1697-1) unstable; urgency=low
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
index 67283e6..3de78cb 100644
--- a/debian/patches/00-fix_build.patch
+++ b/debian/patches/00-fix_build.patch
@@ -12,23 +12,23 @@ Forwarded: no
CC = g++
TEMPLATE = app
--INCLUDEPATH += /opt/mapnik/include
--INCLUDEPATH += /opt/boost/include/
+-INCLUDEPATH += /usr/local/include/
+-INCLUDEPATH += /usr/boost/include/
-INCLUDEPATH += /usr/X11/include/
-INCLUDEPATH += /usr/X11/include/freetype2
-+INCLUDEPATH += /usr/include/mapnik
-+INCLUDEPATH += /usr/include/boost
-+INCLUDEPATH += /usr/include
-+INCLUDEPATH += /usr/include/freetype2
++INCLUDEPATH += /usr/include/
++INCLUDEPATH += /usr/include/boost/
++INCLUDEPATH += /usr/include/mapnik/
++INCLUDEPATH += /usr/include/freetype2/
INCLUDEPATH += .
--QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers'
--unix:LIBS = -L/opt/mapnik/lib -L/usr/X11/lib -lmapnik2 -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 -lboost_filesystem -lboost_regex -lboost_thread
+-QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi'
+-unix:LIBS = -L/usr/local/lib -L/usr/X11/lib -lmapnik2 -lfreetype
+-unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex
++#QMAKE_CXXFLAGS +=' -DDARWIN -Wno-missing-field-initializers -ansi'
++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
++unix:LIBS += -lboost_system -licuuc -lboost_filesystem -lboost_regex -lboost_thread
# Input
diff --git a/debian/patches/01-fix_mapnik_paths.patch b/debian/patches/01-fix_mapnik_paths.patch
index 9fa5a33..3881cd3 100644
--- a/debian/patches/01-fix_mapnik_paths.patch
+++ b/debian/patches/01-fix_mapnik_paths.patch
@@ -8,11 +8,11 @@ Forwarded: not-needed
--- mapnik-viewer.orig/main.cpp
+++ mapnik-viewer/main.cpp
-@@ -68,14 +68,14 @@ int main( int argc, char **argv )
+@@ -43,14 +43,14 @@ int main( int argc, char **argv )
// register input plug-ins
QString plugins_dir = settings.value("mapnik/plugins_dir",
-- QVariant("/opt/mapnik/lib/mapnik2/input/")).toString();
+- QVariant("/usr/local/lib/mapnik2/input/")).toString();
+ QVariant("/usr/lib/mapnik/0.7/input/")).toString();
datasource_cache::instance()->register_datasources(plugins_dir.toStdString());
// register fonts
@@ -22,6 +22,6 @@ Forwarded: not-needed
settings.setArrayIndex(index);
- QString font_dir = settings.value("dir").toString();
+ QString font_dir = "/usr/share/fonts/truetype/ttf-dejavu";
- register_fonts(font_dir.toStdString());
+ freetype_engine::register_fonts(font_dir.toStdString());
}
settings.endArray();
diff --git a/debian/patches/02-fix_mapnik_API.patch b/debian/patches/02-fix_mapnik_API.patch
index 72941f1..fdb4147 100644
--- a/debian/patches/02-fix_mapnik_API.patch
+++ b/debian/patches/02-fix_mapnik_API.patch
@@ -4,16 +4,17 @@ Forwarded: no (needed?)
---
layer_info_dialog.cpp | 2 -
- layer_info_dialog.hpp | 4 +--
+ layer_info_dialog.hpp | 4 +-
layerlistmodel.cpp | 10 +++----
layerlistmodel.hpp | 2 -
layerwidget.cpp | 2 -
+ main.cpp | 18 +++++++++++-
mainwindow.cpp | 6 ++--
mainwindow.hpp | 2 -
- mapwidget.cpp | 66 +++++++++++++++++++++++++-------------------------
- mapwidget.hpp | 4 +--
- styles_model.cpp | 4 +--
- 10 files changed, 51 insertions(+), 51 deletions(-)
+ mapwidget.cpp | 70 +++++++++++++++++++++++++-------------------------
+ mapwidget.hpp | 4 +-
+ styles_model.cpp | 12 ++++----
+ 11 files changed, 73 insertions(+), 59 deletions(-)
--- mapnik-viewer.orig/mapwidget.hpp
+++ mapnik-viewer/mapwidget.hpp
@@ -46,7 +47,7 @@ Forwarded: no (needed?)
load_map_file(filename_);
mapWidget_->zoomToBox(bbox);
setWindowTitle(tr("%1 - *Reloaded*").arg(filename_));
-@@ -384,7 +384,7 @@ void MainWindow::set_default_extent(doub
+@@ -385,7 +385,7 @@ void MainWindow::set_default_extent(doub
mapnik::projection prj(map_ptr->srs());
prj.forward(x0,y0);
prj.forward(x1,y1);
@@ -55,7 +56,7 @@ Forwarded: no (needed?)
mapWidget_->zoomToBox(default_extent_);
std::cout << "SET DEFAULT EXT\n";
}
-@@ -403,7 +403,7 @@ void MainWindow::zoom_all()
+@@ -404,7 +404,7 @@ void MainWindow::zoom_all()
if (map_ptr)
{
map_ptr->zoom_all();
@@ -108,6 +109,20 @@ Forwarded: no (needed?)
if (!layer.isVisible(scale_denom)) continue;
std::string name = layer.name();
double x = e->x();
+@@ -177,11 +177,11 @@ void MapWidget::mousePressEvent(QMouseEv
+ itr->second.to_string().c_str()));
+ }
+ }
+- typedef mapnik::coord_transform2<mapnik::CoordTransform,mapnik::geometry_type> path_type;
++ typedef mapnik::coord_transform2<mapnik::CoordTransform,mapnik::geometry2d> path_type;
+
+ for (unsigned i=0; i<feat->num_geometries();++i)
+ {
+- mapnik::geometry_type & geom = feat->get_geometry(i);
++ mapnik::geometry2d & geom = feat->get_geometry(i);
+ path_type path(t,geom,prj_trans);
+ if (geom.num_points() > 0)
+ {
@@ -218,7 +218,7 @@ void MapWidget::mousePressEvent(QMouseEv
// remove annotation layer
map_->layers().erase(remove_if(map_->layers().begin(),
@@ -333,20 +348,48 @@ Forwarded: no (needed?)
--- mapnik-viewer.orig/styles_model.cpp
+++ mapnik-viewer/styles_model.cpp
-@@ -247,7 +247,7 @@ public:
+@@ -19,7 +19,7 @@
+ //$Id$
+
+ #include "styles_model.hpp"
+-#include <mapnik/expression_string.hpp>
++#include <mapnik/expression.hpp>
+ // boost
+ #include <boost/concept_check.hpp>
+ #include <boost/scoped_ptr.hpp>
+@@ -241,15 +241,15 @@ public:
+ class rule_node
+ {
+ public:
+- rule_node(QString name,mapnik::rule const & r)
++ rule_node(QString name,mapnik::rule_type const & r)
+ : name_(name),
+ rule_(r) {}
~rule_node() {}
QString name() const
{
- mapnik::expression_ptr filter = rule_.get_filter();
+ mapnik::filter_ptr filter = rule_.get_filter();
- return QString(mapnik::to_expression_string(*filter).c_str());
+- return QString(mapnik::to_expression_string(*filter).c_str());
++ return QString(filter->to_string().c_str());
}
+
+ QIcon icon() const
+@@ -259,7 +259,7 @@ public:
+
+ private:
+ QString name_;
+- mapnik::rule const& rule_;
++ mapnik::rule_type const& rule_;
+ };
+
+ class style_node
@@ -323,7 +323,7 @@ StyleModel::StyleModel(boost::shared_ptr
for ( ; itr2 != rules.end();++itr2)
{
node* rule_n = style_n->add_child(new node(rule_node(QString("Rule"),*itr2),style_n));
-- mapnik::rule_type::symbolizers::const_iterator itr3 = (*itr2).begin();
+- mapnik::rule::symbolizers::const_iterator itr3 = (*itr2).begin();
+ mapnik::symbolizers::const_iterator itr3 = (*itr2).begin();
for ( ; itr3 !=itr2->end();++itr3)
{
@@ -362,3 +405,37 @@ Forwarded: no (needed?)
: QDialog(parent)
{
ui.setupUi(this);
+--- mapnik-viewer.orig/main.cpp
++++ mapnik-viewer/main.cpp
+@@ -30,6 +30,11 @@
+ #include <boost/filesystem/operations.hpp>
+
+
++bool is_font_file (std::string const& filename)
++{
++ return boost::algorithm::ends_with(filename,std::string(".ttf"));
++}
++
+ int main( int argc, char **argv )
+ {
+ using mapnik::datasource_cache;
+@@ -50,8 +55,17 @@ int main( int argc, char **argv )
+ for (int index=0; index < count; ++index)
+ {
+ settings.setArrayIndex(index);
+- QString font_dir = "/usr/share/fonts/truetype/ttf-dejavu";
+- freetype_engine::register_fonts(font_dir.toStdString());
++ boost::filesystem::path path("/usr/share/fonts/truetype/ttf-dejavu");
++ boost::filesystem::directory_iterator end_itr;
++
++ if (boost::filesystem::exists(path) && boost::filesystem::is_directory(path)) {
++ for (boost::filesystem::directory_iterator itr(path); itr != end_itr; ++itr ) {
++ if (!boost::filesystem::is_directory(*itr) && is_font_file(itr->path().leaf())) {
++ std::cout << "register font " << itr->string() << "\n";
++ freetype_engine::register_font(itr->string());
++ }
++ }
++ }
+ }
+ settings.endArray();
+
--
mapnik-viewer
More information about the Pkg-grass-devel
mailing list