[Git][debian-gis-team/proj][experimental] 3 commits: Add upstream patches to fix libm linking and test failures.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Sat Aug 27 12:58:41 BST 2022
Bas Couwenberg pushed to branch experimental at Debian GIS Project / proj
Commits:
caf4e8da by Bas Couwenberg at 2022-08-27T13:32:48+02:00
Add upstream patches to fix libm linking and test failures.
- - - - -
c396d406 by Bas Couwenberg at 2022-08-27T13:34:33+02:00
Update symbols for other architectures.
- - - - -
6ec8ca87 by Bas Couwenberg at 2022-08-27T13:34:48+02:00
Set distribution to experimental.
- - - - -
6 changed files:
- debian/changelog
- debian/libproj25.symbols
- − debian/patches/geodsigntest.patch
- + debian/patches/pr3300-JSON-output-avoid-rounding-issues.patch
- + debian/patches/pr3302-fix-symbol-detection.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+proj (9.1.0~rc1-1~exp2) experimental; urgency=medium
+
+ * Add upstream patches to fix libm linking and test failures.
+ * Update symbols for other architectures.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 27 Aug 2022 13:34:38 +0200
+
proj (9.1.0~rc1-1~exp1) experimental; urgency=medium
* New upstream release candidate.
=====================================
debian/libproj25.symbols
=====================================
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 9.1.0~rc1 amd64
+# SymbolsHelper-Confirmed: 9.1.0~rc1 amd64 hppa i386 mips64el powerpc ppc64 ppc64el riscv64 s390x x32
libproj.so.25 #PACKAGE# #MINVER#
* Build-Depends-Package: libproj-dev
_Z10pj_ell_setP6pj_ctxP8ARG_listPdS3_ at Base 8.0.0
@@ -1194,12 +1194,9 @@ libproj.so.25 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt10unique_ptrIN5osgeo4proj9operation26CoordinateOperationFactoryESt14default_deleteIS3_EED1Ev at Base 7.1.1
(optional=templinst)_ZNSt10unique_ptrIN5osgeo4proj9operation26CoordinateOperationFactoryESt14default_deleteIS3_EED2Ev at Base 7.1.1
(optional=templinst)_ZNSt12_Destroy_auxILb0EE9__destroyIPNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEvT_S9_ at Base 9.0.0~rc1
- (optional=templinst|arch=armel riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs3CRSELN9__gnu_cxx12_Lock_policyE1EEC1INS2_13GeographicCRSEvEERKS_IT_LS5_1EE at Base 6.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt12__shared_ptrIN5osgeo4proj3crs3CRSELN9__gnu_cxx12_Lock_policyE1EEC2INS2_13GeographicCRSEvEERKS_IT_LS5_1EE at Base 6.0.0
(optional=templinst)_ZNSt13_Bvector_baseISaIbEE13_M_deallocateEv at Base 6.0.0
_ZNSt14_Function_baseD1Ev at Base 7.1.1
_ZNSt14_Function_baseD2Ev at Base 7.1.1
- (optional=templinst|arch=armel riscv64)_ZNSt14__shared_countILN9__gnu_cxx12_Lock_policyE1EEaSERKS2_ at Base 7.1.1
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIDnLN9__gnu_cxx12_Lock_policyE1EE10_M_disposeEv at Base 6.0.0
(optional=templinst|arch=!armel !riscv64)_ZNSt15_Sp_counted_ptrIDnLN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv at Base 6.0.0
(optional=templinst|arch=armel riscv64)_ZNSt15_Sp_counted_ptrIPN5osgeo4proj2cs10VerticalCSELN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 6.0.0
@@ -1859,24 +1856,24 @@ libproj.so.25 #PACKAGE# #MINVER#
(optional=templinst|arch=!armel !riscv64)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE15_M_add_ref_copyEv at Base 7.1.1
(optional=templinst|arch=!armel !riscv64)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE15_M_weak_releaseEv at Base 6.0.0
(optional=templinst)_ZNSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE24_M_release_last_use_coldEv at Base 9.1.0~rc1
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 6.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EE10_M_disposeEv at Base 6.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EE14_M_get_deleterERKSt9type_info at Base 6.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EED0Ev at Base 6.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EED1Ev at Base 6.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EED2Ev at Base 7.2.0
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EE10_M_disposeEv at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EE14_M_get_deleterERKSt9type_info at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EED0Ev at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EED1Ev at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EED2Ev at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EED0Ev at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EED1Ev at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EED2Ev at Base 9.1.0~rc1
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 7.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE10_M_disposeEv at Base 7.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE14_M_get_deleterERKSt9type_info at Base 7.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EED0Ev at Base 7.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EED1Ev at Base 7.0.0
- (optional=templinst|arch=armel riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EED2Ev at Base 7.2.0
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EE10_M_destroyEv at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EE10_M_disposeEv at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EE14_M_get_deleterERKSt9type_info at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EED0Ev at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EED1Ev at Base 9.1.0~rc1
+ (optional=templinst|arch=riscv64)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EED2Ev at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_destroyEv at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE2EE10_M_disposeEv at Base 9.1.0~rc1
(optional=templinst)_ZNSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE2EE14_M_get_deleterERKSt9type_info at Base 9.1.0~rc1
@@ -1888,10 +1885,10 @@ libproj.so.25 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE16S2ProjectionTypeSt4lessIS5_ESaISt4pairIKS5_S6_EEED1Ev at Base 8.2.0
(optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE16S2ProjectionTypeSt4lessIS5_ESaISt4pairIKS5_S6_EEED2Ev at Base 8.2.0
(optional=templinst|arch=amd64 arm64 hppa ia64 m68k mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEENS0_4listISt6vectorIS5_SaIS5_EESaIS9_EEESt4lessIS5_ESaISt4pairIKS5_SB_EEEixERSF_ at Base 8.1.1
- (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcSt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_ at Base 6.2.0
+ (optional=templinst|arch=amd64 i386)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcSt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_ at Base 6.2.0
(optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixERS9_ at Base 6.2.0
(optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10shared_ptrIN5osgeo4proj9operation19CoordinateOperationEESt4lessIS5_ESaISt4pairIKS5_SB_EEEixERSF_ at Base 8.1.0
- (optional=templinst|arch=!hppa !sh4)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorISt4pairIS5_S5_ESaIS8_EESt4lessIS5_ESaIS7_IKS5_SA_EEEixEOS5_ at Base 8.1.1
+ (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorISt4pairIS5_S5_ESaIS8_EESt4lessIS5_ESaIS7_IKS5_SA_EEEixEOS5_ at Base 8.1.1
(optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdSt4lessIS5_ESaISt4pairIKS5_dEEEixERS9_ at Base 6.0.0
(optional=templinst|arch=amd64 arm64 hppa ia64 m68k mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt3mapISt4pairIN5osgeo4proj2io16AuthorityFactory10ObjectTypeENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEENS6_4listIS0_ISB_SB_ESaISE_EEESt4lessISC_ESaIS0_IKSC_SG_EEEixERSJ_ at Base 8.1.1
(optional=templinst|arch=amd64 arm64 hppa ia64 mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS5_ESaIS5_EE6insertEOS5_ at Base 7.1.1
@@ -1929,14 +1926,13 @@ libproj.so.25 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt6vectorISt10unique_ptrIN5osgeo4proj19HorizontalShiftGridESt14default_deleteIS3_EESaIS6_EE12emplace_backIJS6_EEEvDpOT_ at Base 9.0.0~rc1
(optional=templinst)_ZNSt6vectorISt10unique_ptrIN5osgeo4proj20VerticalShiftGridSetESt14default_deleteIS3_EESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_ at Base 7.0.0
(optional=templinst)_ZNSt6vectorISt10unique_ptrIN5osgeo4proj22HorizontalShiftGridSetESt14default_deleteIS3_EESaIS6_EE17_M_realloc_insertIJS6_EEEvN9__gnu_cxx17__normal_iteratorIPS6_S8_EEDpOT_ at Base 7.0.0
- (optional=templinst|arch=amd64 arm64 x32)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE12emplace_backIJS7_EEEvDpOT_ at Base 9.0.0
+ (optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE12emplace_backIJS7_EEEvDpOT_ at Base 9.0.0
(optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_ at Base 6.0.0
(optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EED1Ev at Base 8.1.0
(optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ESaIS7_EED2Ev at Base 8.1.0
(optional=templinst)_ZNSt6vectorISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEiESaIS7_EE17_M_realloc_insertIJS7_EEEvN9__gnu_cxx17__normal_iteratorIPS7_S9_EEDpOT_ at Base 8.2.0
(optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIbSaIbEE13_M_insert_auxESt13_Bit_iteratorb at Base 7.1.1
(optional=templinst|subst)_ZNSt6vectorIbSaIbEE14_M_fill_insertESt13_Bit_iterator{size_t}b at Base 6.3.0
- (optional=templinst|arch=ia64 m68k mips64el ppc64el riscv64 sparc64)_ZNSt6vectorIbSaIbEE4backEv at Base 9.0.0~rc1
(optional=templinst)_ZNSt6vectorIbSaIbEE9push_backEb at Base 6.2.0
(optional=templinst)_ZNSt6vectorIbSaIbEEC1ESt16initializer_listIbERKS0_ at Base 7.1.1
(optional=templinst)_ZNSt6vectorIbSaIbEEC2ESt16initializer_listIbERKS0_ at Base 7.1.1
@@ -1946,6 +1942,7 @@ libproj.so.25 #PACKAGE# #MINVER#
(optional=templinst|arch=!amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIdSaIdEE17_M_default_appendEj at Base 8.1.1
(optional=templinst|arch=alpha amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIdSaIdEE17_M_default_appendEm at Base 8.1.1
(optional=templinst)_ZNSt6vectorIdSaIdEE17_M_realloc_insertIJdEEEvN9__gnu_cxx17__normal_iteratorIPdS1_EEDpOT_ at Base 6.0.0
+ (optional=templinst|arch=hppa i386 powerpc x32)_ZNSt6vectorIfSaIfEE17_M_default_appendEj at Base 9.1.0~rc1
(optional=templinst)_ZNSt6vectorIfSaIfEE17_M_default_appendEm at Base 9.1.0~rc1
(optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEj at Base 7.0.0
(optional=templinst|arch=alpha amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt6vectorIhSaIhEE17_M_default_appendEm at Base 7.0.0
@@ -1966,7 +1963,6 @@ libproj.so.25 #PACKAGE# #MINVER#
(arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt7__cxx119to_stringEj at Base 7.1.1
(arch=alpha amd64 arm64 ia64 mips64el ppc64 ppc64el riscv64 s390x sparc64)_ZNSt7__cxx119to_stringEm at Base 8.0.1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIRKS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_ at Base 6.0.0
- (optional=templinst|arch=alpha armel armhf hurd-i386 i386 m68k mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE16_M_insert_uniqueIS5_EESt4pairISt17_Rb_tree_iteratorIS5_EbEOT_ at Base 7.1.1
(optional=templinst|arch=!alpha !armel !armhf !hurd-i386 !i386 !m68k !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE24_M_get_insert_unique_posERKS5_ at Base 6.0.0
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St9_IdentityIS5_ESt4lessIS5_ESaIS5_EE4findERKS5_ at Base 6.3.1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_16S2ProjectionTypeESt10_Select1stIS9_ESt4lessIS5_ESaIS9_EE24_M_get_insert_unique_posERS7_ at Base 8.2.0
@@ -1991,18 +1987,15 @@ libproj.so.25 #PACKAGE# #MINVER#
(optional=templinst|arch=!alpha !armel !armhf !hurd-i386 !i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIPN5osgeo4proj9operation19CoordinateOperationESt4pairIKS4_St3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessISD_ESaISD_EEESt10_Select1stISI_ESE_IS4_ESaISI_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISI_ERS6_ at Base 8.0.1
(optional=templinst)_ZNSt8_Rb_treeISt4pairIN5osgeo4proj2io16AuthorityFactory10ObjectTypeENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKSC_NS6_4listIS0_ISB_SB_ESaISF_EEEESt10_Select1stISI_ESt4lessISC_ESaISI_EE24_M_get_insert_unique_posERSD_ at Base 6.3.0
(optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeISt4pairIN5osgeo4proj2io16AuthorityFactory10ObjectTypeENSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKSC_NS6_4listIS0_ISB_SB_ESaISF_EEEESt10_Select1stISI_ESt4lessISC_ESaISI_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISI_ERSD_ at Base 6.3.0
- (optional=templinst|arch=alpha armel armhf hurd-i386 i386 m68k mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_ESt4lessIS7_ESaIS7_EE16_M_insert_uniqueIRKS7_EES0_ISt17_Rb_tree_iteratorIS7_EbEOT_ at Base 7.1.1
- (optional=templinst|arch=alpha armel armhf hurd-i386 i386 m68k mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_ESt4lessIS7_ESaIS7_EE16_M_insert_uniqueIS7_EES0_ISt17_Rb_tree_iteratorIS7_EbEOT_ at Base 7.1.1
(optional=templinst)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_ESt4lessIS7_ESaIS7_EE24_M_get_insert_unique_posERKS7_ at Base 7.0.0
(optional=templinst)_ZNSt8_Rb_treeISt4pairINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES6_ES7_St9_IdentityIS7_ESt4lessIS7_ESaIS7_EE4findERKS7_ at Base 6.0.0
(optional=templinst)_ZNSt8_Rb_treeISt4pairIiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKS7_S6_ESt10_Select1stIS9_ESt4lessIS7_ESaIS9_EE24_M_get_insert_unique_posERS8_ at Base 7.0.0
(optional=templinst|arch=!armel !armhf !hurd-i386 !i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeISt4pairIiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEES0_IKS7_S6_ESt10_Select1stIS9_ESt4lessIS7_ESaIS9_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS9_ERS8_ at Base 7.0.0
(optional=templinst)_ZNSt8_Rb_treeIiSt4pairIKiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESt10_Select1stIS8_ESt4lessIiESaIS8_EE24_M_get_insert_unique_posERS1_ at Base 8.1.0
(optional=templinst|arch=!alpha !armel !armhf !hurd-i386 !i386 !mipsel !powerpc !ppc64 !s390x)_ZNSt8_Rb_treeIiSt4pairIKiNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEESt10_Select1stIS8_ESt4lessIiESaIS8_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIS8_ERS1_ at Base 8.1.0
- (optional=templinst|arch=alpha armel armhf hurd-i386 i386 m68k mipsel powerpc ppc64 s390x)_ZNSt8_Rb_treeIxxSt9_IdentityIxESt4lessIxESaIxEE16_M_insert_uniqueIRKxEESt4pairISt17_Rb_tree_iteratorIxEbEOT_ at Base 7.1.1
(optional=templinst|arch=armel armhf m68k)_ZNSt8_Rb_treeIxxSt9_IdentityIxESt4lessIxESaIxEE4findERKx at Base 7.0.0
- _ZNSt8__detail17_List_node_headerC1EOS0_ at Base 7.1.1
- _ZNSt8__detail17_List_node_headerC2EOS0_ at Base 7.1.1
+ (arch=!ppc64 !s390x)_ZNSt8__detail17_List_node_headerC1EOS0_ at Base 9.1.0~rc1
+ (arch=!ppc64 !s390x)_ZNSt8__detail17_List_node_headerC2EOS0_ at Base 9.1.0~rc1
(optional=templinst|arch=!alpha !amd64 !arm64 !ia64 !mips64el !ppc64 !ppc64el !riscv64 !s390x !sparc64)_ZNSt8__detail18__to_chars_10_implIjEEvPcjT_ at Base 7.1.1
(optional=templinst|arch=m68k)_ZSt13copy_backwardISt13_Bit_iteratorS0_ET0_T_S2_S1_ at Base 7.1.1
(optional=templinst)_ZSt16__do_uninit_copyIN9__gnu_cxx17__normal_iteratorIPKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorIS7_SaIS7_EEEEPS7_ET0_T_SG_SF_ at Base 9.1.0~rc1
@@ -2221,9 +2214,9 @@ libproj.so.25 #PACKAGE# #MINVER#
(arch=armel riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE at Base 6.0.0
(arch=!armel !riscv64)_ZTISt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE at Base 6.0.0
(arch=armel armhf)_ZTISt19_Sp_make_shared_tag at Base 6.0.0
- (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EE at Base 6.0.0
+ (arch=riscv64)_ZTISt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EE at Base 9.1.0~rc1
_ZTISt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EE at Base 9.1.0~rc1
- (arch=armel riscv64)_ZTISt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE at Base 7.0.0
+ (arch=riscv64)_ZTISt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EE at Base 9.1.0~rc1
_ZTISt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE2EE at Base 9.1.0~rc1
_ZTSN5osgeo4proj16GenericShiftGridE at Base 7.0.0
_ZTSN5osgeo4proj17VerticalShiftGridE at Base 7.0.0
@@ -2431,9 +2424,9 @@ libproj.so.25 #PACKAGE# #MINVER#
(arch=armel riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE1EE at Base 6.0.0
(arch=!armel !riscv64)_ZTSSt16_Sp_counted_baseILN9__gnu_cxx12_Lock_policyE2EE at Base 6.0.0
_ZTSSt19_Sp_make_shared_tag at Base 6.0.0
- (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EE at Base 6.0.0
+ (arch=riscv64)_ZTSSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EE at Base 9.1.0~rc1
_ZTSSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EE at Base 9.1.0~rc1
- (arch=armel riscv64)_ZTSSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE at Base 7.0.0
+ (arch=riscv64)_ZTSSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EE at Base 9.1.0~rc1
_ZTSSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE2EE at Base 9.1.0~rc1
_ZTTN5osgeo4proj3crs10DerivedCRSE at Base 6.0.0
_ZTTN5osgeo4proj3crs11GeodeticCRSE at Base 6.0.0
@@ -2654,9 +2647,9 @@ libproj.so.25 #PACKAGE# #MINVER#
(arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPN5osgeo4proj9operation23OperationParameterValueELN9__gnu_cxx12_Lock_policyE2EE at Base 6.0.0
(arch=armel riscv64)_ZTVSt15_Sp_counted_ptrIPSt6vectorIhSaIhEELN9__gnu_cxx12_Lock_policyE1EE at Base 7.0.0
(arch=!armel !riscv64)_ZTVSt15_Sp_counted_ptrIPSt6vectorIhSaIhEELN9__gnu_cxx12_Lock_policyE2EE at Base 7.0.0
- (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIS3_ELN9__gnu_cxx12_Lock_policyE1EE at Base 6.0.0
+ (arch=riscv64)_ZTVSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE1EE at Base 9.1.0~rc1
_ZTVSt23_Sp_counted_ptr_inplaceIN5osgeo4proj6common13UnitOfMeasureESaIvELN9__gnu_cxx12_Lock_policyE2EE at Base 9.1.0~rc1
- (arch=armel riscv64)_ZTVSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIS2_ELN9__gnu_cxx12_Lock_policyE1EE at Base 7.0.0
+ (arch=riscv64)_ZTVSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE1EE at Base 9.1.0~rc1
_ZTVSt23_Sp_counted_ptr_inplaceISt6vectorIhSaIhEESaIvELN9__gnu_cxx12_Lock_policyE2EE at Base 9.1.0~rc1
_ZZNSt19_Sp_make_shared_tag5_S_tiEvE5__tag at Base 6.0.0
(optional=templinst)_ZZNSt8__detail18__to_chars_10_implIjEEvPcjT_E8__digits at Base 7.1.1
=====================================
debian/patches/geodsigntest.patch deleted
=====================================
@@ -1,17 +0,0 @@
-Description: Fix libm linking.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/OSGeo/PROJ/issues/3295
-
---- a/src/tests/CMakeLists.txt
-+++ b/src/tests/CMakeLists.txt
-@@ -6,9 +6,7 @@ target_link_libraries(geodtest ${PROJ_LI
- add_executable(geodsigntest geodsigntest.c)
- # geodsigntest includes geodesic.c directly so it doesn't need to link
- # against the library.
--if(HAVE_LIBM)
-- target_link_libraries(geodsigntest m)
--endif()
-+target_link_libraries(geodsigntest m)
-
- # Do not install, instead run tests
- add_test(NAME geodesic-test COMMAND geodtest)
=====================================
debian/patches/pr3300-JSON-output-avoid-rounding-issues.patch
=====================================
@@ -0,0 +1,30 @@
+Subject: [PATCH] JSON output: avoid rounding issues with integer values in a double on some architectures
+Author: Even Rouault <even.rouault at spatialys.com>
+Origin: https://github.com/OSGeo/PROJ/pull/3300
+Bug: https://github.com/OSGeo/PROJ/issues/3297
+
+--- a/src/proj_json_streaming_writer.cpp
++++ b/src/proj_json_streaming_writer.cpp
+@@ -28,6 +28,7 @@
+
+ /*! @cond Doxygen_Suppress */
+
++#include <limits>
+ #include <vector>
+ #include <string>
+
+@@ -277,6 +278,14 @@ void CPLJSonStreamingWriter::Add(double
+ {
+ Print( dfVal > 0 ? "\"Infinity\"" : "\"-Infinity\"" );
+ }
++ else if( dfVal >= std::numeric_limits<int>::min() &&
++ dfVal <= std::numeric_limits<int>::max() &&
++ static_cast<int>(dfVal) == dfVal )
++ {
++ // Avoid rounding issues on some platforms like armel, with numbers
++ // like 2005. See https://github.com/OSGeo/PROJ/issues/3297
++ Print(CPLSPrintf("%d", static_cast<int>(dfVal)));
++ }
+ else
+ {
+ char szFormatting[10];
=====================================
debian/patches/pr3302-fix-symbol-detection.patch
=====================================
@@ -0,0 +1,18 @@
+Description: CMake: fix symbol detection when CFLAGS includes -Werror=something
+Author: Even Rouault <even.rouault at spatialys.com>
+Origin: https://github.com/OSGeo/PROJ/pull/3302
+Bug: https://github.com/OSGeo/PROJ/issues/3295
+
+--- a/cmake/ProjConfig.cmake
++++ b/cmake/ProjConfig.cmake
+@@ -13,7 +13,9 @@ include(CheckFunctionExists)
+ # if C flags have -Werror, temporarily remove these while running some checks
+ string(FIND "${CMAKE_C_FLAGS}" "-Werror" FIND_WERROR)
+ if(FIND_WERROR GREATER_EQUAL 0)
+- string(REPLACE "-Werror" "" _tmp_CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
++ # we must be careful about not matching -Werror=something, so let's append
++ # a space at the end of CMAKE_C_FLAGS and match -Werror with a trailing space
++ string(REPLACE "-Werror " " " _tmp_CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ")
+ set(_prev_CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+ set(CMAKE_C_FLAGS "${_tmp_CMAKE_C_FLAGS}")
+ endif()
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
-geodsigntest.patch
docdir.patch
+pr3302-fix-symbol-detection.patch
+pr3300-JSON-output-avoid-rounding-issues.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/c1e1f96b64b3e5d0145515c549416bf279f2e4c5...6ec8ca878e033faa59a7c3f7226833937b805884
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/c1e1f96b64b3e5d0145515c549416bf279f2e4c5...6ec8ca878e033faa59a7c3f7226833937b805884
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/20220827/6744c292/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list