Bas Couwenberg pushed to branch experimental at Debian GIS Project / proj
Commits: 4da19aab by Bas Couwenberg at 2022-03-06T12:00:29+01:00 Add upstream patch to fix test failure with SQLite 3.38.0. - - - - - 832a1166 by Bas Couwenberg at 2022-03-06T12:02:03+01:00 Update symbols for hppa. - - - - - a3225f40 by Bas Couwenberg at 2022-03-06T12:02:14+01:00 Set distribution to experimental. - - - - - 5 changed files: - debian/changelog - debian/libproj25.symbols - + debian/patches/0001-Fix-wrong-results-with-SQLite-3.38.0-fixes-3077.patch - + debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +proj (9.0.0-1~exp2) experimental; urgency=medium + + * Add upstream patch to fix test failure with SQLite 3.38.0. + * Update symbols for hppa. + + -- Bas Couwenberg <[email protected]> Sun, 06 Mar 2022 12:02:05 +0100 + proj (9.0.0-1~exp1) experimental; urgency=medium * New upstream release. ===================================== debian/libproj25.symbols ===================================== @@ -1,4 +1,4 @@ -# SymbolsHelper-Confirmed: 9.0.0 amd64 +# SymbolsHelper-Confirmed: 9.0.0 amd64 hppa libproj.so.25 #PACKAGE# #MINVER# * Build-Depends-Package: libproj-dev _Z10pj_ell_setP6pj_ctxP8ARG_listPdS3_@Base 8.0.0 @@ -1889,7 +1889,7 @@ libproj.so.25 #PACKAGE# #MINVER# (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPKcSt4lessIS5_ESaISt4pairIKS5_S7_EEEixEOS5_@Base 6.2.0 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES5_St4lessIS5_ESaISt4pairIKS5_S5_EEEixERS9_@Base 6.2.0 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt10shared_ptrIN5osgeo4proj9operation19CoordinateOperationEESt4lessIS5_ESaISt4pairIKS5_SB_EEEixERSF_@Base 8.1.0 - (optional=templinst|arch=!sh4)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorISt4pairIS5_S5_ESaIS8_EESt4lessIS5_ESaIS7_IKS5_SA_EEEixEOS5_@Base 8.1.1 + (optional=templinst|arch=!hppa !sh4)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt6vectorISt4pairIS5_S5_ESaIS8_EESt4lessIS5_ESaIS7_IKS5_SA_EEEixEOS5_@Base 8.1.1 (optional=templinst)_ZNSt3mapINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEdSt4lessIS5_ESaISt4pairIKS5_dEEEixERS9_@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_@Base 8.1.1 (optional=templinst|arch=amd64 arm64 hppa ia64 mips64el ppc64el riscv64 sh4 sparc64 x32)_ZNSt3setINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4lessIS5_ESaIS5_EE6insertEOS5_@Base 7.1.1 ===================================== debian/patches/0001-Fix-wrong-results-with-SQLite-3.38.0-fixes-3077.patch ===================================== @@ -0,0 +1,63 @@ +Description: Fix wrong results with SQLite 3.38.0 (fixes #3077) +Author: Even Rouault <[email protected]> +Origin: https://github.com/OSGeo/PROJ/commit/bd2326210253cce5bf60626825d60da52f24cc53 +Bug: https://github.com/OSGeo/PROJ/issues/3077 + +--- a/src/iso19111/factory.cpp ++++ b/src/iso19111/factory.cpp +@@ -252,7 +252,7 @@ class SQLiteHandle { + } + + // cppcheck-suppress functionStatic +- void registerFunctions(); ++ void initialize(); + + SQLResultSet run(const std::string &sql, + const ListOfParams ¶meters = ListOfParams(), +@@ -344,7 +344,7 @@ std::shared_ptr<SQLiteHandle> SQLiteHand + #ifdef ENABLE_CUSTOM_LOCKLESS_VFS + handle->vfs_ = std::move(vfs); + #endif +- handle->registerFunctions(); ++ handle->initialize(); + handle->checkDatabaseLayout(path, path, std::string()); + return handle; + } +@@ -359,7 +359,7 @@ SQLiteHandle::initFromExisting(sqlite3 * + new SQLiteHandle(sqlite_handle, close_handle)); + handle->nLayoutVersionMajor_ = nLayoutVersionMajor; + handle->nLayoutVersionMinor_ = nLayoutVersionMinor; +- handle->registerFunctions(); ++ handle->initialize(); + return handle; + } + +@@ -370,7 +370,7 @@ SQLiteHandle::initFromExistingUniquePtr( + bool close_handle) { + auto handle = std::unique_ptr<SQLiteHandle>( + new SQLiteHandle(sqlite_handle, close_handle)); +- handle->registerFunctions(); ++ handle->initialize(); + return handle; + } + +@@ -547,7 +547,18 @@ void SQLiteHandle::checkDatabaseLayout(c + #define SQLITE_DETERMINISTIC 0 + #endif + +-void SQLiteHandle::registerFunctions() { ++void SQLiteHandle::initialize() { ++ ++ // There is a bug in sqlite 3.38.0 with some complex queries. ++ // Cf https://github.com/OSGeo/PROJ/issues/3077 ++ // Disabling Bloom-filter pull-down optimization as suggested in ++ // https://sqlite.org/forum/forumpost/7d3a75438c ++ const int sqlite3VersionNumber = sqlite3_libversion_number(); ++ if (sqlite3VersionNumber == 3 * 1000000 + 38 * 1000) { ++ sqlite3_test_control(SQLITE_TESTCTRL_OPTIMIZATIONS, sqlite_handle_, ++ 0x100000); ++ } ++ + sqlite3_create_function(sqlite_handle_, "pseudo_area_from_swne", 4, + SQLITE_UTF8 | SQLITE_DETERMINISTIC, nullptr, + PROJ_SQLITE_pseudo_area_from_swne, nullptr, ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +0001-Fix-wrong-results-with-SQLite-3.38.0-fixes-3077.patch ===================================== debian/rules ===================================== @@ -41,7 +41,7 @@ override_dh_auto_test: ifneq (,$(filter $(DEB_BUILD_ARCH),i386 hurd-i386 hppa ia64 kfreebsd-i386 powerpc)) dh_auto_test || echo "Ignoring test failures" else - dh_auto_test || echo "Ignoring test failures" + dh_auto_test endif override_dh_auto_install: View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/81414324d0010304fc89875baa910cba127394f6...a3225f4069693cdadbe93d657acfc001b25f647a -- View it on GitLab: https://salsa.debian.org/debian-gis-team/proj/-/compare/81414324d0010304fc89875baa910cba127394f6...a3225f4069693cdadbe93d657acfc001b25f647a You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
