.travis.yml

@@ -59,46 +59,46 @@ matrix:
             - txt2tags
             - xvfb
    # QT5 based build with Python 3 // using container based builds and prebuild binary dependencies in osgeo4travis
-    - os: linux
-      language: python # This lets us use newer python versions from virtualenv
-      env:
-        - BUILD=qt5
-        - QT_VERSION=5
-        - LLVM_VERSION=3.8
-      dist: precise
-      sudo: false
-      cache:
-        apt: true
-        directories:
-          - $HOME/.ccache
-      compiler: gcc
-      python: "3.3"
-      addons:
-        postgresql: "9.4"
-        apt:
-          sources:
-            - llvm-toolchain-precise-3.8
-            - ubuntu-toolchain-r-test
-            - george-edison55-precise-backports # doxygen 1.8.3
-          packages:
-            - doxygen
-            - bison
-            - flex
-            - graphviz
-            - libpq-dev
-            - libfcgi-dev
-            - libfftw3-3
-            - pkg-config
-            - poppler-utils
-            - txt2tags
-            - xvfb
-            - flip
-            - clang-3.8
+   #    - os: linux
+   #      language: python # This lets us use newer python versions from virtualenv
+   #      env:
+   #        - BUILD=qt5
+   #        - QT_VERSION=5
+   #        - LLVM_VERSION=3.8
+   #      dist: precise
+   #      sudo: false
+   #      cache:
+   #        apt: true
+   #        directories:
+   #          - $HOME/.ccache
+   #      compiler: gcc
+   #      python: "3.3"
+   #      addons:
+   #        postgresql: "9.4"
+   #        apt:
+   #          sources:
+   #            - llvm-toolchain-precise-3.8
+   #            - ubuntu-toolchain-r-test
+   #            - george-edison55-precise-backports # doxygen 1.8.3
+   #          packages:
+   #            - doxygen
+   #            - bison
+   #            - flex
+   #            - graphviz
+   #            - libpq-dev
+   #            - libfcgi-dev
+   #            - libfftw3-3
+   #            - pkg-config
+   #            - poppler-utils
+   #            - txt2tags
+   #            - xvfb
+   #            - flip
+   #            - clang-3.8
     # OSX based build with QT4 and Python 2
-    - os: osx
-      env:
-        - BUILD=osx
-        - IGNORE_BUILD_FAILURES=YES
+   # - os: osx
+   #   env:
+   #    - BUILD=osx
+   #    - IGNORE_BUILD_FAILURES=YES
 
 git:
   depth: 30

CMakeLists.txt

 SET(CPACK_PACKAGE_VERSION_MAJOR "2")
 SET(CPACK_PACKAGE_VERSION_MINOR "18")
-SET(CPACK_PACKAGE_VERSION_PATCH "23")
+SET(CPACK_PACKAGE_VERSION_PATCH "24")
 SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
 SET(RELEASE_NAME "Las Palmas")
 IF (POLICY CMP0048) # in CMake 3.0.0+

ChangeLog

+Juergen E. Fischer <jef@norbit.de>	2018-09-03
+
+    workaround for moc issue with app tests
+
+Merge: 2a1459cb99 a5dd6eb877
+rldhont <rldhont@gmail.com>	2018-09-10
+
+    Merge pull request #7827 from rldhont/fix-qgshttptransaction-support-https-server
+
+    [BUGFIX][Server] Quickfix in QgsHttpTransaction to support HTTPS scheme
+
+rldhont <rldhont@gmail.com>	2018-09-07
+
+    [BUGFIX][Server] Quickfix in QgsHttpTransaction to support HTTPS scheme
+
+    The class QgsHttpTransaction is only used in server for getting files provided by URL. This class does not support HTTPS.
+
+    This is a quickfix to enable requesting SLD files provided through HTTPS scheme.
+
+    Fixes #6898 *QGIS mapserver forces http when requesting SLD=https* https://issues.qgis.org/issues/6898 a five year old issue.
+
+Andrew Childs <lorne@cons.org.nz>	2018-08-31
+
+    Fix pyfuture installation under CMake 3.12
+
+    The logic here was incorrect, but managed to do the right thing
+    anyway. Under CMake 3.12, this is a hard error.
+
+Nyall Dawson <nyall.dawson@gmail.com>	2018-09-04
+
+    Also disable OSX builds on Travis - the environment has been broken for a long time
+    and the results are currently ignored anyway
+
+    May as well save some unneeded work for Travis
+
+Nyall Dawson <nyall.dawson@gmail.com>	2018-09-03
+
+    Disable qt5 Travis builds -- the build environment is currently broken
+
+rldhont <rldhont@gmail.com>	2018-08-28
+
+    Fix trusty build (QStringLiteral is Qt5; followup 9241e2d)
+
+Matthias Kuhn <matthias@opengis.ch>	2017-11-09
+
+    [travis] Disable non-local file download tests
+
+    (cherry picked from commit 8d8f38d4c40a64082e396017cbca3399cfafb3ca)
+
+Juergen E. Fischer <jef@norbit.de>	2018-08-26
+
+    Typo fix
+
+Juergen E. Fischer <jef@norbit.de>	2018-08-17
+
+    Release of 2.18.23
+
 Radoslaw Guzinski <radosuav@op.pl>	2018-08-09
     [Processing] Fix exception when producing a csv output.

