Attachment #225224 for bug #256123

View | Details | Raw Unified | Return to bug 256123
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/astro/qmapshack/Makefile (-2 / +1 lines)
1	# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>	1	# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
2		2
3	PORTNAME= qmapshack	3	PORTNAME= qmapshack
4	PORTVERSION= 1.15.2	4	PORTVERSION= 1.16.0
5	PORTREVISION= 1
6	DISTVERSIONPREFIX= V_	5	DISTVERSIONPREFIX= V_
7	CATEGORIES= astro	6	CATEGORIES= astro
8		7

Lines 1-3 Link Here

(-)b/astro/qmapshack/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1610218166	1	TIMESTAMP = 1621864013
2	SHA256 (Maproom-qmapshack-V_1.15.2_GH0.tar.gz) = 35831d703ef3decc83f168a020144ec89907f484485b242be24fd2e094898857	2	SHA256 (Maproom-qmapshack-V_1.16.0_GH0.tar.gz) = 0beae1063fc17c033e6084ea71bc0cc95de505f6fc04da9cf8b70f8003df4302
3	SIZE (Maproom-qmapshack-V_1.15.2_GH0.tar.gz) = 46899954	3	SIZE (Maproom-qmapshack-V_1.16.0_GH0.tar.gz) = 54233332




--- CMakeLists.txt.orig	2021-05-24 09:18:08 UTC
+++ CMakeLists.txt
@@ -47,6 +47,7 @@ include(TranslateDesktop)
 include(DefineCMakeDefaults)
 include(DefineCompilerFlags)
 include(DefineInstallationPaths)

 include(CPackConfig.cmake)
 include(ConfigureChecks.cmake)
 
@@ -151,7 +152,10 @@ find_package(Qt5WebEngineWidgets    REQUIRED)
 find_package(Qt5Qml                 REQUIRED)
 find_package(Qt5Help                REQUIRED)
 find_package(GDAL                   REQUIRED)
-find_package(PROJ                   REQUIRED)
+find_package(PROJ)
+if (NOT PROJ_FOUND)
+  pkg_search_module(PROJ REQUIRED proj)
+endif()
 find_package(JPEG                   REQUIRED)
 find_package(ROUTINO                REQUIRED)
 find_package(QuaZip-Qt5             REQUIRED)
+find_package(QuaZip-Qt5             REQUIRED)
 find_package(ALGLIB                         ) # optional as we can use our local version
 
 




--- src/qmapshack/CMakeLists.txt.orig	2021-05-24 14:06:57 UTC
+++ src/qmapshack/CMakeLists.txt
@@ -971,7 +971,7 @@ target_link_libraries(${APPLICATION_NAME}
     ${PROJ4_INCLUDE_DIRS}
     ${ROUTINO_INCLUDE_DIRS}
     ${ALGLIB_INCLUDE_DIRS}
-    ${QUAZIP_INCLUDE_DIRS}
 )
 
 if(APPLE)
@@ -941,12 +940,12 @@ target_link_libraries(${APPLICATION_NAME}
     Qt5::Qml
     Qt5::Positioning
     Qt5::Help
+    QuaZip::QuaZip
     ${DBUS_LIB}
     ${GDAL_LIBRARIES}
-    ${PROJ_LIBRARIES}
+    ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
     ${ROUTINO_LIBRARIES}
     ${ALGLIB_LIBRARIES}
     QuaZip::QuaZip
 )
 
 if(APPLE)

