[Git][debian-gis-team/proj][upstream] New upstream version 8.0.0~rc2

[Bas Couwenberg]

Bas Couwenberg pushed to branch upstream at Debian GIS Project / proj


Commits:
42c704c3 by Bas Couwenberg at 2021-02-25T19:54:14+01:00
New upstream version 8.0.0~rc2
- - - - -


8 changed files:

- CMakeLists.txt
- NEWS
- cmake/ProjInstallPath.cmake
- cmake/ProjUtilities.cmake
- include/proj/internal/io_internal.hpp
- man/man1/projinfo.1
- src/iso19111/metadata.cpp
- test/unit/test_metadata.cpp


Changes:

=====================================
CMakeLists.txt
=====================================
@@ -282,3 +282,14 @@ endif()
 set(docfiles COPYING NEWS AUTHORS)
 install(FILES ${docfiles}
         DESTINATION "${DOCDIR}")
+
+################################################################################
+# pkg-config support
+################################################################################
+if(UNIX OR MINGW)
+  configure_proj_pc()
+
+  install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/proj.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+endif()


=====================================
NEWS
=====================================
@@ -55,7 +55,7 @@ tweaks in the underlying API.
 
  o Update to EPSG v10.015 (#2539)
 
- o Default log level set to PJ_LOG_ERROR #2542)
+ o Default log level set to PJ_LOG_ERROR (#2542)
 
  Bug fixes
  ---------
@@ -65,9 +65,9 @@ tweaks in the underlying API.
 
  o createOperations(): fix Compound to Geog3D/Projected3D CRS with non-metre ellipsoidal height (#2500)
 
- o Avoid error messages to be emitted log level is set to PJ_LOG_NONE #2527)
+ o Avoid error messages to be emitted log level is set to PJ_LOG_NONE (#2527)
 
- o Close database connection when autoclose set to True #2532
+ o Close database connection when autoclose set to True (#2532)
 
  THANKS TO
  ---------


=====================================
cmake/ProjInstallPath.cmake
=====================================
@@ -40,6 +40,8 @@ else()
   set(DEFAULT_INCLUDE_SUBDIR include)
   set(DEFAULT_DOC_SUBDIR share/doc/proj)
   set(DEFAULT_CMAKE_SUBDIR lib/cmake)
+  # Used for proj.pc
+  set(CMAKE_INSTALL_DATAROOTDIR share)
 endif()
 
 # Locations are changeable by user to customize layout of PROJ installation


=====================================
cmake/ProjUtilities.cmake
=====================================
@@ -14,7 +14,8 @@
 # Macros in this module:
 #
 #   print_variable
-#   proj_target_output_name:
+#   proj_target_output_name
+#   configure_proj_pc
 #
 ################################################################################
 
@@ -60,3 +61,31 @@ function(proj_target_output_name TARGET_NAME OUTPUT_NAME)
 
   set(${OUTPUT_NAME} ${TARGET_NAME}${SUFFIX} PARENT_SCOPE)
 endfunction()
+
+#
+# Configure a pkg-config file proj.pc
+# See also ProjInstallPath.cmake
+#
+
+function(configure_proj_pc)
+  set(prefix "${CMAKE_INSTALL_PREFIX}")
+  set(exec_prefix "$\{prefix\}")
+  set(libdir "$\{exec_prefix\}/${PROJ_LIB_SUBDIR}")
+  set(includedir "$\{prefix\}/${PROJ_INCLUDE_SUBDIR}")
+  set(datarootdir "$\{prefix\}/${CMAKE_INSTALL_DATAROOTDIR}")
+  set(datadir "$\{datarootdir\}")
+  set(PACKAGE "proj")
+  set(VERSION ${PROJ_VERSION})
+  set(SQLITE3_LIBS -lsqlite3)
+  if(TIFF_ENABLED)
+    set(TIFF_LIBS -ltiff)
+  endif()
+  if(CURL_ENABLED)
+    set(CURL_LIBS -lcurl)
+  endif()
+
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/proj.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/proj.pc
+    @ONLY)
+endfunction()


=====================================
include/proj/internal/io_internal.hpp
=====================================
@@ -201,7 +201,10 @@ struct projCppContext {
         return auxDbPaths_;
     }
 
-    void setAutoCloseDb(bool autoClose) { autoCloseDb_ = autoClose; autoCloseDbIfNeeded(); }
+    void setAutoCloseDb(bool autoClose) {
+        autoCloseDb_ = autoClose;
+        autoCloseDbIfNeeded();
+    }
     inline bool getAutoCloseDb() const { return autoCloseDb_; }
 
     // cppcheck-suppress functionStatic


=====================================
man/man1/projinfo.1
=====================================
@@ -331,7 +331,7 @@ only used for coordinate operation computation
 New in version 8.0.
 
 .sp
-Allow to export a geographic or projected 3D CRS as a compound CRS whose
+Allows exporting a geographic or projected 3D CRS as a compound CRS whose
 vertical CRS represents the ellipsoidal height.
 .sp
 \fBNOTE:\fP


=====================================
src/iso19111/metadata.cpp
=====================================
@@ -1124,7 +1124,7 @@ void Identifier::_exportToJSON(JSONFormatter *formatter) const {
 //! @cond Doxygen_Suppress
 static bool isIgnoredChar(char ch) {
     return ch == ' ' || ch == '_' || ch == '-' || ch == '/' || ch == '(' ||
-           ch == ')' || ch == '.' || ch == '&';
+           ch == ')' || ch == '.' || ch == '&' || ch == ',';
 }
 //! @endcond
 


=====================================
test/unit/test_metadata.cpp
=====================================
@@ -391,4 +391,8 @@ TEST(metadata, Identifier_isEquivalentName) {
     EXPECT_TRUE(Identifier::isEquivalentName("a", "\xc3\xa1"));
 
     EXPECT_TRUE(Identifier::isEquivalentName("\xc3\xa4", "\xc3\xa1"));
+
+    EXPECT_TRUE(Identifier::isEquivalentName(
+        "Unknown based on International 1924 (Hayford 1909, 1910) ellipsoid",
+        "Unknown_based_on_International_1924_Hayford_1909_1910_ellipsoid"));
 }



View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/commit/42c704c3e26f54ac9567f0cfb3516904560f3b14

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/commit/42c704c3e26f54ac9567f0cfb3516904560f3b14
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/20210225/f1f1363b/attachment-0001.htm>