debian/changelog

+qgis (2.18.24+dfsg-1~exp1) experimental; urgency=medium
+
+  [ Jürgen E. Fischer ]
+  * Release of 2.18.24
+
+  [ Bas Couwenberg ]
+  * New upstream release.
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sat, 15 Sep 2018 08:51:27 +0200
+
 qgis (2.18.23+dfsg-1) unstable; urgency=medium
 
   * Update symbols for other architectures.

debian/control

@@ -111,7 +111,7 @@ Description: QGIS - architecture-independent data
  This package contains architecture-independent supporting data files for use
  with QGIS.
 
-Package: libqgis-app2.18.23
+Package: libqgis-app2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -122,7 +122,7 @@ Description: QGIS - shared app library
  .
  This package contains the shared app library.
 
-Package: libqgis-core2.18.23
+Package: libqgis-core2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -133,7 +133,7 @@ Description: QGIS - shared core library
  .
  This package contains the shared core library.
 
-Package: libqgis-gui2.18.23
+Package: libqgis-gui2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -144,7 +144,7 @@ Description: QGIS - shared gui library
  .
  This package contains the shared gui library.
 
-Package: libqgis-analysis2.18.23
+Package: libqgis-analysis2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -155,7 +155,7 @@ Description: QGIS - shared analysis library
  .
  This package contains the shared analysis library.
 
-Package: libqgis-networkanalysis2.18.23
+Package: libqgis-networkanalysis2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -166,7 +166,7 @@ Description: QGIS - shared network analysis library
  .
  This package contains the shared network analysis library.
 
-Package: libqgisgrass7-2.18.23
+Package: libqgisgrass7-2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -177,7 +177,7 @@ Description: QGIS - shared grass library
  .
  This package contains the shared grass library.
 
-Package: libqgispython2.18.23
+Package: libqgispython2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -208,7 +208,7 @@ Description: QGIS custom widgets for Qt Designer
  .
  This package contains a library to use specific QGIS widgets in Qt Designer.
 
-Package: libqgis-server2.18.23
+Package: libqgis-server2.18.24
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends},
@@ -229,14 +229,14 @@ Depends: grass-dev (>= 7.4.0),
          libgsl-dev,
          libpq-dev,
          libproj-dev,
-         libqgis-app2.18.23 (= ${binary:Version}),
-         libqgis-core2.18.23 (= ${binary:Version}),
-         libqgis-gui2.18.23 (= ${binary:Version}),
-         libqgis-analysis2.18.23 (= ${binary:Version}),
-         libqgis-networkanalysis2.18.23 (= ${binary:Version}),
-         libqgis-server2.18.23 (= ${binary:Version}),
-         libqgisgrass7-2.18.23 (= ${binary:Version}),
-         libqgispython2.18.23 (= ${binary:Version}),
+         libqgis-app2.18.24 (= ${binary:Version}),
+         libqgis-core2.18.24 (= ${binary:Version}),
+         libqgis-gui2.18.24 (= ${binary:Version}),
+         libqgis-analysis2.18.24 (= ${binary:Version}),
+         libqgis-networkanalysis2.18.24 (= ${binary:Version}),
+         libqgis-server2.18.24 (= ${binary:Version}),
+         libqgisgrass7-2.18.24 (= ${binary:Version}),
+         libqgispython2.18.24 (= ${binary:Version}),
          libqt4-dev (>= 4.7.0),
          libsqlite3-dev,
          python-qt4 (>= 4.1.0),
