[Git][debian-gis-team/qmapshack][master] 4 commits: New upstream version 1.15.2

Bas Couwenberg gitlab at salsa.debian.org
Mon Dec 7 17:00:16 GMT 2020



Bas Couwenberg pushed to branch master at Debian GIS Project / qmapshack


Commits:
4ad323c8 by Bas Couwenberg at 2020-12-07T17:32:14+01:00
New upstream version 1.15.2
- - - - -
efa23e32 by Bas Couwenberg at 2020-12-07T17:33:54+01:00
Update upstream source from tag 'upstream/1.15.2'

Update to upstream version '1.15.2'
with Debian dir fa4e3441fed2828b06b710703482aeffc098228b
- - - - -
184892ba by Bas Couwenberg at 2020-12-07T17:34:39+01:00
New upstream release.

- - - - -
0412d16c by Bas Couwenberg at 2020-12-07T17:35:42+01:00
Set distribution to unstable.

- - - - -


16 changed files:

- CMakeLists.txt
- changelog.txt
- debian/changelog
- msvc_64/3rdparty.txt
- msvc_64/QMapShack_Installer.nsi
- msvc_64/cmake/FindPROJ4.cmake
- msvc_64/copyfiles.bat
- src/qmapshack/doc/QMSHelp.qch
- src/qmapshack/doc/QMSHelp.qhc
- src/qmapshack/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
- src/qmapshack/gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
- src/qmapshack/gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h
- src/qmapshack/gis/trk/CGisItemTrk.cpp
- src/qmapshack/mouse/range/CScrOptRangeTool.cpp
- src/qmaptool/doc/QMTHelp.qch
- src/qmaptool/doc/QMTHelp.qhc


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -40,7 +40,7 @@ endif(((EXISTS ${DEBIAN_RELEASE_INFO}) AND (${YEAR} LESS ${EXPIRE_YEAR})) OR APP
 # Define project name and version tags
 ###############################################################################################
 # this is not only the QMS version it will be the package version, too.
-project(QMapShack VERSION 1.15.1)
+project(QMapShack VERSION 1.15.2)
 
 # FOR A RELEASE:
 # remove "development" for a release
@@ -107,7 +107,7 @@ if (APPLE)
 endif(APPLE)
 
 if(WIN32)
-    set(QT_DEV_PATH   "C:\\Qt5\\5.12.3\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt5\\5.12.3\\msvc2017_64")
+    set(QT_DEV_PATH   "C:\\Qt\\5.12.10\\msvc2017_64" CACHE PATH "Path to directory containing Qt5 include and lib, e.g. C:\\Qt\\5.12.10\\msvc2017_64")
     set(GDAL_DEV_PATH "C:\\GDAL" CACHE PATH "Path to directory containing GDAL include and lib, e.g. M:\\lib\\gdal")
     set(PROJ4_DEV_PATH "C:\\PROJ6" CACHE PATH "Path to directory containing PROJ.4 include and lib, e.g. M:\\lib\\PROJ6")
     set(ROUTINO_DEV_PATH "C:\\routino" CACHE PATH "Path to directory containing routino include and lib, e.g. M:\\lib\\routino")


=====================================
changelog.txt
=====================================
@@ -1,3 +1,10 @@
+V1.15.2
+[QMS-264] Windows: adapt build scripts for 1.15.1 release
+[QMS-265] Configuring BRouter offline on MacOS crashes
+[QMS-268] Crash after closing project where range is being selected
+[QMS-270] Windows: rename LICENSE file to 1LICENSE.txt
+[QMS-273] Windows: install Help search index files
+
 V1.15.1
 [QMS-158] Change Routino Profiles search for [prefix-]profiles.xml
 [QMS-216] QMapShack does not compile with Qt-5.15


=====================================
debian/changelog
=====================================
@@ -1,8 +1,9 @@
-qmapshack (1.15.1-2) UNRELEASED; urgency=medium
+qmapshack (1.15.2-1) unstable; urgency=medium
 
+  * New upstream release.
   * Bump Standards-Version to 4.5.1, no changes.
 
- -- Bas Couwenberg <sebastic at debian.org>  Sat, 28 Nov 2020 14:21:27 +0100
+ -- Bas Couwenberg <sebastic at debian.org>  Mon, 07 Dec 2020 17:35:29 +0100
 
 qmapshack (1.15.1-1) unstable; urgency=medium
 


=====================================
msvc_64/3rdparty.txt
=====================================
@@ -2,11 +2,13 @@
 #         QMapShack for Windows dependencies                #
 #############################################################
 This installation of QMapShack for Windows (short: QMS) 
-has been build with Visual Studio 2013 as 64bit application.
+has been build with Visual Studio 2017 as 64bit application.
 
 If you want to build QMS on your own, have a look at
 https://github.com/Maproom/qmapshack/wiki/BuildWindowsVisualStudio
 
+The QMS source code is available at https://github.com/Maproom/qmapshack
+
 Dependencies
 ============
 QMS depends on the 3rd party software listed below:
@@ -19,9 +21,9 @@ QMS depends on the 3rd party software listed below:
   Note: Those runtime libraries may already be contained in Windows 10 installations.
 
 2.) Qt5 runtime libraries
