- Update to 1.1.0

PR:		155066
Submitted by:	maintainer

5 files changed, 66 insertions, 3 deletions

diff --git a/astro/qlandkartegt/Makefile b/astro/qlandkartegt/Makefile
index 793e01ca9405..5c2503e9b0f7 100644
--- a/astro/qlandkartegt/Makefile
+++ b/astro/qlandkartegt/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qlandkartegt
-PORTVERSION=	1.0.1
+PORTVERSION=	1.1.0
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/QLandkarteGT%20${PORTVERSION}
 
@@ -28,6 +28,10 @@ SUB_FILES=	qlandkartegt
 
 MAN1=		qlandkartegt.1
 
+post-patch:
+	cd ${WRKSRC}/src/icons/cache/ &&\
+	for f in *" "*; do ${MV} "$$f" $${f% *}-$${f#* } ; done
+
 post-install:
 	${MV} ${PREFIX}/bin/qlandkartegt ${PREFIX}/bin/qlandkartegt.bin
 	${INSTALL_SCRIPT} ${WRKDIR}/qlandkartegt ${PREFIX}/bin
diff --git a/astro/qlandkartegt/distinfo b/astro/qlandkartegt/distinfo
index 8205542c42b5..e09bcd1cdea4 100644
--- a/astro/qlandkartegt/distinfo
+++ b/astro/qlandkartegt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qlandkartegt-1.0.1.tar.gz) = 1b6b720903e52c6a14a08978d468456bdcb6d61e8f2b7ec97dd673251009c2af
-SIZE (qlandkartegt-1.0.1.tar.gz) = 3867492
+SHA256 (qlandkartegt-1.1.0.tar.gz) = 95dda0cbb1b92defa43d0fcd13c42a5bd20f4e350b51b6fd78ce4106230041d3
+SIZE (qlandkartegt-1.1.0.tar.gz) = 3954886
diff --git a/astro/qlandkartegt/files/patch-src__CDBus.h b/astro/qlandkartegt/files/patch-src__CDBus.h
new file mode 100644
index 000000000000..63481d5bd6f8
--- /dev/null
+++ b/astro/qlandkartegt/files/patch-src__CDBus.h
@@ -0,0 +1,10 @@
+--- ./src/CDBus.h.orig	2011-02-16 22:32:47.000000000 +0200
++++ ./src/CDBus.h	2011-02-26 17:27:33.000000000 +0200
+@@ -34,7 +34,6 @@
+         void loadGeoData(const QString& filename);
+         void zoomToRect(const double lon1, const double lat1, const double lon2, const double lat2);
+         void setWaypointIcon(const QString& name, const QByteArray& data);
+-//        void setWaypointIconFile(const QString& name, const QString& filename);
+ 
+     private:
+         friend class CMainWindow;
diff --git a/astro/qlandkartegt/files/patch-src__WptIcons.cpp b/astro/qlandkartegt/files/patch-src__WptIcons.cpp
new file mode 100644
index 000000000000..553fe9bd6b6d
--- /dev/null
+++ b/astro/qlandkartegt/files/patch-src__WptIcons.cpp
@@ -0,0 +1,25 @@
+--- ./src/WptIcons.cpp.orig	2011-02-16 22:32:47.000000000 +0200
++++ ./src/WptIcons.cpp	2011-02-26 17:27:33.000000000 +0200
+@@ -102,15 +102,15 @@
+     setWptIconByName("Custom 23", cfg.value("garmin/icons/custom23", ":/icons/wpt/custom15x15.bmp").toString());
+     setWptIconByName("Custom 24", cfg.value("garmin/icons/custom24", ":/icons/wpt/custom15x15.bmp").toString());
+ 
+-    setWptIconByName("Traditional Cache", ":/icons/cache/Traditional Cache.png");
++    setWptIconByName("Traditional Cache", ":/icons/cache/Traditional-Cache.png");
+     setWptIconByName("Multi-cache", ":/icons/cache/Multi-cache.png");
+-    setWptIconByName("Unknown Cache", ":/icons/cache/Unknown Cache.png");
+-    setWptIconByName("Wherigo Cache", ":/icons/cache/Wherigo Cache.png");
+-    setWptIconByName("Event Cache", ":/icons/cache/Event Cache.png");
++    setWptIconByName("Unknown Cache", ":/icons/cache/Unknown-Cache.png");
++    setWptIconByName("Wherigo Cache", ":/icons/cache/Wherigo-Cache.png");
++    setWptIconByName("Event Cache", ":/icons/cache/Event-Cache.png");
+     setWptIconByName("Earthcache", ":/icons/cache/Earthcache.png");
+-    setWptIconByName("Letterbox Hybrid", ":/icons/cache/Letterbox Hybrid.png");
+-    setWptIconByName("Virtual Cache", ":/icons/cache/Virtual Cache.png");
+-    setWptIconByName("Webcam Cache", ":/icons/cache/Webcam Cache.png");
++    setWptIconByName("Letterbox Hybrid", ":/icons/cache/Letterbox-Hybrid.png");
++    setWptIconByName("Virtual Cache", ":/icons/cache/Virtual-Cache.png");
++    setWptIconByName("Webcam Cache", ":/icons/cache/Webcam-Cache.png");
+ 
+     QDir dirIcon(QDir::home().filePath(CONFIGDIR));
+     dirIcon.mkdir("WaypointIcons");
diff --git a/astro/qlandkartegt/files/patch-src__resources.qrc b/astro/qlandkartegt/files/patch-src__resources.qrc
new file mode 100644
index 000000000000..8be4548bb075
--- /dev/null
+++ b/astro/qlandkartegt/files/patch-src__resources.qrc
@@ -0,0 +1,24 @@
+--- ./src/resources.qrc.orig	2011-02-16 22:32:47.000000000 +0200
++++ ./src/resources.qrc	2011-02-26 17:27:33.000000000 +0200
+@@ -465,14 +465,14 @@
+         <file>webstuff/frame_top.png</file>
+         <file>webstuff/frame_top_left.png</file>
+         <file>icons/cache/Earthcache.png</file>
+-        <file>icons/cache/Event Cache.png</file>
++        <file>icons/cache/Event-Cache.png</file>
+         <file>icons/cache/Multi-cache.png</file>
+-        <file>icons/cache/Traditional Cache.png</file>
+-        <file>icons/cache/Wherigo Cache.png</file>
+-        <file>icons/cache/Unknown Cache.png</file>
+-        <file>icons/cache/Letterbox Hybrid.png</file>
+-        <file>icons/cache/Virtual Cache.png</file>
+-        <file>icons/cache/Webcam Cache.png</file>
++        <file>icons/cache/Traditional-Cache.png</file>
++        <file>icons/cache/Wherigo-Cache.png</file>
++        <file>icons/cache/Unknown-Cache.png</file>
++        <file>icons/cache/Letterbox-Hybrid.png</file>
++        <file>icons/cache/Virtual-Cache.png</file>
++        <file>icons/cache/Webcam-Cache.png</file>
+         <file>icons/cache/found8x8.png</file>
+         <file>webstuff/scale.png</file>
+     </qresource>