@@ -343,7 +343,7 @@ Depends: python-qgis-common (= ${source:Version}),
          python-six,
          python-tz,
          python-yaml,
-         libqgispython2.18.23,
+         libqgispython2.18.24,
          ${shlibs:Depends},
          ${python:Depends},
          ${misc:Depends},

debian/libqgis-analysis2.18.23.symbols → debian/libqgis-analysis2.18.24.symbols

 # SymbolsHelper-Confirmed: 2.18.23 hurd-i386
-libqgis_analysis.so.2.18.23 #PACKAGE# #MINVER#
+libqgis_analysis.so.2.18.24 #PACKAGE# #MINVER#
  _ZN12TriDecorator10calcNormalEddP8Vector3D@Base 2.0.1
  _ZN12TriDecorator11getTriangleEddP7Point3DPiS1_S2_S1_S2_@Base 2.0.1
  _ZN12TriDecorator11getTriangleEddP7Point3DS1_S1_@Base 2.0.1

debian/libqgis-app2.18.23.symbols → debian/libqgis-app2.18.24.symbols

 # SymbolsHelper-Confirmed: 2.18.23 amd64 arm64 armel armhf hurd-i386 i386 m68k mips mips64el mipsel s390x
-libqgis_app.so.2.18.23 #PACKAGE# #MINVER#
+libqgis_app.so.2.18.24 #PACKAGE# #MINVER#
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_@Base 2.14.18
  (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant@Base 2.14.0
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386)_Z13qvariant_castI5QIconET_RK8QVariant@Base 2.14.18

debian/libqgis-core2.18.23.symbols → debian/libqgis-core2.18.24.symbols

-# SymbolsHelper-Confirmed: 2.18.23 amd64 armel armhf hurd-i386 i386 m68k mips mips64el mipsel powerpc
-libqgis_core.so.2.18.23 #PACKAGE# #MINVER#
+# SymbolsHelper-Confirmed: 2.18.24 amd64
+libqgis_core.so.2.18.24 #PACKAGE# #MINVER#
  GEOPROJ4@Base 2.0.1
  GEOWKT@Base 2.0.1
  GEO_EPSG_CRS_AUTHID@Base 2.0.1
@@ -1157,36 +1157,36 @@ libqgis_core.so.2.18.23 #PACKAGE# #MINVER#
  _ZN14QgsApplication15activeThemePathEv@Base 2.0.1
  _ZN14QgsApplication15authorsFilePathEv@Base 2.0.1
  _ZN14QgsApplication15licenceFilePathEv@Base 2.0.1
- _ZN14QgsApplication15mThemeName21823E@Base 2.18.23
+ _ZN14QgsApplication15mThemeName21824E@Base 2.18.24
  _ZN14QgsApplication15settingsChangedEv@Base 2.14.5
  _ZN14QgsApplication15shortNameRegExpEv@Base 2.14.0
  _ZN14QgsApplication15userStyleV2PathEv@Base 2.0.1
  _ZN14QgsApplication16defaultThemePathEv@Base 2.0.1
- _ZN14QgsApplication16mConfigPath21823E@Base 2.18.23
- _ZN14QgsApplication16mMaxThreads21823E@Base 2.18.23
- _ZN14QgsApplication16mPluginPath21823E@Base 2.18.23
- _ZN14QgsApplication16mPrefixPath21823E@Base 2.18.23
+ _ZN14QgsApplication16mConfigPath21824E@Base 2.18.24
+ _ZN14QgsApplication16mMaxThreads21824E@Base 2.18.24
+ _ZN14QgsApplication16mPluginPath21824E@Base 2.18.24
+ _ZN14QgsApplication16mPrefixPath21824E@Base 2.18.24
  _ZN14QgsApplication16reportStyleSheetEv@Base 2.0.1
  _ZN14QgsApplication16setAuthDbDirPathERK7QString@Base 2.14.0
  _ZN14QgsApplication16sponsorsFilePathEv@Base 2.0.1
  _ZN14QgsApplication16staticMetaObjectE@Base 2.0.1
  _ZN14QgsApplication16userThemesFolderEv@Base 2.14.0
  _ZN14QgsApplication17createThemeFolderEv@Base 2.14.0