Lines 1-8 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_device_CDeviceWatcherLinux.cpp (-2 / +2 lines)
1	--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2019-11-01 16:47:46 UTC	1	--- src/qmapshack/device/CDeviceWatcherLinux.cpp.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmapshack/device/CDeviceWatcherLinux.cpp	2	+++ src/qmapshack/device/CDeviceWatcherLinux.cpp
3	@@ -58,6 +58,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO	3	@@ -58,6 +58,10 @@ void CDeviceWatcherLinux::slotDeviceAdded(const QDBusO
4	// create path of to drive the block device belongs to	4	// create path of to drive the block device belongs to
5	QDBusInterface * blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this);	5	QDBusInterface* blockIface = new QDBusInterface("org.freedesktop.UDisks2", path.path(), "org.freedesktop.UDisks2.Block", QDBusConnection::systemBus(), this);
6	QDBusObjectPath drive_object = blockIface->property("Drive").value<QDBusObjectPath>();	6	QDBusObjectPath drive_object = blockIface->property("Drive").value<QDBusObjectPath>();
7	+ if(drive_object.path() == nullptr)	7	+ if(drive_object.path() == nullptr)
8	+ {	8	+ {




--- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig	2021-05-24 09:18:08 UTC
+++ src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
@@ -24,7 +24,7 @@
 #include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
 #include "helpers/CWebPage.h"
 #include "setup/IAppSetup.h"
 
-#include <JlCompress.h>
+#include <quazip/JlCompress.h>
 #include <proj_api.h>
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QNetworkReply>

Lines 1-7 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_gis_wpt_CGisItemWpt.cpp (-3 / +3 lines)
1	--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2020-05-21 11:11:11 UTC	1	--- src/qmapshack/gis/wpt/CGisItemWpt.cpp.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmapshack/gis/wpt/CGisItemWpt.cpp	2	+++ src/qmapshack/gis/wpt/CGisItemWpt.cpp
3	@@ -38,6 +38,7 @@	3	@@ -40,6 +40,7 @@
4		4	#include <QPainterPath>
5	#include <QtWidgets>	5	#include <QtWidgets>
6	#include <QtXml>	6	#include <QtXml>
7	+#include <QPainterPath>	7	+#include <QPainterPath>

Lines 1-7 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_helpers_CDraw.cpp (-3 / +3 lines)
1	--- src/qmapshack/helpers/CDraw.cpp.orig 2020-05-21 11:11:11 UTC	1	--- src/qmapshack/helpers/CDraw.cpp.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmapshack/helpers/CDraw.cpp	2	+++ src/qmapshack/helpers/CDraw.cpp
3	@@ -24,6 +24,7 @@	3	@@ -25,6 +25,7 @@
4	#include <QImage>	4	#include <QPainterPath>
5	#include <QPointF>	5	#include <QPointF>
6	#include <QtMath>	6	#include <QtMath>
7	+#include <QPainterPath>	7	+#include <QPainterPath>

Lines 1-8 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_map_CMapIMG.cpp (-3 / +3 lines)
1	--- src/qmapshack/map/CMapIMG.cpp.orig 2020-05-21 11:11:11 UTC	1	--- src/qmapshack/map/CMapIMG.cpp.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmapshack/map/CMapIMG.cpp	2	+++ src/qmapshack/map/CMapIMG.cpp
3	@@ -33,6 +33,7 @@	3	@@ -34,6 +34,7 @@
4	#include "units/IUnit.h"
5		4
		5	#include <QPainterPath>
6	#include <QtWidgets>	6	#include <QtWidgets>
7	+#include <QPainterPath>	7	+#include <QPainterPath>
8		8

Lines 1-10 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_mouse_IMouseSelect.cpp (-4 / +4 lines)
1	--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2020-05-21 11:11:11 UTC	1	--- src/qmapshack/mouse/IMouseSelect.cpp.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmapshack/mouse/IMouseSelect.cpp	2	+++ src/qmapshack/mouse/IMouseSelect.cpp
3	@@ -23,6 +23,7 @@	3	@@ -24,6 +24,7 @@
4	#include "mouse/IScrOpt.h"
5		4
		5	#include <QPainterPath>
6	#include <QtWidgets>	6	#include <QtWidgets>
7	+#include <QPainterPath>	7	+#include <QPainterPath>
8		8
9	IMouseSelect::IMouseSelect(CGisDraw gis, CCanvas canvas, CMouseAdapter *mouse)	9	IMouseSelect::IMouseSelect(CGisDraw* gis, CCanvas* canvas, CMouseAdapter* mouse)
10	: IMouse(gis, canvas, mouse)	10	: IMouse(gis, canvas, mouse)

Lines 1-11 Link Here

(-)b/astro/qmapshack/files/patch-src_qmaptool_CMakeLists.txt (-4 / +4 lines)
1	--- src/qmaptool/CMakeLists.txt.orig 2020-03-27 08:07:31 UTC	1	--- src/qmaptool/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmaptool/CMakeLists.txt	2	+++ src/qmaptool/CMakeLists.txt
3	@@ -254,7 +254,7 @@ target_link_libraries(${APPLICATION_NAME}	3	@@ -259,7 +259,7 @@ target_link_libraries(${APPLICATION_NAME}
4	Qt5::Network	4	Qt5::Network
5	Qt5::Help	5	Qt5::Help
6	${GDAL_LIBRARIES}	6	${GDAL_LIBRARIES}
7	- ${PROJ4_LIBRARIES}	7	- ${PROJ_LIBRARIES}
8	+ ${PROJ4_LDFLAGS} ${PROJ4_LIBRARIES}	8	+ ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
9	)	9	)
10		10
11	if(APPLE)	11	if(APPLE)




--- src/qmt_map2jnx/CMakeLists.txt.orig	2021-05-24 09:18:08 UTC
+++ src/qmt_map2jnx/CMakeLists.txt
@@ -53,7 +53,7 @@ TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
     Qt5::Core
     Qt5::Gui
     ${GDAL_LIBRARIES}
-    ${PROJ_LIBRARIES}
+    ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
     ${JPEG_LIBRARIES})
 
 install(
     TARGETS ${APPLICATION_NAME} DESTINATION ${BIN_INSTALL_DIR}




--- src/qmt_rgb2pct/CMakeLists.txt.orig	2021-05-24 09:18:08 UTC
+++ src/qmt_rgb2pct/CMakeLists.txt
@@ -92,7 +92,7 @@ target_compile_definitions(${APPLICATION_NAME} PUBLIC
 target_link_libraries(${APPLICATION_NAME}
     Qt5::Core
     ${GDAL_LIBRARIES}
-    ${PROJ_LIBRARIES}
+    ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
 )
 
 if(APPLE)
- 

Return to bug 256123

Lines 1-6 Link Here

(-)b/astro/qmapshack/files/patch-CMakeLists.txt (-12 / +8 lines)
1	--- CMakeLists.txt.orig 2020-06-14 10:22:49 UTC	1	--- CMakeLists.txt.orig 2021-05-24 09:18:08 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -65,6 +65,7 @@ include(TranslateDesktop)	3	@@ -47,6 +47,7 @@ include(TranslateDesktop)
4	include(DefineCMakeDefaults)	4	include(DefineCMakeDefaults)
5	include(DefineCompilerFlags)	5	include(DefineCompilerFlags)
6	include(DefineInstallationPaths)	6	include(DefineInstallationPaths)
Lines 8-26 Link Here
8	include(CPackConfig.cmake)	8	include(CPackConfig.cmake)
9	include(ConfigureChecks.cmake)	9	include(ConfigureChecks.cmake)
10		10
11	@@ -167,10 +168,13 @@ find_package(Qt5WebEngineWidgets REQUIRED)	11	@@ -151,7 +152,10 @@ find_package(Qt5WebEngineWidgets REQUIRED)
12	find_package(Qt5Qml REQUIRED)	12	find_package(Qt5Qml REQUIRED)
13	find_package(Qt5Help REQUIRED)	13	find_package(Qt5Help REQUIRED)
14	find_package(GDAL REQUIRED)	14	find_package(GDAL REQUIRED)
15	-find_package(PROJ4 REQUIRED)	15	-find_package(PROJ REQUIRED)
16	+find_package(PROJ4)	16	+find_package(PROJ)
17	+if (NOT PROJ4_FOUND)	17	+if (NOT PROJ_FOUND)
18	+ pkg_search_module(PROJ4 REQUIRED proj)	18	+ pkg_search_module(PROJ REQUIRED proj)
19	+endif()	19	+endif()
20	find_package(JPEG REQUIRED)	20	find_package(JPEG REQUIRED)
21	find_package(ROUTINO REQUIRED)	21	find_package(ROUTINO REQUIRED)
22	-find_package(QuaZip5 REQUIRED)	22	find_package(QuaZip-Qt5 REQUIRED)
23	+find_package(QuaZip-Qt5 REQUIRED)
24	find_package(ALGLIB ) # optional as we can use our local version
25
26

Lines 1-25 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_CMakeLists.txt (-19 / +5 lines)
1	--- src/qmapshack/CMakeLists.txt.orig 2020-06-14 10:22:49 UTC	1	--- src/qmapshack/CMakeLists.txt.orig 2021-05-24 14:06:57 UTC
2	+++ src/qmapshack/CMakeLists.txt	2	+++ src/qmapshack/CMakeLists.txt
3	@@ -897,7 +897,6 @@ include_directories(	3	@@ -971,7 +971,7 @@ target_link_libraries(${APPLICATION_NAME}
4	${PROJ4_INCLUDE_DIRS}
5	${ROUTINO_INCLUDE_DIRS}
6	${ALGLIB_INCLUDE_DIRS}
7	- ${QUAZIP_INCLUDE_DIRS}
8	)
9
10	if(APPLE)
11	@@ -941,12 +940,12 @@ target_link_libraries(${APPLICATION_NAME}
12	Qt5::Qml
13	Qt5::Positioning
14	Qt5::Help	4	Qt5::Help
15	+ QuaZip::QuaZip
16	${DBUS_LIB}	5	${DBUS_LIB}
17	${GDAL_LIBRARIES}	6	${GDAL_LIBRARIES}
18	- ${PROJ4_LIBRARIES}	7	- ${PROJ_LIBRARIES}
19	+ ${PROJ4_LDFLAGS} ${PROJ4_LIBRARIES}	8	+ ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
20	${ROUTINO_LIBRARIES}	9	${ROUTINO_LIBRARIES}
21	${ALGLIB_LIBRARIES}	10	${ALGLIB_LIBRARIES}
22	- ${QUAZIP_LIBRARIES}	11	QuaZip::QuaZip
23	)
24
25	if(APPLE)

Lines 1-11 Link Here

(-)b/astro/qmapshack/files/patch-src_qmapshack_gis_rte_router_brouter_CRouterBRouterSetupWizard.cpp (-4 / +4 lines)
1	--- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2020-11-08 17:59:37 UTC	1	--- src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp	2	+++ src/qmapshack/gis/rte/router/brouter/CRouterBRouterSetupWizard.cpp
3	@@ -22,7 +22,7 @@	3	@@ -24,7 +24,7 @@
4	#include "gis/rte/router/brouter/CRouterBRouterSetupWizard.h"
5	#include "helpers/CWebPage.h"	4	#include "helpers/CWebPage.h"
6	#include "setup/IAppSetup.h"	5	#include "setup/IAppSetup.h"
		6
7	-#include <JlCompress.h>	7	-#include <JlCompress.h>
8	+#include <quazip/JlCompress.h>	8	+#include <quazip/JlCompress.h>
9	#include <proj_api.h>
10	#include <QFileDialog>	9	#include <QFileDialog>
11	#include <QMessageBox>	10	#include <QMessageBox>
		11	#include <QNetworkReply>

Lines 1-11 Link Here

(-)b/astro/qmapshack/files/patch-src_qmt__map2jnx_CMakeLists.txt (-8 / +8 lines)
1	--- src/qmt_map2jnx/CMakeLists.txt.orig 2020-03-27 08:07:31 UTC	1	--- src/qmt_map2jnx/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmt_map2jnx/CMakeLists.txt	2	+++ src/qmt_map2jnx/CMakeLists.txt
3	@@ -48,7 +48,7 @@ IF(WIN32)	3	@@ -53,7 +53,7 @@ TARGET_LINK_LIBRARIES(${APPLICATION_NAME}
4	ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)	4	Qt5::Core
5	ENDIF(WIN32)	5	Qt5::Gui
6		6	${GDAL_LIBRARIES}
7	-TARGET_LINK_LIBRARIES(${APPLICATION_NAME} ${GDAL_LIBRARIES} ${PROJ4_LIBRARIES} ${JPEG_LIBRARIES})	7	- ${PROJ_LIBRARIES}
8	+TARGET_LINK_LIBRARIES(${APPLICATION_NAME} ${GDAL_LIBRARIES} ${PROJ4_LDFLAGS} ${PROJ4_LIBRARIES} ${JPEG_LIBRARIES})	8	+ ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
		9	${JPEG_LIBRARIES})
9		10
10	install(	11	install(
11	TARGETS ${APPLICATION_NAME} DESTINATION ${BIN_INSTALL_DIR}

Lines 1-11 Link Here

(-)b/astro/qmapshack/files/patch-src_qmt__rgb2pct_CMakeLists.txt (-4 / +3 lines)
1	--- src/qmt_rgb2pct/CMakeLists.txt.orig 2020-03-27 08:07:31 UTC	1	--- src/qmt_rgb2pct/CMakeLists.txt.orig 2021-05-24 09:18:08 UTC
2	+++ src/qmt_rgb2pct/CMakeLists.txt	2	+++ src/qmt_rgb2pct/CMakeLists.txt
3	@@ -92,7 +92,7 @@ target_compile_definitions(${APPLICATION_NAME} PUBLIC	3	@@ -92,7 +92,7 @@ target_compile_definitions(${APPLICATION_NAME} PUBLIC
4	target_link_libraries(${APPLICATION_NAME}	4	target_link_libraries(${APPLICATION_NAME}
5	Qt5::Core	5	Qt5::Core
6	${GDAL_LIBRARIES}	6	${GDAL_LIBRARIES}
7	- ${PROJ4_LIBRARIES}	7	- ${PROJ_LIBRARIES}
8	+ ${PROJ4_LDFLAGS} ${PROJ4_LIBRARIES}	8	+ ${PROJ_LDFLAGS} ${PROJ_LIBRARIES}
9	)	9	)
10		10
11	if(APPLE)	11	if(APPLE)
12	-