-  The Qt DLL's are deployed in the QMS installation directory. 
-  They are part of Qt which you can download here:
-    http://qt-project.org/downloads
+  The Qt libraries are deployed in the QMS installation directory.
+  Qt is used according the GPLv3 open source License
+    See https://www.qt.io/download-open-source and https://www.gnu.org/licenses/gpl-3.0.html
 
 3.) The GDAL library, http://www.gdal.org/
 
@@ -60,3 +62,6 @@ QMS depends on the 3rd party software listed below:
 
 12.) sqlite
   The source code can be downloaded from https://www.sqlite.org/download.html
+
+13.) QuaZIP
+  The source code can be downloaded from https://stachenov.github.io/quazip/
\ No newline at end of file


=====================================
msvc_64/QMapShack_Installer.nsi
=====================================
@@ -123,12 +123,19 @@ Section "QMapShack" QMapShack
     File Files\translations\qmapshack_*.qm
     File Files\translations\qmaptool_*.qm
   SetOutPath "$INSTDIR\doc\HTML"
-    File Files\doc\HTML\QMSHelp.*
-    File Files\doc\HTML\QMTHelp.*
+    File Files\doc\HTML\QMSHelp.qch
+    File Files\doc\HTML\QMSHelp.qhc
+    File Files\doc\HTML\QMTHelp.qch
+    File Files\doc\HTML\QMTHelp.qhc
+SetOutPath "$INSTDIR\doc\HTML\.QMSHelp"
+    File Files\doc\HTML\.QMSHelp\fts
+SetOutPath "$INSTDIR\doc\HTML\.QMTHelp"
+    File Files\doc\HTML\.QMTHelp\fts
   ;END QMapShack Files
 
   ;BEGIN Qt Files
   SetOutPath $INSTDIR
+    File Files\assistant.exe
     File Files\Qt5Core.dll
     File Files\Qt5Gui.dll
     File Files\Qt5Help.dll
@@ -164,7 +171,7 @@ Section "QMapShack" QMapShack
 
   SetOutPath "$INSTDIR\sqldrivers\"
     File Files\sqldrivers\qsqlite.dll
-    File Files\sqldrivers\qsqlmysql.dll
+    ;File Files\sqldrivers\qsqlmysql.dll
     File Files\sqldrivers\qsqlodbc.dll
     File Files\sqldrivers\qsqlpsql.dll
 
@@ -197,7 +204,7 @@ Section "QMapShack" QMapShack
 
   ;BEGIN PROJ.4 Files    
   SetOutPath $INSTDIR
-    File Files\proj_6_2.dll
+    File Files\proj_6_3.dll
     File Files\proj.exe
     File Files\projinfo.exe
     File Files\cct.exe
@@ -247,12 +254,13 @@ Section "QMapShack" QMapShack
     File Files\libmysql.dll  
     File Files\3rdparty.txt
     File Files\qt.conf
+    File Files\1LICENSE.txt
   ;END additional Files
 
   ;BEGIN OpenSSL Files