- _ZN14QgsApplication17mLibexecPath21823E@Base 2.18.23
- _ZN14QgsApplication17mLibraryPath21823E@Base 2.18.23
- _ZN14QgsApplication17mPkgDataPath21823E@Base 2.18.23
- _ZN14QgsApplication17mUIThemeName21823E@Base 2.18.23
+ _ZN14QgsApplication17mLibexecPath21824E@Base 2.18.24
+ _ZN14QgsApplication17mLibraryPath21824E@Base 2.18.24
+ _ZN14QgsApplication17mPkgDataPath21824E@Base 2.18.24
+ _ZN14QgsApplication17mUIThemeName21824E@Base 2.18.24
  _ZN14QgsApplication17restoreGdalDriverERK7QString@Base 2.14.0
  _ZN14QgsApplication18defaultStyleV2PathEv@Base 2.0.1
- _ZN14QgsApplication18mGdalSkipList21823E@Base 2.18.23
+ _ZN14QgsApplication18mGdalSkipList21824E@Base 2.18.24
  _ZN14QgsApplication18qgisAuthDbFilePathEv@Base 2.14.0
  _ZN14QgsApplication18qgisUserDbFilePathEv@Base 2.0.1
  _ZN14QgsApplication18registerOgrDriversEv@Base 2.0.1
  _ZN14QgsApplication18setDefaultSvgPathsERK11QStringList@Base 2.0.1
  _ZN14QgsApplication19defaultThemesFolderEv@Base 2.14.0
  _ZN14QgsApplication19emitSettingsChangedEv@Base 2.14.5
- _ZN14QgsApplication19mAuthDbDirPath21823E@Base 2.18.23
- _ZN14QgsApplication19mSystemEnvVars21823E@Base 2.18.23
+ _ZN14QgsApplication19mAuthDbDirPath21824E@Base 2.18.24
+ _ZN14QgsApplication19mSystemEnvVars21824E@Base 2.18.24
  _ZN14QgsApplication19qgisSettingsDirPathEv@Base 2.0.1
  _ZN14QgsApplication19translatorsFilePathEv@Base 2.0.1
  _ZN14QgsApplication20contributorsFilePathEv@Base 2.0.1
@@ -1194,18 +1194,18 @@ libqgis_core.so.2.18.23 #PACKAGE# #MINVER#
  _ZN14QgsApplication21QGIS_APPLICATION_NAMEE@Base 2.4.0
  _ZN14QgsApplication21composerTemplatePathsEv@Base 2.14.0
  _ZN14QgsApplication21developersMapFilePathEv@Base 2.8.0
- _ZN14QgsApplication21mBuildOutputPath21823E@Base 2.18.23
- _ZN14QgsApplication21mBuildSourcePath21823E@Base 2.18.23
- _ZN14QgsApplication21mDefaultSvgPaths21823E@Base 2.18.23
+ _ZN14QgsApplication21mBuildOutputPath21824E@Base 2.18.24
+ _ZN14QgsApplication21mBuildSourcePath21824E@Base 2.18.24
+ _ZN14QgsApplication21mDefaultSvgPaths21824E@Base 2.18.24
  _ZN14QgsApplication22QGIS_ORGANIZATION_NAMEE@Base 2.4.0
  _ZN14QgsApplication23applyGdalSkippedDriversEv@Base 2.0.1
- _ZN14QgsApplication23mFileOpenEventList21823E@Base 2.18.23
+ _ZN14QgsApplication23mFileOpenEventList21824E@Base 2.18.24
  _ZN14QgsApplication24QGIS_ORGANIZATION_DOMAINE@Base 2.4.0
  _ZN14QgsApplication24setFileOpenEventReceiverEP7QObject@Base 2.0.1
- _ZN14QgsApplication25mRunningFromBuildDir21823E@Base 2.18.23
+ _ZN14QgsApplication25mRunningFromBuildDir21824E@Base 2.18.24
  _ZN14QgsApplication26absolutePathToRelativePathERK7QStringS2_@Base 2.14.0
  _ZN14QgsApplication26relativePathToAbsolutePathERK7QStringS2_@Base 2.14.0
