mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 00:43:20 +00:00
qmapshack: 1.15.2 -> 1.16.0
https://github.com/Maproom/qmapshack/releases/tag/V_1.16.0
This commit is contained in:
Robert Schütz
parent
90a8fbf146
commit
103d945f80
@ -3,13 +3,13 @@
|
||||
|
||||
mkDerivation rec {
|
||||
pname = "qmapshack";
|
||||
version = "1.15.2";
|
||||
version = "1.16.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Maproom";
|
||||
repo = pname;
|
||||
rev = "V_${version}";
|
||||
sha256 = "1l1j2axf94pdqwirwwhwy3y6k8v1aix78ifqbv6j8sv131h2j7y7";
|
||||
sha256 = "1yzgkdjxwyg8ggbxyjwr0zjrx99ckrbz2p2524iii9i7qqn8wfsx";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
@ -20,13 +20,6 @@ mkDerivation rec {
|
||||
"-DROUTINO_XML_PATH=${routino}/share/routino"
|
||||
];
|
||||
|
||||
patches = [
|
||||
"${src}/FindPROJ4.patch"
|
||||
|
||||
# Support QuaZip 1.x.
|
||||
./pr350-support-quazip-1x.patch
|
||||
];
|
||||
|
||||
qtWrapperArgs = [
|
||||
"--suffix PATH : ${lib.makeBinPath [ gdal routino ]}"
|
||||
];
|
||||
|
||||
@ -1,141 +0,0 @@
|
||||
From 8fb751c656a14020ba37fb91b7f7cba3c49d8504 Mon Sep 17 00:00:00 2001
|
||||
From: kiozen <oliver.eichler@gmx.de>
|
||||
Date: Sat, 20 Mar 2021 12:14:29 +0100
|
||||
Subject: [PATCH] [QMS-349] Upgrade to Quazip Qt5 V1.x
|
||||
|
||||
Simply adjusted the cmake scripts
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
src/qmapshack/CMakeLists.txt | 27 +++++++++++++--------------
|
||||
3 files changed, 15 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 8d2cf127..7420d9b2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -152,7 +152,7 @@ find_package(GDAL REQUIRED)
|
||||
find_package(PROJ REQUIRED)
|
||||
find_package(JPEG REQUIRED)
|
||||
find_package(ROUTINO REQUIRED)
|
||||
-find_package(QuaZip5 REQUIRED)
|
||||
+find_package(QuaZip-Qt5 REQUIRED)
|
||||
find_package(ALGLIB ) # optional as we can use our local version
|
||||
|
||||
|
||||
diff --git a/src/qmapshack/CMakeLists.txt b/src/qmapshack/CMakeLists.txt
|
||||
index 08eeb183..9b3836d6 100644
|
||||
--- a/src/qmapshack/CMakeLists.txt
|
||||
+++ b/src/qmapshack/CMakeLists.txt
|
||||
@@ -22,8 +22,8 @@ add_definitions(-DROUTINO_XML_PATH=${ROUTINO_XML_PATH})
|
||||
# All source files needed to compile
|
||||
###############################################################################################
|
||||
|
||||
-set( SRCS
|
||||
- CAbout.cpp
|
||||
+set( SRCS
|
||||
+ CAbout.cpp
|
||||
CMainWindow.cpp
|
||||
CSingleInstanceProxy.cpp
|
||||
canvas/CCanvas.cpp
|
||||
@@ -160,7 +160,7 @@ set( SRCS
|
||||
gis/trk/CInvalidTrk.cpp
|
||||
gis/trk/CKnownExtension.cpp
|
||||
gis/trk/CListTrkPts.cpp
|
||||
- gis/trk/CPropertyTrk.cpp
|
||||
+ gis/trk/CPropertyTrk.cpp
|
||||
gis/trk/CScrOptTrk.cpp
|
||||
gis/trk/CSelectActivityColor.cpp
|
||||
gis/trk/CTableTrk.cpp
|
||||
@@ -272,7 +272,7 @@ set( SRCS
|
||||
mouse/line/CLineOpMovePoint.cpp
|
||||
mouse/line/CLineOpSelectRange.cpp
|
||||
mouse/line/CScrOptEditLine.cpp
|
||||
- mouse/line/CScrOptRangeLine.cpp
|
||||
+ mouse/line/CScrOptRangeLine.cpp
|
||||
mouse/line/ILineOp.cpp
|
||||
mouse/line/IMouseEditLine.cpp
|
||||
plot/CPlot.cpp
|
||||
@@ -401,7 +401,7 @@ set( HDRS
|
||||
gis/CGisListDB.h
|
||||
gis/CGisListWks.h
|
||||
gis/CGisWorkspace.h
|
||||
- gis/CSelDevices.h
|
||||
+ gis/CSelDevices.h
|
||||
gis/IGisItem.h
|
||||
gis/IGisLine.h
|
||||
gis/Poi.h
|
||||
@@ -512,7 +512,7 @@ set( HDRS
|
||||
gis/trk/CInvalidTrk.h
|
||||
gis/trk/CKnownExtension.h
|
||||
gis/trk/CListTrkPts.h
|
||||
- gis/trk/CPropertyTrk.h
|
||||
+ gis/trk/CPropertyTrk.h
|
||||
gis/trk/CScrOptTrk.h
|
||||
gis/trk/CSelectActivityColor.h
|
||||
gis/trk/CTableTrk.h
|
||||
@@ -579,7 +579,7 @@ set( HDRS
|
||||
map/CMapList.h
|
||||
map/CMapMAP.h
|
||||
map/CMapPathSetup.h
|
||||
- map/CMapPropSetup.h
|
||||
+ map/CMapPropSetup.h
|
||||
map/CMapRMAP.h
|
||||
map/CMapTMS.h
|
||||
map/CMapVRT.h
|
||||
@@ -655,7 +655,7 @@ set( HDRS
|
||||
realtime/CRtSelectSource.h
|
||||
realtime/CRtWorkspace.h
|
||||
realtime/IRtInfo.h
|
||||
- realtime/IRtRecord.h
|
||||
+ realtime/IRtRecord.h
|
||||
realtime/IRtSource.h
|
||||
realtime/gpstether/CRtGpsTether.h
|
||||
realtime/gpstether/CRtGpsTetherInfo.h
|
||||
@@ -764,7 +764,7 @@ set( UIS
|
||||
gis/search/IGeoSearchWebConfigDialog.ui
|
||||
gis/search/ISearchExplanationDialog.ui
|
||||
gis/summary/IGisSummary.ui
|
||||
- gis/summary/IGisSummarySetup.ui
|
||||
+ gis/summary/IGisSummarySetup.ui
|
||||
gis/trk/ICombineTrk.ui
|
||||
gis/trk/ICutTrk.ui
|
||||
gis/trk/IDetailsTrk.ui
|
||||
@@ -818,7 +818,7 @@ set( UIS
|
||||
mouse/range/IActionSelect.ui
|
||||
mouse/range/IRangeToolSetup.ui
|
||||
mouse/range/IScrOptRangeTool.ui
|
||||
- mouse/range/IScrOptRangeTrk.ui
|
||||
+ mouse/range/IScrOptRangeTrk.ui
|
||||
mouse/IScrOptRuler.ui
|
||||
mouse/IScrOptSelect.ui
|
||||
mouse/line/IScrOptEditLine.ui
|
||||
@@ -899,7 +899,6 @@ include_directories(
|
||||
${PROJ_INCLUDE_DIRS}
|
||||
${ROUTINO_INCLUDE_DIRS}
|
||||
${ALGLIB_INCLUDE_DIRS}
|
||||
- ${QUAZIP_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
@@ -934,10 +933,10 @@ endif(Qt5DBus_FOUND)
|
||||
|
||||
target_link_libraries(${APPLICATION_NAME}
|
||||
Qt5::Widgets
|
||||
- Qt5::Xml
|
||||
+ Qt5::Xml
|
||||
Qt5::Sql
|
||||
Qt5::PrintSupport
|
||||
- Qt5::UiTools
|
||||
+ Qt5::UiTools
|
||||
Qt5::Network
|
||||
Qt5::WebEngineWidgets
|
||||
Qt5::Qml
|
||||
@@ -947,7 +946,7 @@ target_link_libraries(${APPLICATION_NAME}
|
||||
${PROJ_LIBRARIES}
|
||||
${ROUTINO_LIBRARIES}
|
||||
${ALGLIB_LIBRARIES}
|
||||
- ${QUAZIP_LIBRARIES}
|
||||
+ QuaZip::QuaZip
|
||||
)
|
||||
|
||||
if(APPLE)
|
||||
Loading…
Reference in New Issue
Block a user