-    ;File Files\libeay32.dll
-    ;File Files\ssleay32.dll
-    ;File Files\openssl.exe
+    File Files\libcrypto-1_1-x64.dll
+    File Files\libssl-1_1-x64.dll
+    File Files\openssl.exe
   ;END OpenSSL Files
 
 
@@ -278,14 +286,13 @@ Section "StartMenue" StartMenue
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
     ;Create shortcuts
     CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://github.com/Maproom/qmapshack/wiki" "" "$INSTDIR\kfm_home.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk" "$INSTDIR\qmapshack.exe" "--style fusion" "$INSTDIR\QMapShack.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk" "$INSTDIR\qmaptool.exe" "--style fusion" "$INSTDIR\QMapTool.ico"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk" "https://github.com/Maproom/qmapshack/wiki" "" "$INSTDIR\kfm_home.ico"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Help.lnk" "https://github.com/Maproom/qmapshack/wiki/DocMain" "" "$INSTDIR\Help.ico"
-    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\gdal.org.lnk" "http://www.gdal.org/" "" "$INSTDIR\gdalicon.ico"
     CreateShortCut "$SMPROGRAMS\$StartMenuFolder\GDAL shell.lnk" %COMSPEC% "/k $\"$INSTDIR\gdal_shell.bat$\"" "" "" "" "" "GDAL shell"
-   !insertmacro MUI_STARTMENU_WRITE_END
+    CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+
+    !insertmacro MUI_STARTMENU_WRITE_END
 
   ;Create registry entries
   WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\QMapShack" "DisplayName" "QMapShack (remove only)"
@@ -318,13 +325,13 @@ Section "Uninstall"
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder
 
-  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\QMapShack.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\QMapShack Help.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\QMapTool.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\qmapshack.org.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\Help.lnk"
-  Delete "$SMPROGRAMS\$StartMenuFolder\gdal.org.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\QMapTool Help.lnk"
   Delete "$SMPROGRAMS\$StartMenuFolder\GDAL shell.lnk"
+  Delete "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk"
   
   RMDir "$SMPROGRAMS\$StartMenuFolder"
 


=====================================
msvc_64/cmake/FindPROJ4.cmake
=====================================
@@ -40,9 +40,11 @@ endif(WIN32)
 
   find_library(LIBPROJ4_LIBRARY
     NAMES
+        proj
         proj_6_0
         proj_6_1
         proj_6_2
+        proj_6_3
     PATHS
 if(WIN32)
       ${PROJ4_DEV_PATH}/lib


=====================================
msvc_64/copyfiles.bat
=====================================
@@ -3,7 +3,7 @@ rem Please adapt environment variables in section 1) to your system
 
 
 rem Section 1.) Define path to Qt, MSVC, .... installations
-set QMSI_QT_PATH="C:\Qt5\5.12.3\msvc2017_64"
+set QMSI_QT_PATH="C:\Qt\5.12.10\msvc2017_64"
 rem get the VC redistributable installer from https://support.microsoft.com/en-us/help/2977003/the-latest-supported-visual-c-downloads
 set QMSI_VCREDIST_PATH="M:\deploy_2017"
 set QMSI_GDAL_PATH="M:\lib2017\gdal"
@@ -18,7 +18,7 @@ set QMSI_MGW6_PATH="M:\lib2017\mingw64"
 rem runtime libraries from mysql/mariadb - see 3rdparty.txt from where to get - could this be optional?
 set QMSI_MSQL_PATH="M:\lib2017\mysql"
 rem uncomment the following line if you want OpenSSL
-rem set QMSI_OSSL_PATH="M:\deploy_2017"
+set QMSI_OSSL_PATH="M:\deploy_2017"
 rem And finally of course the path to your build directory!
 set QMSI_BUILD_PATH="..\..\build\"
 
@@ -29,6 +29,7 @@ cd Files
 
 rem Section 2.1) Copy Qt files
 rem Note: Qt5WebEngine deployment is super crazy - see https://doc.qt.io/qt-5.12/qtwebengine-deploying.html
+copy %QMSI_QT_PATH%\bin\assistant.exe
 copy %QMSI_QT_PATH%\bin\Qt5Core.dll
 copy %QMSI_QT_PATH%\bin\Qt5Gui.dll
 copy %QMSI_QT_PATH%\bin\Qt5Help.dll