- _ZN14QgsApplication27mFileOpenEventReceiver21823E@Base 2.18.23
+ _ZN14QgsApplication27mFileOpenEventReceiver21824E@Base 2.18.24
  _ZN14QgsApplication4initE7QString@Base 2.0.1
  _ZN14QgsApplication5eventEP6QEvent@Base 2.0.1
  _ZN14QgsApplication6endianEv@Base 2.0.1
@@ -4071,6 +4071,7 @@ libqgis_core.so.2.18.23 #PACKAGE# #MINVER#
  _ZN18QgsHttpTransaction12dataReceivedERK19QHttpResponseHeader@Base 2.0.1
  _ZN18QgsHttpTransaction13statusChangedERK7QString@Base 2.14.0
  _ZN18QgsHttpTransaction14setCredentialsERK7QStringS2_@Base 2.0.1
+ _ZN18QgsHttpTransaction15handleSslErrorsERK5QListI9QSslErrorE@Base 2.18.24
  _ZN18QgsHttpTransaction15networkTimedOutEv@Base 2.0.1
  _ZN18QgsHttpTransaction16dataReadProgressEi@Base 2.0.1
  _ZN18QgsHttpTransaction16dataStateChangedEi@Base 2.0.1

debian/libqgis-gui2.18.23.symbols → debian/libqgis-gui2.18.24.symbols

 # SymbolsHelper-Confirmed: 2.18.23 amd64 arm64 armel armhf hurd-i386 m68k mips mips64el mipsel s390x
-libqgis_gui.so.2.18.23 #PACKAGE# #MINVER#
+libqgis_gui.so.2.18.24 #PACKAGE# #MINVER#
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z10qDeleteAllI5QListIPN13QFormInternal11DomPropertyEEEvRKT_@Base 2.14.16
  (optional=templinst)_Z13qvariant_castI26QUiTranslatableStringValueET_RK8QVariant@Base 2.0.1
  (optional=templinst|arch=!amd64 !hurd-i386 !i386 !kfreebsd-amd64 !kfreebsd-i386 !x32)_Z13qvariant_castI5QIconET_RK8QVariant@Base 2.14.16

debian/libqgis-networkanalysis2.18.23.symbols → debian/libqgis-networkanalysis2.18.24.symbols

 # SymbolsHelper-Confirmed: 2.18.23 hurd-i386
-libqgis_networkanalysis.so.2.18.23 #PACKAGE# #MINVER#
+libqgis_networkanalysis.so.2.18.24 #PACKAGE# #MINVER#
  _ZN11QgsGraphArcC1Ev@Base 2.0.1
  _ZN11QgsGraphArcC2Ev@Base 2.0.1
  _ZN14QgsGraphVertexC1ERK8QgsPoint@Base 2.0.1

debian/libqgis-server2.18.23.symbols → debian/libqgis-server2.18.24.symbols

 # SymbolsHelper-Confirmed: 2.18.23 armhf hurd-i386 i386 powerpc ppc64 ppc64el s390x
-libqgis_server.so.2.18.23 #PACKAGE# #MINVER#
+libqgis_server.so.2.18.24 #PACKAGE# #MINVER#
  _ZN14QgsConfigCache11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.8.0
  _ZN14QgsConfigCache11qt_metacastEPKc@Base 2.8.0
  _ZN14QgsConfigCache11removeEntryERK7QString@Base 2.18.17

debian/libqgisgrass7-2.18.23.symbols → debian/libqgisgrass7-2.18.24.symbols

 # SymbolsHelper-Confirmed: 2.18.17 alpha amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64 ppc64el s390x
-libqgisgrass7.so.2.18.23 #PACKAGE# #MINVER#
+libqgisgrass7.so.2.18.24 #PACKAGE# #MINVER#
  _ZN11QgsGrassWin10hideWindowEi@Base 2.14.0
  _ZN12QgsGrassCopy11qt_metacallEN11QMetaObject4CallEiPPv@Base 2.14.0
  _ZN12QgsGrassCopy11qt_metacastEPKc@Base 2.14.0