Skip to content
Commits on Source (3)
Show whitespace changes
Inline Side-by-side
debian/changelog
View file @ f0bd6a3a
proj (7.0.0~rc1-1~exp3) experimental; urgency=medium
* Add upstream patch to fix test failure on big endian architectures.
* Update symbols for other architectures.
-- Bas Couwenberg <sebastic@debian.org> Fri, 21 Feb 2020 12:07:24 +0100
proj (7.0.0~rc1-1~exp2) experimental; urgency=medium
* Add upstream patch to fix FTBFS on big endian architectures.
......
debian/libproj19.symbols
View file @ f0bd6a3a
# SymbolsHelper-Confirmed: 7.0.0~rc1 amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 m68k mipsel powerpc riscv64 sh4 x32
# SymbolsHelper-Confirmed: 7.0.0~rc1 amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-amd64 kfreebsd-i386 m68k mips64el mipsel powerpc ppc64el riscv64 sh4 x32
libproj.so.19 #PACKAGE# #MINVER#
* Build-Depends-Package: libproj-dev
_Z10pj_ell_setP9projCtx_tP8ARG_listPdS3_@Base 6.0.0
......@@ -1962,7 +1962,7 @@ libproj.so.19 #PACKAGE# #MINVER#
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS5_SaIS5_EEESt10_Select1stISB_ESt4lessIS5_ESaISB_EE8_M_eraseEPSt13_Rb_tree_nodeISB_E@Base 6.0.0
(optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-i386 !mipsel !powerpc)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJOS5_EESN_IJEEEEESt17_Rb_tree_iteratorISC_ESt23_Rb_tree_const_iteratorISC_EDpOT_@Base 6.3.1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE24_M_get_insert_unique_posERS7_@Base 6.3.1
(optional=templinst|arch=amd64 arm64 hppa m68k riscv64 sh4 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 6.3.1
(optional=templinst|arch=amd64 arm64 hppa kfreebsd-amd64 m68k mips64el ppc64el riscv64 sh4 x32)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorISC_ERS7_@Base 6.3.1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE4findERS7_@Base 6.3.1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_St6vectorIS6_IS5_S5_ESaIS9_EEESt10_Select1stISC_ESt4lessIS5_ESaISC_EE8_M_eraseEPSt13_Rb_tree_nodeISC_E@Base 6.3.1
(optional=templinst)_ZNSt8_Rb_treeINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESt4pairIKS5_dESt10_Select1stIS8_ESt4lessIS5_ESaIS8_EE22_M_emplace_hint_uniqueIJRKSt21piecewise_construct_tSt5tupleIJRS7_EESJ_IJEEEEESt17_Rb_tree_iteratorIS8_ESt23_Rb_tree_const_iteratorIS8_EDpOT_@Base 6.0.0
......
debian/patches/0001-test_network.cpp-fix-test-failures-on-big-endian-arc.patch 0 → 100644
View file @ f0bd6a3a
Description: test_network.cpp: fix test failures on big endian archs
Author: Even Rouault <even.rouault@spatialys.com>
Origin: https://github.com/OSGeo/PROJ/commit/ee0ba2d2e61323b5bc02b0e6b307da8dde99f621
Bug: https://github.com/OSGeo/PROJ/issues/1958
--- a/test/unit/test_network.cpp
+++ b/test/unit/test_network.cpp
@@ -50,6 +50,27 @@
namespace {
+static const int byte_order_test = 1;
+#define IS_LSB \
+ (1 == (reinterpret_cast<const unsigned char *>(&byte_order_test))[0])
+
+static void swap_words(void *dataIn, size_t word_size, size_t word_count)
+
+{
+ unsigned char *data = static_cast<unsigned char *>(dataIn);
+ for (size_t word = 0; word < word_count; word++) {
+ for (size_t i = 0; i < word_size / 2; i++) {
+ unsigned char t;
+
+ t = data[i];
+ data[i] = data[word_size - i - 1];
+ data[word_size - i - 1] = t;
+ }
+
+ data += word_size;
+ }
+}
+
// ---------------------------------------------------------------------------
#ifdef CURL_ENABLED
@@ -474,6 +495,9 @@ TEST(networking, custom) {
event->response.resize(278528);
event->file_id = 2;
float f = 1.25;
+ if (!IS_LSB) {
+ swap_words(&f, sizeof(f), 1);
+ }
for (size_t i = 0; i < 278528 / sizeof(float); i++) {
memcpy(&event->response[i * sizeof(float)], &f, sizeof(float));
}
@@ -524,6 +548,9 @@ TEST(networking, custom) {
event->response.resize(278528);
event->file_id = 2;
float f = 2.25;
+ if (!IS_LSB) {
+ swap_words(&f, sizeof(f), 1);
+ }
for (size_t i = 0; i < 278528 / sizeof(float); i++) {
memcpy(&event->response[i * sizeof(float)], &f, sizeof(float));
}
@@ -791,6 +818,9 @@ TEST(networking, simul_read_range_error)
event->response.resize(278528);
event->file_id = 2;
float f = 1.25;
+ if (!IS_LSB) {
+ swap_words(&f, sizeof(f), 1);
+ }
for (size_t i = 0; i < 278528 / sizeof(float); i++) {
memcpy(&event->response[i * sizeof(float)], &f, sizeof(float));
}
@@ -945,6 +975,9 @@ TEST(networking, simul_file_change_while
event->response.resize(278528);
event->file_id = 2;
float f = 1.25;
+ if (!IS_LSB) {
+ swap_words(&f, sizeof(f), 1);
+ }
for (size_t i = 0; i < 278528 / sizeof(float); i++) {
memcpy(&event->response[i * sizeof(float)], &f, sizeof(float));
}
debian/patches/series
View file @ f0bd6a3a
read_grid_from_user_writable_directory.patch
0001-Fix-wrong-byte-swapping-for-NTv2-grids-affecting-mas.patch
0001-test_network.cpp-fix-test-failures-on-big-endian-arc.patch