@@ -39,6 +40,7 @@ copy %QMSI_QT_PATH%\bin\Qt5OpenGL.dll
 copy %QMSI_QT_PATH%\bin\Qt5Positioning.dll
 copy %QMSI_QT_PATH%\bin\Qt5PrintSupport.dll
 copy %QMSI_QT_PATH%\bin\Qt5Qml.dll
+copy %QMSI_QT_PATH%\bin\Qt5QmlModels.dll
 copy %QMSI_QT_PATH%\bin\Qt5Quick.dll
 copy %QMSI_QT_PATH%\bin\Qt5QuickWidgets.dll
 copy %QMSI_QT_PATH%\bin\Qt5Sensors.dll
@@ -65,7 +67,7 @@ cd ..
 mkdir sqldrivers
 cd sqldrivers
 copy %QMSI_QT_PATH%\plugins\sqldrivers\qsqlite.dll
-copy %QMSI_QT_PATH%\plugins\sqldrivers\qsqlmysql.dll
+rem copy %QMSI_QT_PATH%\plugins\sqldrivers\qsqlmysql.dll
 copy %QMSI_QT_PATH%\plugins\sqldrivers\qsqlodbc.dll
 copy %QMSI_QT_PATH%\plugins\sqldrivers\qsqlpsql.dll
 cd ..
@@ -98,7 +100,7 @@ copy %QMSI_GDAL_PATH%\bin\*.dll
 copy %QMSI_GDAL_PATH%\bin\*.exe
 rem section 2.2.4) PROJ.4
 xcopy %QMSI_PROJ_PATH%\share share /s /i
-copy %QMSI_PROJ_PATH%\bin\proj_6_2.dll
+copy %QMSI_PROJ_PATH%\bin\proj_6_3.dll
 copy %QMSI_PROJ_PATH%\bin\proj.exe
 copy %QMSI_PROJ_PATH%\bin\projinfo.exe
 copy %QMSI_PROJ_PATH%\bin\cct.exe
@@ -126,9 +128,9 @@ copy %QMSI_SQLI_PATH%\sqldiff.exe
 copy %QMSI_SQLI_PATH%\sqlite3.exe
 copy %QMSI_SQLI_PATH%\sqlite3_analyzer.exe
 rem uncomment the following line if you want OpenSSL
-rem copy %QMSI_OSSL_PATH%\libeay32.dll
-rem copy %QMSI_OSSL_PATH%\ssleay32.dll
-rem copy %QMSI_OSSL_PATH%\openssl.exe
+copy %QMSI_OSSL_PATH%\libcrypto-1_1-x64.dll
+copy %QMSI_OSSL_PATH%\libssl-1_1-x64.dll
+copy %QMSI_OSSL_PATH%\openssl.exe
 
 
 rem section 2.3) Copy MSVC Redist Files
@@ -152,8 +154,9 @@ copy ..\..\..\src\qmaptool\doc\QMTHelp.* HTML
 cd ..
 
 
-rem section 2.5) 3rd party SW description
+rem section 2.5) 3rd party SW description and LICENSE
 copy ..\3rdparty.txt
+copy ..\..\LICENSE 1LICENSE.txt
 
 rem section 2.6) qt.conf
 copy ..\qt.conf


=====================================
src/qmapshack/doc/QMSHelp.qch
=====================================
Binary files a/src/qmapshack/doc/QMSHelp.qch and b/src/qmapshack/doc/QMSHelp.qch differ


=====================================
src/qmapshack/doc/QMSHelp.qhc
=====================================
Binary files a/src/qmapshack/doc/QMSHelp.qhc and b/src/qmapshack/doc/QMSHelp.qhc differ


=====================================
src/qmapshack/gis/rte/router/brouter/CRouterBRouterTilesPage.cpp
=====================================
@@ -26,6 +26,7 @@ CRouterBRouterTilesPage::CRouterBRouterTilesPage()
     : QWizardPage()
 {
     layout = new QVBoxLayout(this);
+    setLayout(layout);
     widgetLocalTilesSelect = new CRouterBRouterTilesSelect(this);
     widgetLocalTilesSelect->setObjectName("widgetLocalTilesSelect");
     QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);


