diff options
| author | amdmi3 <amdmi3@FreeBSD.org> | 2013-10-16 10:36:08 +0800 |
|---|---|---|
| committer | amdmi3 <amdmi3@FreeBSD.org> | 2013-10-16 10:36:08 +0800 |
| commit | f25de76c3f930d826b476e8a36077fa97a7f50f9 (patch) | |
| tree | 6aff7daa585b61d2bb82195b68d423fa483c7230 /astro/qlandkartegt | |
| parent | 0079329ce05e3c2cc27aef51c0db85b3f5d3c378 (diff) | |
| download | freebsd-ports-gnome-f25de76c3f930d826b476e8a36077fa97a7f50f9.tar.gz freebsd-ports-gnome-f25de76c3f930d826b476e8a36077fa97a7f50f9.tar.zst freebsd-ports-gnome-f25de76c3f930d826b476e8a36077fa97a7f50f9.zip | |
- Update to 1.7.4
- Support staging
- Fix build with clang
PR: 182191
Submitted by: Christoph Moench-Tegeder <cmt@burggraben.net>
Approved by: maintainer timeout
Diffstat (limited to 'astro/qlandkartegt')
| -rw-r--r-- | astro/qlandkartegt/Makefile | 9 | ||||
| -rw-r--r-- | astro/qlandkartegt/distinfo | 4 | ||||
| -rw-r--r-- | astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp | 11 | ||||
| -rw-r--r-- | astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp | 11 | ||||
| -rw-r--r-- | astro/qlandkartegt/files/patch-src-CMapTDB.h | 11 |
5 files changed, 39 insertions, 7 deletions
diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile index 53dfd219f8da..acd6113674fa 100644 --- a/astro/qlandkartegt/Makefile +++ b/astro/qlandkartegt/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= qlandkartegt -PORTVERSION= 1.7.3 +PORTVERSION= 1.7.4 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION} @@ -11,11 +11,10 @@ COMMENT= The ultimate outdoor aficionado's tool LICENSE= GPLv3 -LIB_DEPENDS= gdal:${PORTSDIR}/graphics/gdal \ - proj:${PORTSDIR}/graphics/proj \ - gps:${PORTSDIR}/astro/gpsd +LIB_DEPENDS= libgdal.so:${PORTSDIR}/graphics/gdal \ + libproj.so:${PORTSDIR}/graphics/proj \ + libgps.so:${PORTSDIR}/astro/gpsd -NO_STAGE= yes USES= cmake USE_QT4= dbus gui opengl network sql xml linguist_build \ moc_build uic_build rcc_build qmake_build diff --git a/astro/qlandkartegt/distinfo b/astro/qlandkartegt/distinfo index 28090fe3dff9..045cf39327ac 100644 --- a/astro/qlandkartegt/distinfo +++ b/astro/qlandkartegt/distinfo @@ -1,2 +1,2 @@ -SHA256 (qlandkartegt-1.7.3.tar.gz) = dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c -SIZE (qlandkartegt-1.7.3.tar.gz) = 8334026 +SHA256 (qlandkartegt-1.7.4.tar.gz) = d6412ae6b34c2ec8a5f929f7aa8b4d1a660f913f16ea52096f93b42d4f271daf +SIZE (qlandkartegt-1.7.4.tar.gz) = 8332394 diff --git a/astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp b/astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp new file mode 100644 index 000000000000..1f15f7956608 --- /dev/null +++ b/astro/qlandkartegt/files/patch-3rdparty-map2gcm-main.cpp @@ -0,0 +1,11 @@ +--- 3rdparty/map2gcm/main.cpp.orig 2013-06-17 16:27:54.000000000 +0400 ++++ 3rdparty/map2gcm/main.cpp 2013-09-25 08:33:07.841519182 +0400 +@@ -83,7 +83,7 @@ + if(pj) pj_free(pj); + } + +- bool operator<(const file_t& other) ++ bool operator<(const file_t& other) const + { + return (xscale < other.xscale); + } diff --git a/astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp b/astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp new file mode 100644 index 000000000000..47158e7a7792 --- /dev/null +++ b/astro/qlandkartegt/files/patch-3rdparty-map2jnx-main.cpp @@ -0,0 +1,11 @@ +--- 3rdparty/map2jnx/main.cpp.orig 2013-09-16 20:29:13.000000000 +0400 ++++ 3rdparty/map2jnx/main.cpp 2013-09-25 08:16:33.022519128 +0400 +@@ -121,7 +121,7 @@ + if(pj) pj_free(pj); + } + +- bool operator<(const file_t& other) ++ bool operator<(const file_t& other) const + { + return (xscale > other.xscale); + } diff --git a/astro/qlandkartegt/files/patch-src-CMapTDB.h b/astro/qlandkartegt/files/patch-src-CMapTDB.h new file mode 100644 index 000000000000..dae545a2770f --- /dev/null +++ b/astro/qlandkartegt/files/patch-src-CMapTDB.h @@ -0,0 +1,11 @@ +--- src/CMapTDB.h.orig 2013-08-15 19:13:38.000000000 +0400 ++++ src/CMapTDB.h 2013-09-25 08:45:54.954519968 +0400 +@@ -209,7 +209,7 @@ + quint8 level; + bool useBaseMap; + +- bool operator==(const map_level_t &ml) ++ bool operator==(const map_level_t &ml) const + { + if (ml.bits != bits || ml.level != level || ml.useBaseMap != useBaseMap) + return false; |