diff options
| author | joerg <joerg@pkgsrc.org> | 2013-08-27 15:51:26 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-08-27 15:51:26 +0000 |
| commit | acdf44cef5123603d9b02afe8ff17bebe8eb01a6 (patch) | |
| tree | 2e255c48262ed89de75c934402d672911cf91bec /geography | |
| parent | eb0e0d13373f36fe0ab14a3930a8c51e2e707964 (diff) | |
| download | pkgsrc-acdf44cef5123603d9b02afe8ff17bebe8eb01a6.tar.gz | |
Can't use bool and char * in the same expression. Assume quotes were
meant. Bump revision.
Diffstat (limited to 'geography')
| -rw-r--r-- | geography/merkaartor/Makefile | 4 | ||||
| -rw-r--r-- | geography/merkaartor/distinfo | 3 | ||||
| -rw-r--r-- | geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/geography/merkaartor/Makefile b/geography/merkaartor/Makefile index 4fdef2d2b67..cc174c4bc50 100644 --- a/geography/merkaartor/Makefile +++ b/geography/merkaartor/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.45 2013/07/05 13:29:33 ryoon Exp $ +# $NetBSD: Makefile,v 1.46 2013/08/27 15:51:26 joerg Exp $ # DISTNAME= merkaartor-0.17.2 -PKGREVISION= 21 +PKGREVISION= 22 CATEGORIES= geography MASTER_SITES= http://merkaartor.be/attachments/download/253/ EXTRACT_SUFX= .tar.bz2 diff --git a/geography/merkaartor/distinfo b/geography/merkaartor/distinfo index 6360d67039d..81d18d43971 100644 --- a/geography/merkaartor/distinfo +++ b/geography/merkaartor/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2013/05/25 23:43:25 joerg Exp $ +$NetBSD: distinfo,v 1.12 2013/08/27 15:51:26 joerg Exp $ SHA1 (merkaartor-0.17.2.tar.bz2) = f789141db427bf25bb3b61801fefc98ab0430012 RMD160 (merkaartor-0.17.2.tar.bz2) = c5c8944872828ba5ada6003cd5821f33899da3cb @@ -10,5 +10,6 @@ SHA1 (patch-include_builtin-ggl_ggl_geometries_adapted_tuple.hpp) = 1c6537cf8774 SHA1 (patch-src_Features_Feature.h) = 1d31698414dd0da41377b776b4d6d40510413a1c SHA1 (patch-src_Features_Node.h) = 2a63be6047878b8fd31a88ef039e9ca4d050b715 SHA1 (patch-src_Features_Way.h) = 17de3e44e62124e4244a0b33f1a9f6198b89e375 +SHA1 (patch-src_ImportExport_ImportCSVDialog.cpp) = 3f0c0a03ef46be0bc9d20dfeccee3cd994ed2f57 SHA1 (patch-src_Maps_Coord.h) = 774d95301d20e11a13c60cfefac6a424fbdfa77d SHA1 (patch-src_Maps_Projection.h) = f75dabd1ca64844aaab0255fa3b61d7143bece73 diff --git a/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp b/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp new file mode 100644 index 00000000000..f29d3e6e80f --- /dev/null +++ b/geography/merkaartor/patches/patch-src_ImportExport_ImportCSVDialog.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-src_ImportExport_ImportCSVDialog.cpp,v 1.1 2013/08/27 15:51:27 joerg Exp $ + +--- src/ImportExport/ImportCSVDialog.cpp.orig 2013-08-27 15:03:55.000000000 +0000 ++++ src/ImportExport/ImportCSVDialog.cpp +@@ -518,7 +518,7 @@ void ImportCSVDialog::on_btSave_clicked( + if (tDelim == "\t") + tDelim = "tab"; + root.setAttribute("delimiter", tDelim); +- root.setAttribute("header", ui->cbHasHeader->isChecked() ? "true" : false); ++ root.setAttribute("header", ui->cbHasHeader->isChecked() ? "true" : "false"); + root.setAttribute("from", QString::number(ui->sbFrom->value())); + root.setAttribute("to", QString::number(ui->sbTo->value())); + |