=====================================
src/qmapshack/gis/rte/router/brouter/CRouterBRouterTilesSelect.cpp
=====================================
@@ -59,6 +59,7 @@ CRouterBRouterTilesSelect::CRouterBRouterTilesSelect(QWidget *parent)
     }
 
     outerLayout = new QVBoxLayout(this);
+    setLayout(outerLayout);
     outerLayout->setContentsMargins(0, 0, 0, 0);
     widgetSelect = new QWidget(this);
     widgetSelect->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -84,11 +85,12 @@ CRouterBRouterTilesSelect::CRouterBRouterTilesSelect(QWidget *parent)
     selectArea = new CRouterBRouterTilesSelectArea(widgetSelect, canvas);
 
     QLayout * selectLayout = new CRouterBRouterTilesSelectLayout(widgetSelect);
+    widgetSelect->setLayout(selectLayout);
     selectLayout->addWidget(canvas);
     selectLayout->addWidget(selectArea);
     canvas->lower();
     canvas->show();
-    selectArea->show();
+    selectArea->show();        
 
     QHBoxLayout * statusLayout = new QHBoxLayout();
     outerLayout->addLayout(statusLayout);


=====================================
src/qmapshack/gis/rte/router/brouter/CRouterBRouterTilesSelectLayout.h
=====================================
@@ -40,9 +40,9 @@ public:
 
     void setGeometry(const QRect & r) override { for (QLayoutItem *item : items) { item->setGeometry(r); }}
 
-    QLayoutItem * itemAt(int index) const override { return items.at(index); }
+    QLayoutItem * itemAt(int index) const override { return index < items.size() ? items.at(index) : nullptr; }
 
-    QLayoutItem * takeAt(int index) override { return items.takeAt(index); }
+    QLayoutItem * takeAt(int index) override { return index < items.size() ? items.takeAt(index) : nullptr; }
 
     int count() const override { return items.size(); }
 


=====================================
src/qmapshack/gis/trk/CGisItemTrk.cpp
=====================================
@@ -313,10 +313,15 @@ CGisItemTrk::~CGisItemTrk()
     /*
         Delete all registered INotifyTrk as they can't exist without the item.
         As the INotifyTrk objects will unregister via unregisterVisual() in their
-        destructor things will get a bit complicated here. Better create
-        a copy of the list before we start to delete.
+        destructor things will get a bit complicated here. Additionally visuals
+        can be parents of other visuals. Therefor destroying one might destroy
+        others. To cover that we destroy the first object in registeredVisuals
+        until there is none left
      */
-    qDeleteAll(registeredVisuals.toList());
+    while(registeredVisuals.size())
+    {
+        delete *registeredVisuals.begin();
+    }
 
     // now it is save to destroy the details dialog
     delete dlgDetails;


=====================================
src/qmapshack/mouse/range/CScrOptRangeTool.cpp
=====================================
@@ -99,6 +99,7 @@ CScrOptRangeTool::~CScrOptRangeTool()
     trk.unregisterVisual(this);
     canvas->allowShowTrackOverlays(true);
     canvas->slotUpdateTrackInfo(false);
+    canvas->resetMouse();
 }
 
 void CScrOptRangeTool::slotCanvasResize(const QSize& sizeCanvas)


=====================================
src/qmaptool/doc/QMTHelp.qch
=====================================
Binary files a/src/qmaptool/doc/QMTHelp.qch and b/src/qmaptool/doc/QMTHelp.qch differ


=====================================
src/qmaptool/doc/QMTHelp.qhc
=====================================
Binary files a/src/qmaptool/doc/QMTHelp.qhc and b/src/qmaptool/doc/QMTHelp.qhc differ



View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/0ba21203f7c333134dce1a5c25b3f7ed21780e26...0412d16c9de09423622bf818586c7256e57958d0

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/0ba21203f7c333134dce1a5c25b3f7ed21780e26...0412d16c9de09423622bf818586c7256e57958d0
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20201207/26318f8e/attachment-0001.html>


More information about the Pkg-grass-devel mailing list